Diff for /src/sys/dev/disk/aic/aic_pccard.c between versions 1.4 and 1.5

version 1.4, 2003/08/27 10:35:16 version 1.5, 2004/02/19 15:48:26
Line 41 Line 41
 #include "aic6360reg.h"  #include "aic6360reg.h"
 #include "aicvar.h"  #include "aicvar.h"
   
   #include <bus/pccard/pccardvar.h>
   #include <bus/pccard/pccarddevs.h>
   
   #include "card_if.h"
   
 struct aic_pccard_softc {  struct aic_pccard_softc {
         struct  aic_softc sc_aic;          struct  aic_softc sc_aic;
         struct  resource *sc_port;          struct  resource *sc_port;
Line 50  struct aic_pccard_softc { Line 55  struct aic_pccard_softc {
   
 static int aic_pccard_alloc_resources (device_t);  static int aic_pccard_alloc_resources (device_t);
 static void aic_pccard_release_resources (device_t);  static void aic_pccard_release_resources (device_t);
   static int aic_pccard_match(device_t);
 static int aic_pccard_probe (device_t);  static int aic_pccard_probe (device_t);
 static int aic_pccard_attach (device_t);  static int aic_pccard_attach (device_t);
   
   static const struct pccard_product aic_pccard_products[] = {
           PCMCIA_CARD(ADAPTEC, APA1460, 0),
           PCMCIA_CARD(ADAPTEC, APA1460A, 0),
           PCMCIA_CARD(NEWMEDIA, BUSTOASTER, 0),
           PCMCIA_CARD(NEWMEDIA, BUSTOASTER2, 0),
           PCMCIA_CARD(NEWMEDIA, BUSTOASTER3, 0),
           { NULL }
   };
   
 #define AIC_PCCARD_PORTSIZE 0x20  #define AIC_PCCARD_PORTSIZE 0x20
   
 static int  static int
Line 96  aic_pccard_release_resources(device_t de Line 111  aic_pccard_release_resources(device_t de
 }  }
   
 static int  static int
   aic_pccard_match(device_t dev)
   {
           const struct pccard_product *pp;
   
           if ((pp = pccard_product_lookup(dev, aic_pccard_products,
               sizeof(aic_pccard_products[0]), NULL)) != NULL) {
                   if (pp->pp_name != NULL)
                           device_set_desc(dev, pp->pp_name);
                   return 0;
           }
           return ENXIO;
   }
   
   static int
 aic_pccard_probe(device_t dev)  aic_pccard_probe(device_t dev)
 {  {
         struct aic_pccard_softc *sc = device_get_softc(dev);          struct aic_pccard_softc *sc = device_get_softc(dev);
Line 167  aic_pccard_detach(device_t dev) Line 196  aic_pccard_detach(device_t dev)
   
 static device_method_t aic_pccard_methods[] = {  static device_method_t aic_pccard_methods[] = {
         /* Device interface */          /* Device interface */
        DEVMETHOD(device_probe,         aic_pccard_probe),        DEVMETHOD(device_probe,         pccard_compat_probe),
        DEVMETHOD(device_attach,        aic_pccard_attach),        DEVMETHOD(device_attach,        pccard_compat_attach),
         DEVMETHOD(device_detach,        aic_pccard_detach),          DEVMETHOD(device_detach,        aic_pccard_detach),
   
           /* Card interface */
           DEVMETHOD(card_compat_match,    aic_pccard_match),
           DEVMETHOD(card_compat_probe,    aic_pccard_probe),
           DEVMETHOD(card_compat_attach,   aic_pccard_attach),
         { 0, 0 }          { 0, 0 }
 };  };
   

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