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

diff --cc SConscript
Simple merge

diff --cc dev/ns_gige.cc
Simple merge

diff --cc dev/ns_gige.hh
Simple merge

diff --cc dev/pcidev.hh
Simple merge

diff --cc dev/sinic.cc
Simple merge

diff --cc dev/tsunamireg.h
index 8b290deb1db0110c4bc44fa99dd5d6df3b5ecebf,583ff78b44c7d956ea35d2822d7309b197242597..a102599001e06e6ca4b7133de35a93e6d116ece1
--- 1/dev/tsunamireg.h
--- 2/dev/tsunamireg.h
+++ b/dev/tsunamireg.h
@@@ -118,23 -118,19 +118,31 @@@
  #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
 +
 +/* Added for ATA PCI DMA */
 +#define ATA_PCI_DMA         0x00
 +#define ATA_PCI_DMA2        0x02
 +#define ATA_PCI_DMA3        0x16
 +#define ATA_PCI_DMA4        0x17
 +#define ATA_PCI_DMA5        0x1a
 +#define ATA_PCI_DMA6        0x11
 +#define ATA_PCI_DMA7        0x14
 +
  #define TSDEV_RTC_ADDR      0x70
  #define TSDEV_RTC_DATA      0x71
  

diff --cc kern/linux/linux_system.cc
Simple merge