Diff for /src/sys/dev/disk/stg/tmc18c30_pccard.c between versions 1.5 and 1.6

version 1.5, 2004/02/12 00:00:18 version 1.6, 2004/02/19 15:48:26
Line 56 Line 56
   
 #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 69 Line 72
 #include        <bus/pccard/cardinfo.h>  #include        <bus/pccard/cardinfo.h>
 #include        <bus/pccard/slot.h>  #include        <bus/pccard/slot.h>
   
   static const struct pccard_product stg_products[] = {
           PCMCIA_CARD(FUTUREDOMAIN, SCSI2GO, 0),
           PCMCIA_CARD(IBM, SCSICARD, 0),
           PCMCIA_CARD(RATOC, REX5536, 0),
           PCMCIA_CARD(RATOC, REX5536AM, 0),
           PCMCIA_CARD(RATOC, REX5536M, 0),
           { NULL }
   };
   
 static  int     stgprobe(DEVPORT_PDEVICE devi);  static  int     stgprobe(DEVPORT_PDEVICE devi);
 static  int     stgattach(DEVPORT_PDEVICE devi);  static  int     stgattach(DEVPORT_PDEVICE devi);
   
Line 78  static void stg_card_unload (DEVPORT_PDE Line 90  static void stg_card_unload (DEVPORT_PDE
  * Additional code for FreeBSD new-bus PCCard frontend   * Additional code for FreeBSD new-bus PCCard frontend
  */   */
   
   static int stg_pccard_match(device_t dev)
   {
           const struct pccard_product *pp;
   
           if ((pp = pccard_product_lookup(dev, stg_products,
               sizeof(stg_products[0]), NULL)) != NULL) {
                   if (pp->pp_name != NULL)
                           device_set_desc(dev, pp->pp_name);
                   return(0);
           }
           return(EIO);
   }
   
 static void  static void
 stg_pccard_intr(void * arg)  stg_pccard_intr(void * arg)
 {  {
Line 216  stg_pccard_detach(DEVPORT_PDEVICE dev) Line 241  stg_pccard_detach(DEVPORT_PDEVICE dev)
   
 static device_method_t stg_pccard_methods[] = {  static device_method_t stg_pccard_methods[] = {
         /* Device interface */          /* Device interface */
        DEVMETHOD(device_probe,         stg_pccard_probe),        DEVMETHOD(device_probe,         pccard_compat_probe),
        DEVMETHOD(device_attach,        stg_pccard_attach),        DEVMETHOD(device_attach,        pccard_compat_attach),
         DEVMETHOD(device_detach,        stg_pccard_detach),          DEVMETHOD(device_detach,        stg_pccard_detach),
   
           /* Card interface */
           DEVMETHOD(card_compat_match,    stg_pccard_match),
           DEVMETHOD(card_compat_probe,    stg_pccard_probe),
           DEVMETHOD(card_compat_attach,   stg_pccard_attach),
   
         { 0, 0 }          { 0, 0 }
 };  };
   

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