diff options
| author | nyan <nyan@FreeBSD.org> | 2001-06-14 11:05:48 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2001-06-14 11:05:48 +0000 |
| commit | 182f190f2340ffb7541aa50d275c3438e6a935bd (patch) | |
| tree | ed3c0a7cd03719d7c06a6759dc0f1b282e1f933d | |
| parent | 246086e8670f36a480f96ff92f15395c1902b240 (diff) | |
| download | FreeBSD-src-182f190f2340ffb7541aa50d275c3438e6a935bd.zip FreeBSD-src-182f190f2340ffb7541aa50d275c3438e6a935bd.tar.gz | |
Moved the wd33c93 specific file to sys/dev/ic.
| -rw-r--r-- | sys/dev/ct/bshw_machdep.c | 2 | ||||
| -rw-r--r-- | sys/dev/ct/ct.c | 2 | ||||
| -rw-r--r-- | sys/dev/ct/ct_isa.c | 2 | ||||
| -rw-r--r-- | sys/dev/ic/wd33c93reg.h (renamed from sys/i386/isa/ic/wd33c93.h) | 22 | ||||
| -rw-r--r-- | sys/i386/isa/bs/bsif.h | 2 |
5 files changed, 19 insertions, 11 deletions
diff --git a/sys/dev/ct/bshw_machdep.c b/sys/dev/ct/bshw_machdep.c index 37aebdd..6b375ab 100644 --- a/sys/dev/ct/bshw_machdep.c +++ b/sys/dev/ct/bshw_machdep.c @@ -80,7 +80,7 @@ #include <cam/scsi/scsi_low.h> -#include <i386/isa/ic/wd33c93.h> +#include <dev/ic/wd33c93reg.h> #include <dev/ct/ctvar.h> #include <dev/ct/bshwvar.h> #endif /* __FreeBSD__ */ diff --git a/sys/dev/ct/ct.c b/sys/dev/ct/ct.c index a0bb390..71d62f5 100644 --- a/sys/dev/ct/ct.c +++ b/sys/dev/ct/ct.c @@ -78,7 +78,7 @@ #include <cam/scsi/scsi_low.h> -#include <i386/isa/ic/wd33c93.h> +#include <dev/ic/wd33c93reg.h> #include <dev/ct/ctvar.h> #endif /* __FreeBSD__ */ diff --git a/sys/dev/ct/ct_isa.c b/sys/dev/ct/ct_isa.c index 959a2a8..5ca8006 100644 --- a/sys/dev/ct/ct_isa.c +++ b/sys/dev/ct/ct_isa.c @@ -84,7 +84,7 @@ #include <cam/scsi/scsi_low.h> -#include <i386/isa/ic/wd33c93.h> +#include <dev/ic/wd33c93reg.h> #include <dev/ct/ctvar.h> #include <dev/ct/bshwvar.h> #endif /* __FreeBSD__ */ diff --git a/sys/i386/isa/ic/wd33c93.h b/sys/dev/ic/wd33c93reg.h index 5e0e017..c286c65 100644 --- a/sys/i386/isa/ic/wd33c93.h +++ b/sys/dev/ic/wd33c93reg.h @@ -1,8 +1,12 @@ +/* $FreeBSD$ */ +/* $NecBSD: wd33c93reg.h,v 1.21.24.1 2001/06/13 05:52:05 honda Exp $ */ +/* $NetBSD$ */ /* - * [NetBSD for NEC PC98 series] - * Copyright (c) 1996 NetBSD/pc98 porting staff. - * Copyright (c) 1996 Naofumi Honda - * All rights reserved. + * [NetBSD for NEC PC-98 series] + * Copyright (c) 1996, 1997, 1998 + * NetBSD/pc98 porting staff. All rights reserved. + * Copyright (c) 1996, 1997, 1998 + * Naofumi Honda. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -26,8 +30,6 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ */ #ifndef _WD33C93REG_H_ @@ -35,9 +37,10 @@ /* wd33c93 register */ #define wd3s_oid 0x00 -#define IDR_FS_15_20 0x80 +#define IDR_FS_16_20 0x80 #define IDR_FS_12_15 0x40 #define IDR_FS_8_10 0x00 +#define IDR_RAF 0x20 #define IDR_EHP 0x10 #define IDR_EAF 0x08 #define IDR_IDM 0x07 @@ -60,6 +63,8 @@ #define wd3s_synch 0x11 #define wd3s_cnt 0x12 #define wd3s_did 0x15 +#define DIDR_SCC 0x80 +#define DIDR_DPD 0x40 #define wd3s_sid 0x16 #define SIDR_RESEL 0x80 @@ -88,11 +93,14 @@ #define BSR_MSGOUT 0x06 #define BSR_MSGIN 0x07 +#define BSR_RESET 0x00 +#define BSR_AFM_RESET 0x01 #define BSR_SELECTED 0x11 #define BSR_SATFIN 0x16 #define BSR_ACKREQ 0x20 #define BSR_SATSDP 0x21 #define BSR_RESEL 0x80 +#define BSR_AFM_RESEL 0x81 #define BSR_DISC 0x85 #define wd3s_cmd 0x18 diff --git a/sys/i386/isa/bs/bsif.h b/sys/i386/isa/bs/bsif.h index 807405c..28daf2e 100644 --- a/sys/i386/isa/bs/bsif.h +++ b/sys/i386/isa/bs/bsif.h @@ -152,7 +152,7 @@ #define BUS_IOR(offs) (BUS_IO_DELAY, inb(bsc->sc_iobase + (offs))) #define BUS_IOW(offs, val) (BUS_IO_DELAY, outb(bsc->sc_iobase + (offs), (val))) -#include <i386/isa/ic/wd33c93.h> +#include <dev/ic/wd33c93reg.h> #include <i386/isa/ccbque.h> #include <cam/scsi/scsi_dvcfg.h> |
