[BACK]Return to ess_isa.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / dev / isa

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/dev/isa/ess_isa.c between version 1.10.6.3 and 1.10.6.4

version 1.10.6.3, 2004/09/21 13:29:43 version 1.10.6.4, 2005/01/17 19:31:11
Line 59  __KERNEL_RCSID(0, "$NetBSD$");
Line 59  __KERNEL_RCSID(0, "$NetBSD$");
 #define DPRINTF(x)  #define DPRINTF(x)
 #endif  #endif
   
 int ess_isa_probe __P((struct device *, struct cfdata *, void *));  int ess_isa_probe(struct device *, struct cfdata *, void *);
 void ess_isa_attach __P((struct device *, struct device *, void *));  void ess_isa_attach(struct device *, struct device *, void *);
   
 CFATTACH_DECL(ess_isa, sizeof(struct ess_softc),  CFATTACH_DECL(ess_isa, sizeof(struct ess_softc),
     ess_isa_probe, ess_isa_attach, NULL, NULL);      ess_isa_probe, ess_isa_attach, NULL, NULL);
   
 int  int
 ess_isa_probe(parent, match, aux)  ess_isa_probe(struct device *parent, struct cfdata *match, void *aux)
         struct device *parent;  
         struct cfdata *match;  
         void *aux;  
 {  {
         int ret;          int ret;
         struct isa_attach_args *ia = aux;          struct isa_attach_args *ia;
         struct ess_softc probesc, *sc= &probesc;          struct ess_softc probesc, *sc;
   
           ia = aux;
           sc= &probesc;
         if (ia->ia_nio < 1)          if (ia->ia_nio < 1)
                 return (0);                  return 0;
         if (ia->ia_nirq < 1)          if (ia->ia_nirq < 1)
                 return (0);                  return 0;
         if (ia->ia_ndrq < 1)          if (ia->ia_ndrq < 1)
                 return (0);                  return 0;
   
         if (ISA_DIRECT_CONFIG(ia))          if (ISA_DIRECT_CONFIG(ia))
                 return (0);                  return 0;
   
         memset(sc, 0, sizeof *sc);          memset(sc, 0, sizeof *sc);
   
Line 104  ess_isa_probe(parent, match, aux)
Line 103  ess_isa_probe(parent, match, aux)
         sc->sc_audio2.drq = (ia->ia_ndrq > 1) ? ia->ia_drq[1].ir_drq : -1;          sc->sc_audio2.drq = (ia->ia_ndrq > 1) ? ia->ia_drq[1].ir_drq : -1;
   
         ret = essmatch(sc);          ret = essmatch(sc);
   
         bus_space_unmap(sc->sc_iot, sc->sc_ioh, ESS_NPORT);          bus_space_unmap(sc->sc_iot, sc->sc_ioh, ESS_NPORT);
   
         if (ret) {          if (ret) {
Line 123  ess_isa_probe(parent, match, aux)
Line 122  ess_isa_probe(parent, match, aux)
                 ia->ia_niomem = 0;                  ia->ia_niomem = 0;
         } else          } else
                 DPRINTF(("ess_isa_probe failed\n"));                  DPRINTF(("ess_isa_probe failed\n"));
   
         return ret;          return ret;
 }  }
   
 void ess_isa_attach(parent, self, aux)  void
          struct device *parent, *self;  ess_isa_attach(struct device *parent, struct device *self, void *aux)
          void *aux;  
 {  {
         struct ess_softc *sc = (void *)self;          struct ess_softc *sc;
         struct isa_attach_args *ia = aux;          struct isa_attach_args *ia;
         int enablejoy = 0;          int enablejoy;
   
           sc = (void *)self;
           ia = aux;
           enablejoy = 0;
         printf("\n");          printf("\n");
   
         sc->sc_ic = ia->ia_ic;          sc->sc_ic = ia->ia_ic;

Legend:
Removed from v.1.10.6.3  
changed lines
  Added in v.1.10.6.4

CVSweb <webmaster@jp.NetBSD.org>