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

Put back MSG_IDENTIFY_LUNMASK (renamed to just be within the IHA namespace. 

The definitions were not the same between the scsi_messages file and this
definition so simply removing it here and letting the other one be used
results in incorrect behavior (regardless of whether it made the code
compile....)
This commit is contained in:
jmc 2002-12-08 01:09:34 +00:00
parent 3bc2c4cf57
commit 29a7ff6364
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/ic/iha.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iha.c,v 1.19 2002/11/14 17:07:42 tsutsui Exp $ */
/* $NetBSD: iha.c,v 1.20 2002/12/08 01:09:34 jmc Exp $ */
/*-
* Device driver for the INI-9XXXU/UW or INIC-940/950 PCI SCSI Controller.
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: iha.c,v 1.19 2002/11/14 17:07:42 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: iha.c,v 1.20 2002/12/08 01:09:34 jmc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -2210,7 +2210,7 @@ iha_resel(sc)
}
target = bus_space_read_1(iot, ioh, TUL_SBID);
lun = bus_space_read_1(iot, ioh, TUL_SALVC) & MSG_IDENTIFY_LUNMASK;
lun = bus_space_read_1(iot, ioh, TUL_SALVC) & IHA_MSG_IDENTIFY_LUNMASK;
tcs = &sc->sc_tcs[target];

3
sys/dev/ic/ihareg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ihareg.h,v 1.5 2002/12/07 10:19:31 tsutsui Exp $ */
/* $NetBSD: ihareg.h,v 1.6 2002/12/08 01:09:35 jmc Exp $ */
/*-
* Device driver for the INI-9XXXU/UW or INIC-940/950 PCI SCSI Controller.
@ -145,6 +145,7 @@
#define TUL_SBID 0x89 /* R SCSI BUS ID */
#define TUL_SID 0x89 /* W SCSI ID */
#define TUL_SALVC 0x8A /* R FIFO Avail Cnt/Identify Msg */
#define IHA_MSG_IDENTIFY_LUNMASK 0x07
#define TUL_STIMO 0x8A /* W Sel/Resel Time Out Register */
#define STIMO_250MS 153 /* in units of 1.6385us */
#define TUL_SDATI 0x8B /* R SCSI Bus contents */