Diff for /src/sys/dev/disk/nsp/nsp_pccard.c between versions 1.4 and 1.5

version 1.4, 2003/08/27 10:35:17 version 1.5, 2004/02/19 15:48:26
Line 54 Line 54
   
 #include <sys/device_port.h>  #include <sys/device_port.h>
   
   #include <bus/pccard/pccarddevs.h>
   #include <bus/pccard/pccardvar.h>
   
 #include <bus/cam/scsi/scsi_low.h>  #include <bus/cam/scsi/scsi_low.h>
 #include <bus/cam/scsi/scsi_low_pisa.h>  #include <bus/cam/scsi/scsi_low_pisa.h>
   
Line 77  static int nspattach(DEVPORT_PDEVICE dev Line 80  static int nspattach(DEVPORT_PDEVICE dev
   
 static  void    nsp_card_unload (DEVPORT_PDEVICE);  static  void    nsp_card_unload (DEVPORT_PDEVICE);
   
   static const struct pccard_product nsp_products[] = {
           PCMCIA_CARD(IODATA3, CBSC16, 0),
           PCMCIA_CARD(PANASONIC, KME, 0),
           PCMCIA_CARD(WORKBIT2, NINJA_SCSI3, 0),
           PCMCIA_CARD(WORKBIT, ULTRA_NINJA_16, 0),
           { NULL }
   };
   
 /*  /*
  * Additional code for FreeBSD new-bus PCCard frontend   * Additional code for FreeBSD new-bus PCCard frontend
  */   */
Line 166  nsp_alloc_resource(DEVPORT_PDEVICE dev) Line 177  nsp_alloc_resource(DEVPORT_PDEVICE dev)
         return(0);          return(0);
 }  }
   
   static int nsp_pccard_match(device_t dev)
   {
           const struct pccard_product *pp;
   
           if ((pp = pccard_product_lookup(dev, nsp_products,
               sizeof(nsp_products[0]), NULL)) != NULL) {
                   device_set_desc(dev, pp->pp_name);
                   return (0);
           }
           return (ENXIO);
   }
   
 static int  static int
 nsp_pccard_probe(DEVPORT_PDEVICE dev)  nsp_pccard_probe(DEVPORT_PDEVICE dev)
 {  {
Line 224  nsp_pccard_detach(DEVPORT_PDEVICE dev) Line 247  nsp_pccard_detach(DEVPORT_PDEVICE dev)
   
 static device_method_t nsp_pccard_methods[] = {  static device_method_t nsp_pccard_methods[] = {
         /* Device interface */          /* Device interface */
        DEVMETHOD(device_probe,         nsp_pccard_probe),        DEVMETHOD(device_probe,         pccard_compat_probe),
        DEVMETHOD(device_attach,        nsp_pccard_attach),        DEVMETHOD(device_attach,        pccard_compat_attach),
         DEVMETHOD(device_detach,        nsp_pccard_detach),          DEVMETHOD(device_detach,        nsp_pccard_detach),
   
           /* Card interface */
           DEVMETHOD(card_compat_match,    nsp_pccard_match),
           DEVMETHOD(card_compat_probe,    nsp_pccard_probe),
           DEVMETHOD(card_compat_attach,   nsp_pccard_attach),
   
         { 0, 0 }          { 0, 0 }
 };  };
   

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