From e5bdae15f3651d8f0fc63e483e73e8ea742135e3 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 25 Mar 2008 02:15:06 -0400 Subject: Devices: Separate out the MC146818 RTC so both Alpha and X86 can use it. --HG-- extra : convert_revision : 1e7f5185654ed0845678c2169c702d3b977159ed --- src/dev/SConscript | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/dev/SConscript') diff --git a/src/dev/SConscript b/src/dev/SConscript index 0aba8ac35..ee7adb8c8 100644 --- a/src/dev/SConscript +++ b/src/dev/SConscript @@ -56,6 +56,7 @@ if env['FULL_SYSTEM']: Source('ide_disk.cc') Source('io_device.cc') Source('isa_fake.cc') + Source('mc146818.cc') Source('ns_gige.cc') Source('pciconfigall.cc') Source('pcidev.cc') @@ -84,6 +85,7 @@ if env['FULL_SYSTEM']: TraceFlag('IdeCtrl') TraceFlag('IdeDisk') TraceFlag('IsaFake') + TraceFlag('MC146818') TraceFlag('PCIDEV') TraceFlag('PciConfigAll') TraceFlag('SimpleDisk') -- cgit v1.2.3 From 4f9a0402f629dbd78494bd7e820ffa41b0a5f245 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 12 Jun 2008 00:54:48 -0400 Subject: Dev: Seperate the 8254 timer from tsunami and use it in that and the PC. --- src/dev/SConscript | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/dev/SConscript') diff --git a/src/dev/SConscript b/src/dev/SConscript index ee7adb8c8..bd6b16c43 100644 --- a/src/dev/SConscript +++ b/src/dev/SConscript @@ -54,6 +54,7 @@ if env['FULL_SYSTEM']: Source('i8254xGBe.cc') Source('ide_ctrl.cc') Source('ide_disk.cc') + Source('intel_8254_timer.cc') Source('io_device.cc') Source('isa_fake.cc') Source('mc146818.cc') @@ -84,6 +85,7 @@ if env['FULL_SYSTEM']: TraceFlag('EthernetSM') TraceFlag('IdeCtrl') TraceFlag('IdeDisk') + TraceFlag('Intel8254Timer') TraceFlag('IsaFake') TraceFlag('MC146818') TraceFlag('PCIDEV') -- cgit v1.2.3 From 00df9016fead5f7427576acf6d3faee29779f0a1 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Tue, 17 Jun 2008 20:29:06 -0700 Subject: Rename SimConsole to Terminal since it makes more sense --HG-- rename : src/dev/SimConsole.py => src/dev/Terminal.py rename : src/dev/simconsole.cc => src/dev/terminal.cc rename : src/dev/simconsole.hh => src/dev/terminal.hh --- src/dev/SConscript | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/dev/SConscript') diff --git a/src/dev/SConscript b/src/dev/SConscript index bd6b16c43..82fa5cb02 100644 --- a/src/dev/SConscript +++ b/src/dev/SConscript @@ -39,8 +39,8 @@ if env['FULL_SYSTEM']: SimObject('Ide.py') SimObject('Pci.py') SimObject('Platform.py') - SimObject('SimConsole.py') SimObject('SimpleDisk.py') + SimObject('Terminal.py') SimObject('Uart.py') Source('baddev.cc') @@ -63,14 +63,12 @@ if env['FULL_SYSTEM']: Source('pcidev.cc') Source('pktfifo.cc') Source('platform.cc') - Source('simconsole.cc') Source('simple_disk.cc') Source('sinic.cc') + Source('terminal.cc') Source('uart.cc') Source('uart8250.cc') - TraceFlag('Console') - TraceFlag('ConsoleVerbose') TraceFlag('DiskImageRead') TraceFlag('DiskImageWrite') TraceFlag('DMA') @@ -92,6 +90,8 @@ if env['FULL_SYSTEM']: TraceFlag('PciConfigAll') TraceFlag('SimpleDisk') TraceFlag('SimpleDiskData') + TraceFlag('Terminal') + TraceFlag('TerminalVerbose') TraceFlag('Uart') CompoundFlag('DiskImageAll', [ 'DiskImageRead', 'DiskImageWrite' ]) -- cgit v1.2.3 From 1099a9838abcb158b47714c800a9666eb82c97ea Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Tue, 17 Jun 2008 22:22:44 -0700 Subject: Ethernet: share statistics between all ethernet devices and apply some of those statistics to the e1000 model. --- src/dev/SConscript | 1 + 1 file changed, 1 insertion(+) (limited to 'src/dev/SConscript') diff --git a/src/dev/SConscript b/src/dev/SConscript index 82fa5cb02..54148b68b 100644 --- a/src/dev/SConscript +++ b/src/dev/SConscript @@ -46,6 +46,7 @@ if env['FULL_SYSTEM']: Source('baddev.cc') Source('disk_image.cc') Source('etherbus.cc') + Source('etherdevice.cc') Source('etherdump.cc') Source('etherint.cc') Source('etherlink.cc') -- cgit v1.2.3 From dd788a23c972ec45248ad42e58eaa5141160cff9 Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Fri, 5 Dec 2008 13:58:22 -0500 Subject: IGbE: Add support for newer 8257x based Intel NICs --- src/dev/SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dev/SConscript') diff --git a/src/dev/SConscript b/src/dev/SConscript index 54148b68b..2071600ba 100644 --- a/src/dev/SConscript +++ b/src/dev/SConscript @@ -98,7 +98,7 @@ if env['FULL_SYSTEM']: CompoundFlag('DiskImageAll', [ 'DiskImageRead', 'DiskImageWrite' ]) CompoundFlag('EthernetAll', [ 'Ethernet', 'EthernetPIO', 'EthernetDMA', 'EthernetData' , 'EthernetDesc', 'EthernetIntr', 'EthernetSM', - 'EthernetCksum' ]) + 'EthernetCksum', 'EthernetEEPROM' ]) CompoundFlag('EthernetNoData', [ 'Ethernet', 'EthernetPIO', 'EthernetDesc', 'EthernetIntr', 'EthernetSM', 'EthernetCksum' ]) CompoundFlag('IdeAll', [ 'IdeCtrl', 'IdeDisk' ]) -- cgit v1.2.3 From 140b4b891ec60496d8aa805fd694d45647ba083c Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Sat, 17 Jan 2009 18:55:09 -0500 Subject: CopyEngine: Implement a I/OAT-like copy engine. --- src/dev/SConscript | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/dev/SConscript') diff --git a/src/dev/SConscript b/src/dev/SConscript index 2071600ba..c09ec3dcd 100644 --- a/src/dev/SConscript +++ b/src/dev/SConscript @@ -33,6 +33,7 @@ Import('*') if env['FULL_SYSTEM']: SimObject('BadDevice.py') + SimObject('CopyEngine.py') SimObject('Device.py') SimObject('DiskImage.py') SimObject('Ethernet.py') @@ -44,6 +45,7 @@ if env['FULL_SYSTEM']: SimObject('Uart.py') Source('baddev.cc') + Source('copy_engine.cc') Source('disk_image.cc') Source('etherbus.cc') Source('etherdevice.cc') @@ -73,6 +75,7 @@ if env['FULL_SYSTEM']: TraceFlag('DiskImageRead') TraceFlag('DiskImageWrite') TraceFlag('DMA') + TraceFlag('DMACopyEngine') TraceFlag('Ethernet') TraceFlag('EthernetCksum') TraceFlag('EthernetDMA') -- cgit v1.2.3