diff options
| author | Benjamin Nash <benash@umich.edu> | 2005-08-15 17:17:17 -0400 |
|---|---|---|
| committer | Benjamin Nash <benash@umich.edu> | 2005-08-15 17:17:17 -0400 |
| commit | bcc333e92006f52baeef1ae0f94d4765513584d8 (patch) | |
| tree | 88e3fbd634750cec0e1e4210d62a1f90fd3d2380 /dev/tsunamireg.h | |
| parent | 49063eb24f8fd2ad010224cc282c55dd5471dd65 (diff) | |
| parent | b64eae5e52d9eb60ad498464d076b48cd5ceafe3 (diff) | |
| download | gem5-bcc333e92006f52baeef1ae0f94d4765513584d8.tar.xz | |
Merge zed.eecs.umich.edu:/.automount/fox/y/mserrano/m5_dir/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
dev/ide_ctrl.cc:
dev/ide_ctrl.hh:
dev/ide_disk.cc:
dev/ide_disk.hh:
dev/ns_gige.cc:
dev/pciconfigall.cc:
dev/pcidev.cc:
dev/rtcreg.h:
dev/tsunami_io.cc:
dev/tsunami_io.hh:
dev/uart8250.cc:
dev/uart8250.hh:
python/m5/objects/Tsunami.py:
Merge code.
--HG--
extra : convert_revision : e97d5dbcc051d2061622201265430d359f995d48
Diffstat (limited to 'dev/tsunamireg.h')
| -rw-r--r-- | dev/tsunamireg.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/dev/tsunamireg.h b/dev/tsunamireg.h index 8b290deb1..a10259900 100644 --- a/dev/tsunamireg.h +++ b/dev/tsunamireg.h @@ -118,10 +118,18 @@ #define TSDEV_DMA2_MODE 0xD6 #define TSDEV_DMA1_MASK 0x0A #define TSDEV_DMA2_MASK 0xD4 -#define TSDEV_TMR_CTL 0x61 -#define TSDEV_TMR2_CTL 0x43 -#define TSDEV_TMR2_DATA 0x42 +#define TSDEV_CTRL_PORTB 0x61 #define TSDEV_TMR0_DATA 0x40 +#define TSDEV_TMR1_DATA 0x41 +#define TSDEV_TMR2_DATA 0x42 +#define TSDEV_TMR_CTRL 0x43 +#define TSDEV_KBD 0x64 +#define TSDEV_DMA1_CMND 0x08 +#define TSDEV_DMA1_STAT TSDEV_DMA1_CMND +#define TSDEV_DMA2_CMND 0xD0 +#define TSDEV_DMA2_STAT TSDEV_DMA2_CMND +#define TSDEV_DMA1_MMASK 0x0F +#define TSDEV_DMA2_MMASK 0xDE /* Added for keyboard accesses */ #define TSDEV_KBD 0x64 @@ -157,4 +165,7 @@ #define UART_MCR_LOOP 0x10 +// System Control PortB Status Bits +#define PORTB_SPKR_HIGH 0x20 + #endif // __TSUNAMIREG_H__ |