[src/trunk]: src/sys/arch/x86/pci Move FWH chip detection area entirely withi...

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

details:   https://anonhg.NetBSD.org/src/rev/0fc28c9ad800
branches:  trunk
changeset: 757279:0fc28c9ad800
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Mon Aug 23 02:57:19 2010 +0000

description:
Move FWH chip detection area entirely within the mapping for
the smaller i82802AB. This is needed as not all BIOSes set a
larger-than-necessary decode range.

diffstat:

 sys/arch/x86/pci/fwhrng.c    |  8 ++++----
 sys/arch/x86/pci/i82802reg.h |  4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r 54d66b80cea9 -r 0fc28c9ad800 sys/arch/x86/pci/fwhrng.c
--- a/sys/arch/x86/pci/fwhrng.c Sun Aug 22 20:36:09 2010 +0000
+++ b/sys/arch/x86/pci/fwhrng.c Mon Aug 23 02:57:19 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fwhrng.c,v 1.1 2010/07/23 00:43:21 jakllsch Exp $      */
+/*     $NetBSD: fwhrng.c,v 1.2 2010/08/23 02:57:19 jakllsch Exp $      */
 
 /*
  * Copyright (c) 2000 Michael Shalayeff
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwhrng.c,v 1.1 2010/07/23 00:43:21 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwhrng.c,v 1.2 2010/08/23 02:57:19 jakllsch Exp $");
 
 #include "rnd.h"        
                             
@@ -85,7 +85,7 @@
        bst = x86_bus_space_mem;
 
        /* read chip ID */
-       if (bus_space_map(bst, I82802AC_MEMBASE, I82802AC_WINSIZE, 0, &bsh))
+       if (bus_space_map(bst, I82802AB_MEMBASE, I82802AB_WINSIZE, 0, &bsh))
                return 0;
 
        bus_space_write_1(bst, bsh, 0, 0xff); /* reset */
@@ -96,7 +96,7 @@
        id1 = bus_space_read_1(bst, bsh, 1);
        bus_space_write_1(bst, bsh, 0, 0xff); /* reset */
 
-       bus_space_unmap(bst, bsh, I82802AC_WINSIZE);
+       bus_space_unmap(bst, bsh, I82802AB_WINSIZE);
 
        aprint_debug_dev(parent, "fwh: data %02x,%02x, id %02x,%02x\n",
            data0, data1, id0, id1);
diff -r 54d66b80cea9 -r 0fc28c9ad800 sys/arch/x86/pci/i82802reg.h
--- a/sys/arch/x86/pci/i82802reg.h      Sun Aug 22 20:36:09 2010 +0000
+++ b/sys/arch/x86/pci/i82802reg.h      Mon Aug 23 02:57:19 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i82802reg.h,v 1.3 2010/07/23 00:43:21 jakllsch Exp $   */
+/*     $NetBSD: i82802reg.h,v 1.4 2010/08/23 02:57:19 jakllsch Exp $   */
 
 /*
  * Copyright (c) 2000 Michael Shalayeff
@@ -39,6 +39,8 @@
 #define        I82802AC_REGBASE        0xffb00000
 #define        I82802AC_MEMBASE        0xfff00000
 #define        I82802AC_WINSIZE        0x00100000
+#define        I82802AB_MEMBASE        0xfff80000
+#define        I82802AB_WINSIZE        0x00080000
 
 #define I82802_MFG     0x89
 #define I82802AB_ID    0xad