[src/netbsd-3]: src Apply patch (requested by jnemeth in ticket #1153):

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

details:   https://anonhg.NetBSD.org/src/rev/a6b9d0d5e23d
branches:  netbsd-3
changeset: 577803:a6b9d0d5e23d
user:      riz <riz%NetBSD.org@localhost>
date:      Fri Feb 03 05:19:41 2006 +0000

description:
Apply patch (requested by jnemeth in ticket #1153):
aic(4): work around rbus resource allocation problem so cards work
       again. [jnemeth 20060131]

diffstat:

 doc/HACKS                   |  13 ++++++++++++-
 sys/dev/pcmcia/aic_pcmcia.c |   7 +++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diffs (55 lines):

diff -r 45ce2325dcff -r a6b9d0d5e23d doc/HACKS
--- a/doc/HACKS Wed Feb 01 20:46:35 2006 +0000
+++ b/doc/HACKS Fri Feb 03 05:19:41 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.42 2005/02/22 18:47:09 christos Exp $
+# $NetBSD: HACKS,v 1.42.2.1 2006/02/03 05:19:41 riz Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -110,6 +110,17 @@
        applied is imported this should be backed out.
 kcah
 
+hack           rbus resource allocation work around
+cdate          31 January 2006
+who            jnemeth
+file           src/sys/dev/pcmcia/aic_pcmcia.c : 1.32
+pr             26909 31245
+descr
+       On some cards, the card align field property value interferes
+       with the rbus resource allocation causing the card not to
+       configure properly.  Setting it to 0 fixes the problem but it
+       is not the proper solution.
+kcah
 
 port   vax
 
diff -r 45ce2325dcff -r a6b9d0d5e23d sys/dev/pcmcia/aic_pcmcia.c
--- a/sys/dev/pcmcia/aic_pcmcia.c       Wed Feb 01 20:46:35 2006 +0000
+++ b/sys/dev/pcmcia/aic_pcmcia.c       Fri Feb 03 05:19:41 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aic_pcmcia.c,v 1.32 2005/02/04 02:10:45 perry Exp $    */
+/*     $NetBSD: aic_pcmcia.c,v 1.32.4.1 2006/02/03 05:19:41 riz Exp $  */
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.32 2005/02/04 02:10:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.32.4.1 2006/02/03 05:19:41 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -106,6 +106,9 @@
            cfe->num_memspace != 0 ||
            cfe->num_iospace != 1)
                return (EINVAL);
+/* XXX  Below line is a hack to get around an rbus resource allocation */
+/* XXX  problem.  It should be removed when the problem is fixed.      */
+       cfe->iomask = 0;
        return (0);
 }