25c25
< __FBSDID("$FreeBSD: head/sys/dev/fe/if_fe_pccard.c 189681 2009-03-11 08:12:28Z imp $");
---
> __FBSDID("$FreeBSD: head/sys/dev/fe/if_fe_pccard.c 189728 2009-03-12 07:18:27Z imp $");
63c63
< struct pccard_product mpp_product;
---
> struct pccard_product mpp_product;
75,76c75,76
< { PCMCIA_CARD(TDK, LAK_CD021BX), 0 },
< { PCMCIA_CARD(TDK, LAK_CF010), 0 },
---
> { PCMCIA_CARD(TDK, LAK_CD021BX), 0 },
> { PCMCIA_CARD(TDK, LAK_CF010), 0 },
78c78
< { PCMCIA_CARD(TDK, LAK_DFL9610), 0 },
---
> { PCMCIA_CARD(TDK, LAK_DFL9610), 0 },
80c80
< { PCMCIA_CARD(CONTEC, CNETPC), 0 },
---
> { PCMCIA_CARD(CONTEC, CNETPC), 0 },
87c87
< { { NULL } }
---
> { { NULL } }
95c95
< const struct fe_pccard_product *pp;
---
> const struct fe_pccard_product *pp;
98,100c98,100
< if ((pp = (const struct fe_pccard_product *)pccard_product_lookup(dev,
< (const struct pccard_product *)fe_pccard_products,
< sizeof(fe_pccard_products[0]), NULL)) != NULL) {
---
> if ((pp = (const struct fe_pccard_product *)pccard_product_lookup(dev,
> (const struct pccard_product *)fe_pccard_products,
> sizeof(fe_pccard_products[0]), NULL)) != NULL) {
122,123c122,123
< }
< return (ENXIO);
---
> }
> return (ENXIO);
127,130c127,130
< /* Device interface */
< DEVMETHOD(device_probe, fe_pccard_probe),
< DEVMETHOD(device_attach, fe_pccard_attach),
< DEVMETHOD(device_detach, fe_pccard_detach),
---
> /* Device interface */
> DEVMETHOD(device_probe, fe_pccard_probe),
> DEVMETHOD(device_attach, fe_pccard_attach),
> DEVMETHOD(device_detach, fe_pccard_detach),
146,148c146
< /*
< * Initialize the device - called from Slot manager.
< */
---
>
153c151
< const struct fe_pccard_product *pp;
---
> const struct fe_pccard_product *pp;
160c158
< pp = (const struct fe_pccard_product *) pccard_product_lookup(dev,
---
> pp = (const struct fe_pccard_product *) pccard_product_lookup(dev,
162c160
< sizeof(fe_pccard_products[0]), NULL);
---
> sizeof(fe_pccard_products[0]), NULL);
272c270
< sn_pccard_xircom_mac(const struct pccard_tuple *tuple, void *argp)
---
> fe_pccard_xircom_mac(const struct pccard_tuple *tuple, void *argp)
320,325c318,323
< static struct fe_simple_probe_struct probe_table [] = {
< { FE_DLCR2, 0x10, 0x00 },
< { FE_DLCR4, 0x08, 0x00 },
< /* { FE_DLCR5, 0x80, 0x00 }, Does not work well. */
< { 0 }
< };
---
> static struct fe_simple_probe_struct probe_table [] = {
> { FE_DLCR2, 0x10, 0x00 },
> { FE_DLCR4, 0x08, 0x00 },
> /* { FE_DLCR5, 0x80, 0x00 }, Does not work well. */
> { 0 }
> };
328c326
< /* C-NET(PC)C occupies 16 I/O addresses. */
---
> /* C-NET(PC)C occupies 16 I/O addresses. */
335,338c333,336
< /*
< * See if C-NET(PC)C is on its address.
< */
< if (!fe_simple_probe(sc, probe_table))
---
> /*
> * See if C-NET(PC)C is on its address.
> */
> if (!fe_simple_probe(sc, probe_table))
341c339
< /* Determine the card type. */
---
> /* Determine the card type. */
343c341
< sc->typestr = "Generic MB8696x/78Q837x Ethernet (PCMCIA)";
---
> sc->typestr = "Generic MB8696x/78Q837x Ethernet (PCMCIA)";
347,349c345,347
< /* Make sure we got a valid station address. */
< if (!fe_valid_Ether_p(sc->enaddr, 0)) {
< pccard_cis_scan(dev, sn_pccard_xircom_mac, sc->enaddr);
---
> /* Make sure we got a valid station address. */
> if (!fe_valid_Ether_p(sc->enaddr, 0)) {
> pccard_cis_scan(dev, fe_pccard_xircom_mac, sc->enaddr);
352,353c350,351
< /* Make sure we got a valid station address. */
< if (!fe_valid_Ether_p(sc->enaddr, 0))
---
> /* Make sure we got a valid station address. */
> if (!fe_valid_Ether_p(sc->enaddr, 0))
356c354
< return 0;
---
> return 0;