20c20
< * $FreeBSD: head/sys/dev/ed/if_ed_pci.c 50477 1999-08-28 01:08:13Z peter $
---
> * $FreeBSD: head/sys/dev/ed/if_ed_pci.c 50852 1999-09-03 19:10:56Z peter $
25c25
< #include <sys/malloc.h>
---
> #include <sys/socket.h>
26a27,30
> #include <sys/module.h>
> #include <sys/bus.h>
> #include <machine/bus.h>
>
30c34,36
< #include "ed.h"
---
> #include <net/if.h>
> #include <net/if_arp.h>
> #include <net/if_mib.h>
31a38,39
> #include <i386/isa/if_edvar.h>
>
34,35c42,43
< pcidi_t type;
< char *desc;
---
> u_int32_t type;
> const char *desc;
49c57
< extern void *ed_attach_NE2000_pci __P((int, int));
---
> extern int ed_attach_NE2000_pci __P((device_t dev, int));
51,52c59,60
< static const char* ed_pci_probe __P((pcici_t tag, pcidi_t type));
< static void ed_pci_attach __P((pcici_t config_id, int unit));
---
> static int ed_pci_probe __P((device_t));
> static int ed_pci_attach __P((device_t));
54,67c62,63
< static u_long ed_pci_count = NED;
<
< static struct pci_device ed_pci_driver = {
< "ed",
< ed_pci_probe,
< ed_pci_attach,
< &ed_pci_count,
< NULL
< };
<
< COMPAT_PCI_DRIVER (ed_pci, ed_pci_driver);
<
< static const char*
< ed_pci_probe (pcici_t tag, pcidi_t type)
---
> static int
> ed_pci_probe (device_t dev)
68a65
> u_int32_t type = pci_get_devid(dev);
73c70,75
< return (ep->desc);
---
> if (ep->desc) {
> device_set_desc(dev, ep->desc);
> return 0;
> } else {
> return ENXIO;
> }
76,81c78,79
< void edintr_sc (void*);
<
< static void
< ed_pci_attach(config_id, unit)
< pcici_t config_id;
< int unit;
---
> static int
> ed_pci_attach(device_t dev)
83,84c81,82
< int io_port;
< void *ed; /* device specific data ... */
---
> return ed_attach_NE2000_pci(dev, PCIR_MAPS);
> }
86c84,87
< io_port = pci_conf_read(config_id, PCI_MAP_REG_START) & ~PCI_MAP_IO;
---
> static device_method_t ed_pci_methods[] = {
> /* Device interface */
> DEVMETHOD(device_probe, ed_pci_probe),
> DEVMETHOD(device_attach, ed_pci_attach),
88,90c89,90
< ed = ed_attach_NE2000_pci(unit, io_port);
< if (!ed)
< return;
---
> { 0, 0 }
> };
92,95c92,96
< if(!(pci_map_int(config_id, edintr_sc, (void *)ed, &net_imask))) {
< free (ed, M_DEVBUF);
< return;
< }
---
> static driver_t ed_pci_driver = {
> "ed",
> ed_pci_methods,
> sizeof(struct ed_softc),
> };
97,98c98,100
< return;
< }
---
> static devclass_t ed_devclass;
>
> DRIVER_MODULE(ed, pci, ed_pci_driver, ed_devclass, 0, 0);