[src/netbsd-7]: src/sys/arch/amiga/amiga Pull up following revision(s) (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/e0a4f71fca9b
branches:  netbsd-7
changeset: 798854:e0a4f71fca9b
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Jan 17 12:20:14 2015 +0000

description:
Pull up following revision(s) (requested by phx in ticket #429):
        sys/arch/amiga/amiga/gayle.c: revision 1.8
Fixed crash of A4000 IDE due to uninitialised bus_space_tag and bus_space
handle for the interrupt status register.

diffstat:

 sys/arch/amiga/amiga/gayle.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 0c792af89c3b -r e0a4f71fca9b sys/arch/amiga/amiga/gayle.c
--- a/sys/arch/amiga/amiga/gayle.c      Sat Jan 17 12:16:34 2015 +0000
+++ b/sys/arch/amiga/amiga/gayle.c      Sat Jan 17 12:20:14 2015 +0000
@@ -1,9 +1,9 @@
-/*     $NetBSD: gayle.c,v 1.7 2014/01/03 00:33:06 rkujawa Exp $        */
+/*     $NetBSD: gayle.c,v 1.7.4.1 2015/01/17 12:20:14 martin Exp $     */
 
 /* public domain */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gayle.c,v 1.7 2014/01/03 00:33:06 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gayle.c,v 1.7.4.1 2015/01/17 12:20:14 martin Exp $");
 
 /*
  * Gayle management - provide functions for use in the drivers that utilise
@@ -75,9 +75,11 @@
        if (is_a4000()) {
                gayle_t->gayle_isr_bst.base = (bus_addr_t) __UNVOLATILE(ztwomap(
                    GAYLE_IDE_BASE_A4000+GAYLE_IDE_INTREQ_A4000));
+               gayle_t->gayle_isr_bst.absm = &amiga_bus_stride_1;
+               gayle_t->gayle_isr_t = &(gayle_t->gayle_isr_bst);
 
-               gayle_t->gayle_io_bst.absm = &amiga_bus_stride_1;
-               gayle_t->gayle_isr_t = &(gayle_t->gayle_isr_bst);
+               bus_space_map(gayle_t->gayle_isr_t, 0, 0x1, 0,
+                   &(gayle_t->gayle_isr_h));
        } else {
                bus_space_subregion(gayle_t->gayle_io_t, gayle_t->gayle_io_h, 
                    GAYLE_INTREQ, 0x1, &(gayle_t->gayle_isr_h));