[src/netbsd-1-5]: src/sys/dev/ofisa Pull up revision 1.6 (requested by nathanw):

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

details:   https://anonhg.NetBSD.org/src/rev/bd755a8e2629
branches:  netbsd-1-5
changeset: 490538:bd755a8e2629
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Thu Jan 25 20:55:36 2001 +0000

description:
Pull up revision 1.6 (requested by nathanw):
  Support certain ISAPnP ESS 1868 and 1869 cards. Per PR port-i386/11630.

diffstat:

 sys/dev/ofisa/ess_ofisa.c |  9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 18431e61c4a1 -r bd755a8e2629 sys/dev/ofisa/ess_ofisa.c
--- a/sys/dev/ofisa/ess_ofisa.c Thu Jan 25 20:55:33 2001 +0000
+++ b/sys/dev/ofisa/ess_ofisa.c Thu Jan 25 20:55:36 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ess_ofisa.c,v 1.5 1999/03/16 13:07:45 mycroft Exp $    */
+/*     $NetBSD: ess_ofisa.c,v 1.5.18.1 2001/01/25 20:55:36 jhawk Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -158,6 +158,13 @@
                return;
        }
 
+       /* 
+        * The Shark firmware doesn't program the ESS ISA address registers.
+        * Do that here instead of inside essmatch() since we want to defer
+        * to the firmware on other platforms.
+        */
+       if (ess_config_addr(sc))
+               return;
        if (essmatch(sc) == 0) {
                printf(": essmatch failed\n");
                return;