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

Fix a botch in the previous rev 1.21: 

We have to mask higher bits on NCR register access via bus_space_read_4(9),
as the previous NCR_READ_REG() does.
Problem reported by Erik Bertelsen on port-pmax@.

I tested a different version on 3MIN and I also tested committed version
on gxemul, but 3MAX doesn't have asc_ioasic but asc_tc..
This commit is contained in:
tsutsui 2009-08-12 14:06:13 +00:00
parent 598bb4aec3
commit c144cf4a36
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/arch/pmax/tc/asc_ioasic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: asc_ioasic.c,v 1.21 2009/08/01 08:20:36 tsutsui Exp $ */
/* $NetBSD: asc_ioasic.c,v 1.22 2009/08/12 14:06:13 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: asc_ioasic.c,v 1.21 2009/08/01 08:20:36 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: asc_ioasic.c,v 1.22 2009/08/12 14:06:13 tsutsui Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -71,11 +71,11 @@ struct asc_softc {
};
#define ASC_READ_REG(asc, reg) \
bus_space_read_4((asc)->sc_bst, (asc)->sc_scsi_bsh, \
(reg) * sizeof(uint32_t))
((uint8_t)bus_space_read_4((asc)->sc_bst, (asc)->sc_scsi_bsh, \
(reg) * sizeof(uint32_t)))
#define ASC_WRITE_REG(asc, reg, val) \
bus_space_write_4((asc)->sc_bst, (asc)->sc_scsi_bsh, \
(reg) * sizeof(uint32_t), (val))
(reg) * sizeof(uint32_t), (uint8_t)(val))
static int asc_ioasic_match(device_t, cfdata_t, void *);
static void asc_ioasic_attach(device_t, device_t, void *);
@ -421,11 +421,8 @@ static uint8_t
asc_read_reg(struct ncr53c9x_softc *sc, int reg)
{
struct asc_softc *asc = (struct asc_softc *)sc;
uint32_t v;
v = ASC_READ_REG(asc, reg);
return v & 0xff;
return ASC_READ_REG(asc, reg);
}
static void