Attachment #9296 for bug #19089

View | Details | Raw Unified | Return to bug 19089
Collapse All | Expand All




#endif

/*
 * Convert kernel VA to physical address
 */
u_long
kvtop(void *addr)
{
	vm_offset_t va;

	va = pmap_kextract((vm_offset_t)addr);
	if (va == 0)
	panic("kvtop: zero page frame");
	return((int)va);
}

/*
 * Map an IO request into kernel virtual address space.
 *
 * All requests are (re)mapped into kernel VA space.

Lines 123-128 Link Here

(-)conf/files (+3 lines)
123	dev/dpt/dpt_pci.c optional dpt pci	123	dev/dpt/dpt_pci.c optional dpt pci
124	dev/dpt/dpt_scsi.c optional dpt	124	dev/dpt/dpt_scsi.c optional dpt
125	dev/ed/if_ed_pci.c optional ed pci	125	dev/ed/if_ed_pci.c optional ed pci
		126	dev/ed/if_ed.c optional ed
		127	dev/ed/if_ed_isa.c optional ed isa
		128	dev/ed/if_ed_pccard.c optional ed card
126	dev/en/midway.c optional en	129	dev/en/midway.c optional en
127	dev/ep/if_ep.c optional ep	130	dev/ep/if_ep.c optional ep
128	dev/ep/if_ep_eisa.c optional ep eisa	131	dev/ep/if_ep_eisa.c optional ep eisa

Lines 71-79 Link Here

(-)conf/files.i386 (-3 lines)
71	dev/ata/atapi-cd.c optional atapicd	71	dev/ata/atapi-cd.c optional atapicd
72	dev/ata/atapi-fd.c optional atapifd	72	dev/ata/atapi-fd.c optional atapifd
73	dev/ata/atapi-tape.c optional atapist	73	dev/ata/atapi-tape.c optional atapist
74	dev/ed/if_ed.c optional ed
75	dev/ed/if_ed_isa.c optional ed isa
76	dev/ed/if_ed_pccard.c optional ed card
77	dev/eisa/eisaconf.c optional eisa	74	dev/eisa/eisaconf.c optional eisa
78	dev/fb/fb.c optional fb	75	dev/fb/fb.c optional fb
79	dev/fb/fb.c optional vga	76	dev/fb/fb.c optional vga




static void	ed_reset	__P((struct ifnet *));
static void	ed_watchdog	__P((struct ifnet *));

static void	ds_getmcaf	__P((struct ed_softc *, u_int32_t *));

static void	ed_get_packet	__P((struct ed_softc *, char *, /* u_short */ int));



static void	ed_setrcr	__P((struct ed_softc *));

static u_int32_t	ds_crc		__P((u_char *ep));

static u_short	ed_get_Linksys	__P((struct ed_softc *));


	} else {
		/* set up multicast addresses and filter modes */
		if (ifp->if_flags & IFF_MULTICAST) {
			u_int32_t mcaf[2];

			if (ifp->if_flags & IFF_ALLMULTI) {
				mcaf[0] = 0xffffffff;
				mcaf[1] = 0xffffffff;
				ds_getmcaf(sc, mcaf);

			/*
			 * Set multicast filter on chip.

/*
 * Compute crc for ethernet address
 */
static u_int32_t
ds_crc(ep)
	u_char *ep;
{
#define POLYNOMIAL 0x04c11db6
	register u_int32_t crc = 0xffffffffL;
	register int carry, i, j;
	register u_char b;


static void
ds_getmcaf(sc, mcaf)
	struct ed_softc *sc;
	u_int32_t *mcaf;
{
	register u_int32_t index;
	register u_char *af = (u_char *) mcaf;
	struct ifmultiaddr *ifma;


Lines 788-795 Link Here

(-)dev/ed/if_edreg.h (+5 lines)
788	#define ED_WD_ROM_CHECKSUM_TOTAL 0xFF	788	#define ED_WD_ROM_CHECKSUM_TOTAL 0xFF
789	#endif	789	#endif
790		790
		791	#ifdef __alpha__
		792	#define ED_WD_NIC_OFFSET 0x00 /* I/O base offset to NIC */
		793	#define ED_WD_ASIC_OFFSET 0x10 /* I/O base offset to ASIC */
		794	#else
791	#define ED_WD_NIC_OFFSET 0x10 /* I/O base offset to NIC */	795	#define ED_WD_NIC_OFFSET 0x10 /* I/O base offset to NIC */
792	#define ED_WD_ASIC_OFFSET 0 /* I/O base offset to ASIC */	796	#define ED_WD_ASIC_OFFSET 0 /* I/O base offset to ASIC */
		797	#endif
793	#define ED_WD_IO_PORTS 32 /* # of i/o addresses used */	798	#define ED_WD_IO_PORTS 32 /* # of i/o addresses used */
794		799
795	#define ED_WD_PAGE_OFFSET 0 /* page offset for NIC access to mem */	800	#define ED_WD_PAGE_OFFSET 0 /* page offset for NIC access to mem */

Lines 48-55 Link Here

(-)dev/ed/if_edvar.h (-1 / +6 lines)
48	struct resource* irq_res; /* resource for irq */	48	struct resource* irq_res; /* resource for irq */
49	void* irq_handle; /* handle for irq handler */	49	void* irq_handle; /* handle for irq handler */
50		50
		51	#ifdef __alpha__
		52	u_int asic_addr; /* ASIC I/O bus address */
		53	u_int nic_addr; /* NIC (DS8390) I/O bus address */
		54	#else
51	u_short asic_addr; /* ASIC I/O bus address */	55	u_short asic_addr; /* ASIC I/O bus address */
52	u_short nic_addr; /* NIC (DS8390) I/O bus address */	56	u_short nic_addr; /* NIC (DS8390) I/O bus address */
		57	#endif
53		58
54	/*	59	/*
55	* The following 'proto' variable is part of a work-around for 8013EBT asics	60	* The following 'proto' variable is part of a work-around for 8013EBT asics
Lines 71-77 Link Here
71		76
72	caddr_t mem_start; /* NIC memory start address */	77	caddr_t mem_start; /* NIC memory start address */
73	caddr_t mem_end; /* NIC memory end address */	78	caddr_t mem_end; /* NIC memory end address */
74	u_long mem_size; /* total NIC memory size */	79	u_int32_t mem_size; /* total NIC memory size */
75	caddr_t mem_ring; /* start of RX ring-buffer (in NIC mem) */	80	caddr_t mem_ring; /* start of RX ring-buffer (in NIC mem) */
76		81
77	u_char mem_shared; /* NIC memory is shared with host */	82	u_char mem_shared; /* NIC memory is shared with host */

Return to bug 19089

Lines 296-301 Link Here

(-)alpha/alpha/vm_machdep.c (+14 lines)
296	#endif	296	#endif
297		297
298	/*	298	/*
		299	* Convert kernel VA to physical address
		300	*/
		301	u_long
		302	kvtop(void *addr)
		303	{
		304	vm_offset_t va;
		305
		306	va = pmap_kextract((vm_offset_t)addr);
		307	if (va == 0)
		308	panic("kvtop: zero page frame");
		309	return((int)va);
		310	}
		311
		312	/*
299	* Map an IO request into kernel virtual address space.	313	* Map an IO request into kernel virtual address space.
300	*	314	*
301	* All requests are (re)mapped into kernel VA space.	315	* All requests are (re)mapped into kernel VA space.

Lines 75-81 Link Here

(-)dev/ed/if_ed.c (-7 / +7 lines)
75	static void ed_reset __P((struct ifnet *));	75	static void ed_reset __P((struct ifnet *));
76	static void ed_watchdog __P((struct ifnet *));	76	static void ed_watchdog __P((struct ifnet *));
77		77
78	static void ds_getmcaf __P((struct ed_softc , u_long ));	78	static void ds_getmcaf __P((struct ed_softc , u_int32_t ));
79		79
80	static void ed_get_packet __P((struct ed_softc , char , /* u_short */ int));	80	static void ed_get_packet __P((struct ed_softc , char , /* u_short */ int));
81		81
Lines 98-104 Link Here
98		98
99	static void ed_setrcr __P((struct ed_softc *));	99	static void ed_setrcr __P((struct ed_softc *));
100		100
101	static u_long ds_crc __P((u_char *ep));	101	static u_int32_t ds_crc __P((u_char *ep));
102		102
103	static u_short ed_get_Linksys __P((struct ed_softc *));	103	static u_short ed_get_Linksys __P((struct ed_softc *));
104		104
Lines 3211-3223 Link Here
3211	} else {	3214	} else {
3212	/* set up multicast addresses and filter modes */	3215	/* set up multicast addresses and filter modes */
3213	if (ifp->if_flags & IFF_MULTICAST) {	3216	if (ifp->if_flags & IFF_MULTICAST) {
3214	u_long mcaf[2];	3217	u_int32_t mcaf[2];
3215		3218
3216	if (ifp->if_flags & IFF_ALLMULTI) {	3219	if (ifp->if_flags & IFF_ALLMULTI) {
3217	mcaf[0] = 0xffffffff;	3220	mcaf[0] = 0xffffffff;
3218	mcaf[1] = 0xffffffff;	3221	mcaf[1] = 0xffffffff;
3219	ds_getmcaf(sc, mcaf);	3222	ds_getmcaf(sc, mcaf);
3220		3223
3221	/*	3224	/*
3222	* Set multicast filter on chip.	3225	* Set multicast filter on chip.
Lines 3254-3265 Link Here
3254	/*	3258	/*
3255	* Compute crc for ethernet address	3259	* Compute crc for ethernet address
3256	*/	3260	*/
3257	static u_long	3261	static u_int32_t
3258	ds_crc(ep)	3262	ds_crc(ep)
3259	u_char *ep;	3263	u_char *ep;
3260	{	3264	{
3261	#define POLYNOMIAL 0x04c11db6	3265	#define POLYNOMIAL 0x04c11db6
3262	register u_long crc = 0xffffffffL;	3266	register u_int32_t crc = 0xffffffffL;
3263	register int carry, i, j;	3267	register int carry, i, j;
3264	register u_char b;	3268	register u_char b;
3265		3269
Lines 3284-3292 Link Here
3284	static void	3288	static void
3285	ds_getmcaf(sc, mcaf)	3289	ds_getmcaf(sc, mcaf)
3286	struct ed_softc *sc;	3290	struct ed_softc *sc;
3287	u_long *mcaf;	3291	u_int32_t *mcaf;
3288	{	3292	{
3289	register u_int index;	3293	register u_int32_t index;
3290	register u_char af = (u_char ) mcaf;	3294	register u_char af = (u_char ) mcaf;
3291	struct ifmultiaddr *ifma;	3295	struct ifmultiaddr *ifma;
3292		3296