[src/trunk]: src/sys/dev/pcmcia The workaround for Hagiwara SYS-COM Compact F...

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

details:   https://anonhg.NetBSD.org/src/rev/96df3b655d32
branches:  trunk
changeset: 481521:96df3b655d32
user:      enami <enami%NetBSD.org@localhost>
date:      Tue Feb 01 06:48:15 2000 +0000

description:
The workaround for Hagiwara SYS-COM Compact Flash card is no longer necessary.

diffstat:

 sys/dev/pcmcia/wdc_pcmcia.c |  24 ++----------------------
 1 files changed, 2 insertions(+), 22 deletions(-)

diffs (63 lines):

diff -r c9f4932766be -r 96df3b655d32 sys/dev/pcmcia/wdc_pcmcia.c
--- a/sys/dev/pcmcia/wdc_pcmcia.c       Tue Feb 01 06:00:35 2000 +0000
+++ b/sys/dev/pcmcia/wdc_pcmcia.c       Tue Feb 01 06:48:15 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdc_pcmcia.c,v 1.27 2000/01/24 23:14:23 enami Exp $ */
+/*     $NetBSD: wdc_pcmcia.c,v 1.28 2000/02/01 06:48:15 enami Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -96,7 +96,6 @@
        u_int32_t       wpp_vendor;     /* vendor ID */
        u_int32_t       wpp_product;    /* product ID */
        int             wpp_quirk_flag; /* Quirk flags */
-#define WDC_PCMCIA_FORCE_16BIT_IO      0x01 /* Don't use PCMCIA_WIDTH_AUTO */
 #define WDC_PCMCIA_NO_EXTRA_RESETS     0x02 /* Only reset ctrl once */
        const char      *wpp_cis_info[4];       /* XXX necessary? */
        const char      *wpp_name;      /* product name */
@@ -112,12 +111,6 @@
          0, { NULL, "PCMCIA Portable CD-ROM Drive", NULL, NULL },
          PCMCIA_STR_IBM_PORTABLE_CDROM },
 
-       { PCMCIA_VENDOR_HAGIWARASYSCOM,
-         -1,                   /* XXX */
-         WDC_PCMCIA_FORCE_16BIT_IO,
-         { NULL, NULL, NULL, NULL },
-         "Hagiwara SYS-COM CompactFlash Card" },
-
        /* The TEAC IDE/Card II is used on the Sony Vaio */
        { PCMCIA_VENDOR_TEAC,
          PCMCIA_PRODUCT_TEAC_IDECARDII,
@@ -309,31 +302,18 @@
                return;
        }
 
-       /*
-        * XXX  DEC Mobile Media CDROM is not yet tested whether it works
-        * XXX  with PCMCIA_WIDTH_IO16.  HAGIWARA SYS-COM HPC-CF32 doesn't
-        * XXX  work with PCMCIA_WIDTH_AUTO.
-        * XXX  CANON FC-8M (SANDISK SDCFB 8M) works for both _AUTO and IO16.
-        * XXX  So, here is temporary work around.
-        */
        wpp = wdc_pcmcia_lookup(pa);
        if (wpp != NULL)
                quirks = wpp->wpp_quirk_flag;
        else
                quirks = 0;
 
-       if (pcmcia_io_map(pa->pf, quirks & WDC_PCMCIA_FORCE_16BIT_IO ?
-           PCMCIA_WIDTH_IO16 : PCMCIA_WIDTH_AUTO, 0,
+       if (pcmcia_io_map(pa->pf, PCMCIA_WIDTH_AUTO, 0,
            sc->sc_pioh.size, &sc->sc_pioh, &sc->sc_iowindow)) {
                printf(": can't map first I/O space\n");
                return;
        } 
 
-       /*
-        * Currently, # of iospace is 1 except DIGITAL Mobile Media CD-ROM.
-        * So whether the work around like above is necessary or not
-        * is unknown.  XXX.
-        */
        if (cfe->num_iospace <= 1)
                sc->sc_auxiowindow = -1;
        else if (pcmcia_io_map(pa->pf, PCMCIA_WIDTH_AUTO, 0,