Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't reference nonexistent register on R96. (and maybe R94 too)

This commit is contained in:
ur 2001-03-30 09:10:48 +00:00
parent 70a7bcb64b
commit 5ba1d71d33
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/arc/arc/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.50 2001/03/15 06:10:35 chs Exp $ */
/* $NetBSD: machdep.c,v 1.51 2001/03/30 09:10:48 ur Exp $ */
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
/*
@ -1326,7 +1326,8 @@ initcpu()
case NEC_RD94:
case NEC_R96:
case NEC_JC94:
out32(RD94_SYS_LB_IE, 0);
out16(RD94_SYS_LB_IE1, 0);
out16(RD94_SYS_LB_IE2, 0);
out32(RD94_SYS_EXT_IMASK, 0);
break;
}

11
sys/arch/arc/jazz/jazzio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: jazzio.c,v 1.2 2001/02/17 04:27:55 tsutsui Exp $ */
/* $NetBSD: jazzio.c,v 1.3 2001/03/30 09:10:49 ur Exp $ */
/* $OpenBSD: picabus.c,v 1.11 1999/01/11 05:11:10 millert Exp $ */
/* NetBSD: tc.c,v 1.2 1995/03/08 00:39:05 cgd Exp */
@ -342,15 +342,18 @@ jazzio_intr_establish(slot, handler, val)
break;
case NEC_R94:
case NEC_R96:
out16(RD94_SYS_LB_IE2, local_int_mask);
break;
case NEC_RAx94:
case NEC_RD94:
case NEC_R96:
case NEC_JC94:
/* XXX: I don't know why, but firmware does. */
if (in32(0xe0000560) != 0)
out16(RD94_SYS_LB_IE+2, local_int_mask);
out16(RD94_SYS_LB_IE2, local_int_mask);
else
out16(RD94_SYS_LB_IE, local_int_mask);
out16(RD94_SYS_LB_IE1, local_int_mask);
break;
}
}

5
sys/arch/arc/jazz/rd94.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: rd94.h,v 1.1 2000/12/24 09:25:29 ur Exp $ */
/* $NetBSD: rd94.h,v 1.2 2001/03/30 09:10:49 ur Exp $ */
/* $OpenBSD: pica.h,v 1.4 1996/09/14 15:58:28 pefo Exp $ */
/*
@ -90,7 +90,8 @@
#define RD94_SYS_THERMOMETER (RD94LB+0x12000)/* DS1620 thermometer */
#define RD94_SYS_LB_LED (RD94LB+0xE000) /* LED/self-test register */
#define RD94_SYS_LB_IE (RD94LB+0xF000) /* Local bus int enable */
#define RD94_SYS_LB_IE1 (RD94LB+0xF000) /* Local bus int enable */
#define RD94_SYS_LB_IE2 (RD94LB+0xF002) /* Local bus int enable */
#define RD94_SYS_LB_IE_PAR1 0x0001 /* Parallel port enable */
#define RD94_SYS_LB_IE_FLOPPY 0x0002 /* Floppy ctrl enable */
#define RD94_SYS_LB_IE_SOUND 0x0004 /* Sound port enable */