1 files changed, 94 insertions, 122 deletions
diff --git a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
index 3385f4fea..e39fb749f 100644
--- a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
+++ b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
@@ -14,7 +14,7 @@ kernel=/dist/m5/system/binaries/vmlinux
 mem_mode=atomic
 pal=/dist/m5/system/binaries/ts_osfpal
 physmem=drivesys.physmem
-readfile=/z/saidi/work/m5.bb/configs/boot/netperf-server.rcS
+readfile=/home/blackga/m5/repos/m5/configs/boot/netperf-server.rcS
 symbolfile=
 system_rev=1024
 system_type=34
@@ -179,7 +179,7 @@ read_only=true
 
 [drivesys.tsunami]
 type=Tsunami
-children=cchip console etherint ethernet fake_OROM fake_ata0 fake_ata1 fake_pnp_addr fake_pnp_read0 fake_pnp_read1 fake_pnp_read2 fake_pnp_read3 fake_pnp_read4 fake_pnp_read5 fake_pnp_read6 fake_pnp_read7 fake_pnp_write fake_ppc fake_sm_chip fake_uart1 fake_uart2 fake_uart3 fake_uart4 fb ide io pchip pciconfig uart
+children=cchip console ethernet fake_OROM fake_ata0 fake_ata1 fake_pnp_addr fake_pnp_read0 fake_pnp_read1 fake_pnp_read2 fake_pnp_read3 fake_pnp_read4 fake_pnp_read5 fake_pnp_read6 fake_pnp_read7 fake_pnp_write fake_ppc fake_sm_chip fake_uart1 fake_uart2 fake_uart3 fake_uart4 fb ide io pchip pciconfig uart
 intrctrl=drivesys.intrctrl
 system=drivesys
 
@@ -203,48 +203,8 @@ sim_console=drivesys.sim_console
 system=drivesys
 pio=drivesys.iobus.port[25]
 
-[drivesys.tsunami.etherint]
-type=NSGigEInt
-device=drivesys.tsunami.ethernet
-peer=Null
-
 [drivesys.tsunami.ethernet]
 type=NSGigE
-children=configdata
-clock=0
-config_latency=20000
-configdata=drivesys.tsunami.ethernet.configdata
-dma_data_free=false
-dma_desc_free=false
-dma_no_allocate=true
-dma_read_delay=0
-dma_read_factor=0
-dma_write_delay=0
-dma_write_factor=0
-hardware_address=00:90:00:00:00:01
-intr_delay=10000000
-max_backoff_delay=10000000
-min_backoff_delay=4000
-pci_bus=0
-pci_dev=1
-pci_func=0
-pio_latency=1000
-platform=drivesys.tsunami
-rss=false
-rx_delay=1000000
-rx_fifo_size=524288
-rx_filter=true
-rx_thread=false
-system=drivesys
-tx_delay=1000000
-tx_fifo_size=524288
-tx_thread=false
-config=drivesys.iobus.port[28]
-dma=drivesys.iobus.port[29]
-pio=drivesys.iobus.port[27]
-
-[drivesys.tsunami.ethernet.configdata]
-type=PciConfigData
 BAR0=1
 BAR0Size=256
 BAR1=0
@@ -277,6 +237,37 @@ SubClassCode=0
 SubsystemID=0
 SubsystemVendorID=0
 VendorID=4107
+clock=0
+config_latency=20000
+dma_data_free=false
+dma_desc_free=false
+dma_no_allocate=true
+dma_read_delay=0
+dma_read_factor=0
+dma_write_delay=0
+dma_write_factor=0
+hardware_address=00:90:00:00:00:01
+intr_delay=10000000
+max_backoff_delay=10000000
+min_backoff_delay=4000
+pci_bus=0
+pci_dev=1
+pci_func=0
+pio_latency=1000
+platform=drivesys.tsunami
+rss=false
+rx_delay=1000000
+rx_fifo_size=524288
+rx_filter=true
+rx_thread=false
+system=drivesys
+tx_delay=1000000
+tx_fifo_size=524288
+tx_thread=false
+config=drivesys.iobus.port[28]
+dma=drivesys.iobus.port[29]
+interface=etherlink.int1
+pio=drivesys.iobus.port[27]
 
 [drivesys.tsunami.fake_OROM]
 type=IsaFake
@@ -593,24 +584,6 @@ pio=drivesys.iobus.port[22]
 
 [drivesys.tsunami.ide]
 type=IdeController
-children=configdata
-config_latency=20000
-configdata=drivesys.tsunami.ide.configdata
-disks=drivesys.disk0 drivesys.disk2
-max_backoff_delay=10000000
-min_backoff_delay=4000
-pci_bus=0
-pci_dev=0
-pci_func=0
-pio_latency=1000
-platform=drivesys.tsunami
-system=drivesys
-config=drivesys.iobus.port[30]
-dma=drivesys.iobus.port[31]
-pio=drivesys.iobus.port[26]
-
-[drivesys.tsunami.ide.configdata]
-type=PciConfigData
 BAR0=1
 BAR0Size=8
 BAR1=1
@@ -643,6 +616,19 @@ SubClassCode=1
 SubsystemID=0
 SubsystemVendorID=0
 VendorID=32902
+config_latency=20000
+disks=drivesys.disk0 drivesys.disk2
+max_backoff_delay=10000000
+min_backoff_delay=4000
+pci_bus=0
+pci_dev=0
+pci_func=0
+pio_latency=1000
+platform=drivesys.tsunami
+system=drivesys
+config=drivesys.iobus.port[30]
+dma=drivesys.iobus.port[31]
+pio=drivesys.iobus.port[26]
 
 [drivesys.tsunami.io]
 type=TsunamiIO
@@ -693,9 +679,9 @@ type=EtherLink
 delay=0
 delay_var=0
 dump=etherdump
-int1=testsys.tsunami.etherint
-int2=drivesys.tsunami.etherint
 speed=8000.000000
+int0=testsys.tsunami.ethernet.interface
+int1=drivesys.tsunami.ethernet.interface
 
 [testsys]
 type=LinuxAlphaSystem
@@ -708,7 +694,7 @@ kernel=/dist/m5/system/binaries/vmlinux
 mem_mode=atomic
 pal=/dist/m5/system/binaries/ts_osfpal
 physmem=testsys.physmem
-readfile=/z/saidi/work/m5.bb/configs/boot/netperf-stream-client.rcS
+readfile=/home/blackga/m5/repos/m5/configs/boot/netperf-stream-client.rcS
 symbolfile=
 system_rev=1024
 system_type=34
@@ -873,7 +859,7 @@ read_only=true
 
 [testsys.tsunami]
 type=Tsunami
-children=cchip console etherint ethernet fake_OROM fake_ata0 fake_ata1 fake_pnp_addr fake_pnp_read0 fake_pnp_read1 fake_pnp_read2 fake_pnp_read3 fake_pnp_read4 fake_pnp_read5 fake_pnp_read6 fake_pnp_read7 fake_pnp_write fake_ppc fake_sm_chip fake_uart1 fake_uart2 fake_uart3 fake_uart4 fb ide io pchip pciconfig uart
+children=cchip console ethernet fake_OROM fake_ata0 fake_ata1 fake_pnp_addr fake_pnp_read0 fake_pnp_read1 fake_pnp_read2 fake_pnp_read3 fake_pnp_read4 fake_pnp_read5 fake_pnp_read6 fake_pnp_read7 fake_pnp_write fake_ppc fake_sm_chip fake_uart1 fake_uart2 fake_uart3 fake_uart4 fb ide io pchip pciconfig uart
 intrctrl=testsys.intrctrl
 system=testsys
 
@@ -897,48 +883,8 @@ sim_console=testsys.sim_console
 system=testsys
 pio=testsys.iobus.port[25]
 
-[testsys.tsunami.etherint]
-type=NSGigEInt
-device=testsys.tsunami.ethernet
-peer=Null
-
 [testsys.tsunami.ethernet]
 type=NSGigE
-children=configdata
-clock=0
-config_latency=20000
-configdata=testsys.tsunami.ethernet.configdata
-dma_data_free=false
-dma_desc_free=false
-dma_no_allocate=true
-dma_read_delay=0
-dma_read_factor=0
-dma_write_delay=0
-dma_write_factor=0
-hardware_address=00:90:00:00:00:02
-intr_delay=10000000
-max_backoff_delay=10000000
-min_backoff_delay=4000
-pci_bus=0
-pci_dev=1
-pci_func=0
-pio_latency=1000
-platform=testsys.tsunami
-rss=false
-rx_delay=1000000
-rx_fifo_size=524288
-rx_filter=true
-rx_thread=false
-system=testsys
-tx_delay=1000000
-tx_fifo_size=524288
-tx_thread=false
-config=testsys.iobus.port[28]
-dma=testsys.iobus.port[29]
-pio=testsys.iobus.port[27]
-
-[testsys.tsunami.ethernet.configdata]
-type=PciConfigData
 BAR0=1
 BAR0Size=256
 BAR1=0
@@ -971,6 +917,37 @@ SubClassCode=0
 SubsystemID=0
 SubsystemVendorID=0
 VendorID=4107
+clock=0
+config_latency=20000
+dma_data_free=false
+dma_desc_free=false
+dma_no_allocate=true
+dma_read_delay=0
+dma_read_factor=0
+dma_write_delay=0
+dma_write_factor=0
+hardware_address=00:90:00:00:00:02
+intr_delay=10000000
+max_backoff_delay=10000000
+min_backoff_delay=4000
+pci_bus=0
+pci_dev=1
+pci_func=0
+pio_latency=1000
+platform=testsys.tsunami
+rss=false
+rx_delay=1000000
+rx_fifo_size=524288
+rx_filter=true
+rx_thread=false
+system=testsys
+tx_delay=1000000
+tx_fifo_size=524288
+tx_thread=false
+config=testsys.iobus.port[28]
+dma=testsys.iobus.port[29]
+interface=etherlink.int0
+pio=testsys.iobus.port[27]
 
 [testsys.tsunami.fake_OROM]
 type=IsaFake
@@ -1287,24 +1264,6 @@ pio=testsys.iobus.port[22]
 
 [testsys.tsunami.ide]
 type=IdeController
-children=configdata
-config_latency=20000
-configdata=testsys.tsunami.ide.configdata
-disks=testsys.disk0 testsys.disk2
-max_backoff_delay=10000000
-min_backoff_delay=4000
-pci_bus=0
-pci_dev=0
-pci_func=0
-pio_latency=1000
-platform=testsys.tsunami
-system=testsys
-config=testsys.iobus.port[30]
-dma=testsys.iobus.port[31]
-pio=testsys.iobus.port[26]
-
-[testsys.tsunami.ide.configdata]
-type=PciConfigData
 BAR0=1
 BAR0Size=8
 BAR1=1
@@ -1337,6 +1296,19 @@ SubClassCode=1
 SubsystemID=0
 SubsystemVendorID=0
 VendorID=32902
+config_latency=20000
+disks=testsys.disk0 testsys.disk2
+max_backoff_delay=10000000
+min_backoff_delay=4000
+pci_bus=0
+pci_dev=0
+pci_func=0
+pio_latency=1000
+platform=testsys.tsunami
+system=testsys
+config=testsys.iobus.port[30]
+dma=testsys.iobus.port[31]
+pio=testsys.iobus.port[26]
 
 [testsys.tsunami.io]
 type=TsunamiIO