Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci Restrict the hack for offset BAR's to x86.



details:   https://anonhg.NetBSD.org/src/rev/1c00c6ca1b98
branches:  trunk
changeset: 788840:1c00c6ca1b98
user:      soren <soren%NetBSD.org@localhost>
date:      Tue Jul 23 07:40:38 2013 +0000

description:
Restrict the hack for offset BAR's to x86.
A cleaner fix requires a rewrite of puc.c, but not today.

diffstat:

 sys/dev/pci/puc.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r ecaa6c2e5529 -r 1c00c6ca1b98 sys/dev/pci/puc.c
--- a/sys/dev/pci/puc.c Tue Jul 23 07:04:18 2013 +0000
+++ b/sys/dev/pci/puc.c Tue Jul 23 07:40:38 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: puc.c,v 1.35 2013/07/22 14:52:02 soren Exp $   */
+/*     $NetBSD: puc.c,v 1.36 2013/07/23 07:40:38 soren Exp $   */
 
 /*
  * Copyright (c) 1996, 1998, 1999
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puc.c,v 1.35 2013/07/22 14:52:02 soren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puc.c,v 1.36 2013/07/23 07:40:38 soren Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -265,9 +265,11 @@
                    sc->sc_bar_mappings[barindex].a +
                    sc->sc_desc->ports[i].offset, &subregion_handle);
                if (is_console) {
-                        sc->sc_bar_mappings[barindex].mapped = 1;
-                               sc->sc_bar_mappings[barindex].h = subregion_handle -
+                       sc->sc_bar_mappings[barindex].mapped = 1;
+#if defined(amd64) || defined(i386)
+                       sc->sc_bar_mappings[barindex].h = subregion_handle -
                            sc->sc_desc->ports[i].offset;       /* XXX hack */
+#endif
                }
 #endif
                if (!sc->sc_bar_mappings[barindex].mapped) {



Home | Main Index | Thread Index | Old Index