[src/trunk]: src/sys/dev/isa Make it possible to force 16 mode via "flags 4" ...

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

details:   https://anonhg.NetBSD.org/src/rev/29c97275b375
branches:  trunk
changeset: 467736:29c97275b375
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Mar 28 12:51:49 1999 +0000

description:
Make it possible to force 16 mode via "flags 4" in kernel configuration.
Patch supplied by Martin Husemann on "current-users", fixes PR kern/5673.

diffstat:

 sys/dev/isa/if_we.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r ecef584ac3fb -r 29c97275b375 sys/dev/isa/if_we.c
--- a/sys/dev/isa/if_we.c       Sun Mar 28 11:56:51 1999 +0000
+++ b/sys/dev/isa/if_we.c       Sun Mar 28 12:51:49 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_we.c,v 1.14 1999/03/23 21:41:08 drochner Exp $      */
+/*     $NetBSD: if_we.c,v 1.15 1999/03/28 12:51:49 tron Exp $  */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -347,10 +347,11 @@
        bus_space_handle_t nich, asich, memh;
        const char *typestr;
        u_int8_t x;
-       int i;
+       int i, forced_16bit;
 
        printf("\n");
 
+       forced_16bit = 0;
        nict = asict = ia->ia_iot;
        memt = ia->ia_memt;
 
@@ -388,8 +389,10 @@
        /*
         * Allow user to override 16-bit mode.  8-bit takes precedence.
         */
-       if (self->dv_cfdata->cf_flags & WE_FLAGS_FORCE_16BIT_MODE)
+       if (self->dv_cfdata->cf_flags & WE_FLAGS_FORCE_16BIT_MODE) {
                wsc->sc_16bitp = 1;
+               forced_16bit = 1;
+       }
        if (self->dv_cfdata->cf_flags & WE_FLAGS_FORCE_8BIT_MODE)
                wsc->sc_16bitp = 0;
 
@@ -432,6 +435,7 @@
            (wsc->sc_type == WE_TYPE_TOSHIBA1) ||
            (wsc->sc_type == WE_TYPE_TOSHIBA4) ||
 #endif
+           (forced_16bit) ||
            (wsc->sc_type == WE_TYPE_WD8013EBT)) {
                wsc->sc_laar_proto = (ia->ia_maddr >> 19) & WE_LAAR_ADDRHI;
                if (wsc->sc_16bitp)