Diff for /src/sys/dev/netif/sn/if_sn_pccard.c between versions 1.4 and 1.5

version 1.4, 2004/02/13 22:12:33 version 1.5, 2004/02/19 14:31:13
Line 55 Line 55
 #include "if_snreg.h"  #include "if_snreg.h"
 #include "if_snvar.h"  #include "if_snvar.h"
 #include <bus/pccard/pccardvar.h>  #include <bus/pccard/pccardvar.h>
   #include <bus/pccard/pccarddevs.h>
   
   #include "card_if.h"
   
   static const struct pccard_product sn_pccard_products[] = {
           PCMCIA_CARD(DSPSI, XJACK, 0),
           PCMCIA_CARD(NEWMEDIA, BASICS, 0),
   #if 0
           PCMCIA_CARD(SMC, 8020BT, 0),
   #endif
           { NULL }
   };
   
   static int
   sn_pccard_match(device_t dev)
   {
           const struct pccard_product *pp;
   
           if ((pp = pccard_product_lookup(dev, sn_pccard_products,
               sizeof(sn_pccard_products[0]), NULL)) != NULL) {
                   if (pp->pp_name != NULL)
                           device_set_desc(dev, pp->pp_name);
                   return 0;
           }
           return EIO;
   }
   
 /*  /*
  * Initialize the device - called from Slot manager.   * Initialize the device - called from Slot manager.
Line 98  sn_pccard_detach(device_t dev) Line 124  sn_pccard_detach(device_t dev)
   
 static device_method_t sn_pccard_methods[] = {  static device_method_t sn_pccard_methods[] = {
         /* Device interface */          /* Device interface */
        DEVMETHOD(device_probe,         sn_pccard_probe),        DEVMETHOD(device_probe,         pccard_compat_probe),
        DEVMETHOD(device_attach,        sn_pccard_attach),        DEVMETHOD(device_attach,        pccard_compat_attach),
         DEVMETHOD(device_detach,        sn_pccard_detach),          DEVMETHOD(device_detach,        sn_pccard_detach),
   
           /* Card interface */
           DEVMETHOD(card_compat_match,    sn_pccard_match),
           DEVMETHOD(card_compat_probe,    sn_pccard_probe),
           DEVMETHOD(card_compat_attach,   sn_pccard_attach),
   
         { 0, 0 }          { 0, 0 }
 };  };
   

Removed from v.1.4  
changed lines
  Added in v.1.5