Module Name: src
Committed By: jakllsch
Date: Mon Aug 23 02:57:19 UTC 2010
Modified Files:
src/sys/arch/x86/pci: fwhrng.c i82802reg.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/pci/fwhrng.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x86/pci/i82802reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/fwhrng.c
diff -u src/sys/arch/x86/pci/fwhrng.c:1.1 src/sys/arch/x86/pci/fwhrng.c:1.2
--- src/sys/arch/x86/pci/fwhrng.c:1.1 Fri Jul 23 00:43:21 2010
+++ src/sys/arch/x86/pci/fwhrng.c Mon Aug 23 02:57:19 2010
@@ -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);
Index: src/sys/arch/x86/pci/i82802reg.h
diff -u src/sys/arch/x86/pci/i82802reg.h:1.3 src/sys/arch/x86/pci/i82802reg.h:1.4
--- src/sys/arch/x86/pci/i82802reg.h:1.3 Fri Jul 23 00:43:21 2010
+++ src/sys/arch/x86/pci/i82802reg.h Mon Aug 23 02:57:19 2010
@@ -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
