Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/amiga/amiga Fixed crash of A4000 IDE due to uniniti...
details: https://anonhg.NetBSD.org/src/rev/67998b8c1d13
branches: trunk
changeset: 335608:67998b8c1d13
user: phx <phx%NetBSD.org@localhost>
date: Fri Jan 16 23:34:11 2015 +0000
description:
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 70d2a4fad959 -r 67998b8c1d13 sys/arch/amiga/amiga/gayle.c
--- a/sys/arch/amiga/amiga/gayle.c Fri Jan 16 22:37:58 2015 +0000
+++ b/sys/arch/amiga/amiga/gayle.c Fri Jan 16 23:34:11 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.8 2015/01/16 23:34:11 phx 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.8 2015/01/16 23:34:11 phx 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));
Home |
Main Index |
Thread Index |
Old Index