[src/netbsd-1-4]: src/sys/dev/pcmcia pullup 1.8->1.9 (thorpej)

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b21790fe1df4
branches:  netbsd-1-4
changeset: 468504:b21790fe1df4
user:      perry <perry%NetBSD.org@localhost>
date:      Tue Apr 27 13:51:29 1999 +0000

description:
pullup 1.8->1.9 (thorpej)

diffstat:

 sys/dev/pcmcia/aic_pcmcia.c |  14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diffs (35 lines):

diff -r 48efa9349442 -r b21790fe1df4 sys/dev/pcmcia/aic_pcmcia.c
--- a/sys/dev/pcmcia/aic_pcmcia.c       Tue Apr 27 00:22:08 1999 +0000
+++ b/sys/dev/pcmcia/aic_pcmcia.c       Tue Apr 27 13:51:29 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aic_pcmcia.c,v 1.8 1998/11/20 02:12:15 thorpej Exp $   */
+/*     $NetBSD: aic_pcmcia.c,v 1.8.4.1 1999/04/27 13:51:29 perry Exp $ */
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
@@ -170,6 +170,7 @@
                panic("aic_pcmcia_attach: impossible");
        }
 
+#if 0  /* XXX power management broken somehow. */
        /* We can enable and disable the controller. */
        sc->sc_adapter.scsipi_enable = aic_pcmcia_enable;
 
@@ -180,6 +181,17 @@
        pcmcia_function_disable(pf);
 
        printf(": %s\n", app->app_name);
+#else
+       printf(": %s\n", app->app_name);
+
+       psc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_BIO,
+           aicintr, &psc->sc_aic);
+       if (psc->sc_ih == NULL) {
+               printf("%s: couldn't establish interrupt handler\n",
+                   psc->sc_aic.sc_dev.dv_xname);
+               return;
+       }
+#endif
 
        aicattach(sc);
 }