27c27
< * $FreeBSD: head/sys/dev/ed/if_edvar.h 64630 2000-08-14 04:31:07Z tanimura $
---
> * $FreeBSD: head/sys/dev/ed/if_edvar.h 64777 2000-08-17 12:15:45Z nyan $
51,52c51,52
< bus_space_tag_t bst; /* Bus Space tag */
< bus_space_handle_t bsh; /* Bus Space handle */
---
> int nic_offset; /* NIC (DS8390) I/O bus address offset */
> int asic_offset; /* ASIC I/O bus address offset */
54,61d53
< #ifdef __alpha__
< u_int asic_addr; /* ASIC I/O bus address */
< u_int nic_addr; /* NIC (DS8390) I/O bus address */
< #else
< u_short asic_addr; /* ASIC I/O bus address */
< u_short nic_addr; /* NIC (DS8390) I/O bus address */
< #endif
<
77c69
< u_long hpp_mem_start; /* Memory-mapped IO register address */
---
> caddr_t hpp_mem_start; /* Memory-mapped IO register address */
79,80c71,72
< u_long mem_start; /* NIC memory start address */
< u_long mem_end; /* NIC memory end address */
---
> caddr_t mem_start; /* NIC memory start address */
> caddr_t mem_end; /* NIC memory end address */
82c74
< u_long mem_ring; /* start of RX ring-buffer (in NIC mem) */
---
> caddr_t mem_ring; /* start of RX ring-buffer (in NIC mem) */
98a91,186
> #define ed_nic_inb(sc, port) \
> bus_space_read_1(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), (sc)->nic_offset + (port))
>
> #define ed_nic_outb(sc, port, value) \
> bus_space_write_1(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), (sc)->nic_offset + (port), \
> (value))
>
> #define ed_nic_inw(sc, port) \
> bus_space_read_2(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), (sc)->nic_offset + (port))
>
> #define ed_nic_outw(sc, port, value) \
> bus_space_write_2(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), (sc)->nic_offset + (port), \
> (value))
>
> #define ed_nic_insb(sc, port, addr, count) \
> bus_space_read_multi_1(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), \
> (sc)->nic_offset + (port), (addr), (count))
>
> #define ed_nic_outsb(sc, port, addr, count) \
> bus_space_write_multi_1(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), \
> (sc)->nic_offset + (port), (addr), (count))
>
> #define ed_nic_insw(sc, port, addr, count) \
> bus_space_read_multi_2(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), \
> (sc)->nic_offset + (port), (u_int16_t *)(addr), (count))
>
> #define ed_nic_outsw(sc, port, addr, count) \
> bus_space_write_multi_2(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), \
> (sc)->nic_offset + (port), (u_int16_t *)(addr), (count))
>
> #define ed_nic_insl(sc, port, addr, count) \
> bus_space_read_multi_4(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), \
> (sc)->nic_offset + (port), (u_int32_t *)(addr), (count))
>
> #define ed_nic_outsl(sc, port, addr, count) \
> bus_space_write_multi_4(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), \
> (sc)->nic_offset + (port), (u_int32_t *)(addr), (count))
>
> #define ed_asic_inb(sc, port) \
> bus_space_read_1(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), (sc)->asic_offset + (port))
>
> #define ed_asic_outb(sc, port, value) \
> bus_space_write_1(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), (sc)->asic_offset + (port), \
> (value))
>
> #define ed_asic_inw(sc, port) \
> bus_space_read_2(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), (sc)->asic_offset + (port))
>
> #define ed_asic_outw(sc, port, value) \
> bus_space_write_2(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), (sc)->asic_offset + (port), \
> (value))
>
> #define ed_asic_insb(sc, port, addr, count) \
> bus_space_read_multi_1(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), \
> (sc)->asic_offset + (port), (addr), (count))
>
> #define ed_asic_outsb(sc, port, addr, count) \
> bus_space_write_multi_1(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), \
> (sc)->asic_offset + (port), (addr), (count))
>
> #define ed_asic_insw(sc, port, addr, count) \
> bus_space_read_multi_2(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), \
> (sc)->asic_offset + (port), (u_int16_t *)(addr), (count))
>
> #define ed_asic_outsw(sc, port, addr, count) \
> bus_space_write_multi_2(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), \
> (sc)->asic_offset + (port), (u_int16_t *)(addr), (count))
>
> #define ed_asic_insl(sc, port, addr, count) \
> bus_space_read_multi_4(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), \
> (sc)->asic_offset + (port), (u_int32_t *)(addr), (count))
>
> #define ed_asic_outsl(sc, port, addr, count) \
> bus_space_write_multi_4(rman_get_bustag((sc)->port_res), \
> rman_get_bushandle((sc)->port_res), \
> (sc)->asic_offset + (port), (u_int32_t *)(addr), (count))
>
105,109c193,199
< int ed_probe_WD80x3 __P((device_t));
< int ed_probe_3Com __P((device_t));
< int ed_probe_Novell __P((device_t));
< int ed_probe_Novell_generic __P((device_t, int, int));
< int ed_probe_HP_pclanp __P((device_t));
---
> int ed_probe_WD80x3 __P((device_t, int, int));
> int ed_probe_WD80x3_generic __P((device_t, int, unsigned short *[]));
> int ed_probe_3Com __P((device_t, int, int));
> int ed_probe_Novell __P((device_t, int, int));
> int ed_probe_Novell_generic __P((device_t, int));
> int ed_probe_HP_pclanp __P((device_t, int, int));
>
111d200
< void ed_ax88190_geteprom __P((struct ed_softc *));
114a204,207
> void ed_pio_readmem __P((struct ed_softc *, int, unsigned char *,
> unsigned short));
> void ed_pio_writemem __P((struct ed_softc *, char *,
> unsigned short, unsigned short));