diff options
| author | simokawa <simokawa@FreeBSD.org> | 2003-04-29 13:27:13 +0000 |
|---|---|---|
| committer | simokawa <simokawa@FreeBSD.org> | 2003-04-29 13:27:13 +0000 |
| commit | 4e1e1a4c31b3be0a9725f0b26280f63c5315d606 (patch) | |
| tree | 0db87d8ec762a244d0e68eb7da7bcf4ca44a7810 | |
| parent | 284d69d7b0ddbfa7a18a9d36e5cf00df3cf66773 (diff) | |
| download | FreeBSD-src-4e1e1a4c31b3be0a9725f0b26280f63c5315d606.zip FreeBSD-src-4e1e1a4c31b3be0a9725f0b26280f63c5315d606.tar.gz | |
Move CSR definitions to iec*.h from firewirereg.h.
| -rw-r--r-- | sys/dev/firewire/firewirereg.h | 28 | ||||
| -rw-r--r-- | sys/dev/firewire/iec13213.h | 21 | ||||
| -rw-r--r-- | sys/dev/firewire/iec68113.h | 7 |
3 files changed, 28 insertions, 28 deletions
diff --git a/sys/dev/firewire/firewirereg.h b/sys/dev/firewire/firewirereg.h index 3418aac..c918e20 100644 --- a/sys/dev/firewire/firewirereg.h +++ b/sys/dev/firewire/firewirereg.h @@ -291,34 +291,6 @@ void fw_drain_txq __P((struct firewire_comm *)); extern int firewire_debug; extern devclass_t firewire_devclass; -#define DV_BROADCAST_ON (1<<30) -#define IP_CHANNELS 0x0234 - -#define STATE_CLEAR 0x0000 -#define STATE_SET 0x0004 -#define NODE_IDS 0x0008 -#define RESET_START 0x000c -#define SPLIT_TIMEOUT_HI 0x0018 -#define SPLIT_TIMEOUT_LO 0x001c -#define CYCLE_TIME 0x0200 -#define BUS_TIME 0x0204 -#define BUSY_TIMEOUT 0x0210 -#define BUS_MGR_ID 0x021c -#define BANDWIDTH_AV 0x0220 -#define CHANNELS_AV_HI 0x0224 -#define CHANNELS_AV_LO 0x0228 - -#define CONF_ROM 0x0400 - -#define TOPO_MAP 0x1000 -#define SPED_MAP 0x2000 - -#define oMPR 0x900 -#define oPCR 0x904 - -#define iMPR 0x980 -#define iPCR 0x984 - #define FWPRI ((PZERO+8)|PCATCH) #if __FreeBSD_version >= 500000 diff --git a/sys/dev/firewire/iec13213.h b/sys/dev/firewire/iec13213.h index 25ce305..14b9627 100644 --- a/sys/dev/firewire/iec13213.h +++ b/sys/dev/firewire/iec13213.h @@ -35,6 +35,27 @@ * */ +#define STATE_CLEAR 0x0000 +#define STATE_SET 0x0004 +#define NODE_IDS 0x0008 +#define RESET_START 0x000c +#define SPLIT_TIMEOUT_HI 0x0018 +#define SPLIT_TIMEOUT_LO 0x001c +#define CYCLE_TIME 0x0200 +#define BUS_TIME 0x0204 +#define BUSY_TIMEOUT 0x0210 +#define PRIORITY_BUDGET 0x0218 +#define BUS_MGR_ID 0x021c +#define BANDWIDTH_AV 0x0220 +#define CHANNELS_AV_HI 0x0224 +#define CHANNELS_AV_LO 0x0228 +#define IP_CHANNELS 0x0234 + +#define CONF_ROM 0x0400 + +#define TOPO_MAP 0x1000 +#define SPED_MAP 0x2000 + #define CSRTYPE_SHIFT 6 #define CSRTYPE_MASK (3 << CSRTYPE_SHIFT) #define CSRTYPE_I (0 << CSRTYPE_SHIFT) /* Immediate */ diff --git a/sys/dev/firewire/iec68113.h b/sys/dev/firewire/iec68113.h index 2e47aab..7b7c188 100644 --- a/sys/dev/firewire/iec68113.h +++ b/sys/dev/firewire/iec68113.h @@ -34,6 +34,13 @@ * $FreeBSD$ * */ + +#define DV_BROADCAST_ON (1<<30) +#define oMPR 0x900 +#define oPCR 0x904 +#define iMPR 0x980 +#define iPCR 0x984 + struct ciphdr { #if BYTE_ORDER == BIG_ENDIAN u_int8_t eoh0:1, /* 0 */ |
