diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2008-10-11 02:21:44 -0700 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2008-10-11 02:21:44 -0700 |
commit | 826621eb1722eb557d4c24f79e110fbed09e5fb5 (patch) | |
tree | 23d0278aff2bc7615b31b074e8453019070d7126 /src/dev | |
parent | bc2217eefc8db831b72dfdcae7ecc9bd95a31c3c (diff) | |
download | gem5-826621eb1722eb557d4c24f79e110fbed09e5fb5.tar.xz |
X86: Bring the South Bridge device into dev/x86 and get rid of south_bridge directory.
--HG--
rename : src/dev/x86/south_bridge/SouthBridge.py => src/dev/x86/SouthBridge.py
rename : src/dev/x86/south_bridge/south_bridge.cc => src/dev/x86/south_bridge.cc
rename : src/dev/x86/south_bridge/south_bridge.hh => src/dev/x86/south_bridge.hh
Diffstat (limited to 'src/dev')
-rw-r--r-- | src/dev/x86/SConscript | 3 | ||||
-rw-r--r-- | src/dev/x86/SouthBridge.py (renamed from src/dev/x86/south_bridge/SouthBridge.py) | 0 | ||||
-rw-r--r-- | src/dev/x86/pc.cc | 2 | ||||
-rw-r--r-- | src/dev/x86/south_bridge.cc (renamed from src/dev/x86/south_bridge/south_bridge.cc) | 2 | ||||
-rw-r--r-- | src/dev/x86/south_bridge.hh (renamed from src/dev/x86/south_bridge/south_bridge.hh) | 6 | ||||
-rw-r--r-- | src/dev/x86/south_bridge/SConscript | 36 |
6 files changed, 8 insertions, 41 deletions
diff --git a/src/dev/x86/SConscript b/src/dev/x86/SConscript index 0e2bf0be6..b71649fdd 100644 --- a/src/dev/x86/SConscript +++ b/src/dev/x86/SConscript @@ -34,6 +34,9 @@ if env['FULL_SYSTEM'] and env['TARGET_ISA'] == 'x86': SimObject('PC.py') Source('pc.cc') + SimObject('SouthBridge.py') + Source('south_bridge.cc') + SimObject('Cmos.py') Source('cmos.cc') TraceFlag('CMOS', 'Accesses to CMOS devices') diff --git a/src/dev/x86/south_bridge/SouthBridge.py b/src/dev/x86/SouthBridge.py index 2f4b8438a..2f4b8438a 100644 --- a/src/dev/x86/south_bridge/SouthBridge.py +++ b/src/dev/x86/SouthBridge.py diff --git a/src/dev/x86/pc.cc b/src/dev/x86/pc.cc index 0cfd2b0f9..7c35aebf2 100644 --- a/src/dev/x86/pc.cc +++ b/src/dev/x86/pc.cc @@ -41,7 +41,7 @@ #include "dev/terminal.hh" #include "dev/x86/i8254.hh" #include "dev/x86/pc.hh" -#include "dev/x86/south_bridge/south_bridge.hh" +#include "dev/x86/south_bridge.hh" #include "sim/system.hh" using namespace std; diff --git a/src/dev/x86/south_bridge/south_bridge.cc b/src/dev/x86/south_bridge.cc index 12f4657b0..3f68fee18 100644 --- a/src/dev/x86/south_bridge/south_bridge.cc +++ b/src/dev/x86/south_bridge.cc @@ -31,7 +31,7 @@ #include <assert.h> #include "dev/x86/pc.hh" -#include "dev/x86/south_bridge/south_bridge.hh" +#include "dev/x86/south_bridge.hh" using namespace X86ISA; diff --git a/src/dev/x86/south_bridge/south_bridge.hh b/src/dev/x86/south_bridge.hh index 9e7963a7b..5677aa8a0 100644 --- a/src/dev/x86/south_bridge/south_bridge.hh +++ b/src/dev/x86/south_bridge.hh @@ -28,8 +28,8 @@ * Authors: Gabe Black */ -#ifndef __DEV_X86_SOUTH_BRIDGE_SOUTH_BRIDGE_HH__ -#define __DEV_X86_SOUTH_BRIDGE_SOUTH_BRIDGE_HH__ +#ifndef __DEV_X86_SOUTH_BRIDGE_HH__ +#define __DEV_X86_SOUTH_BRIDGE_HH__ #include "sim/sim_object.hh" #include "params/SouthBridge.hh" @@ -65,4 +65,4 @@ class SouthBridge : public SimObject } }; -#endif //__DEV_X86_SOUTH_BRIDGE_SOUTH_BRIDGE_HH__ +#endif //__DEV_X86_SOUTH_BRIDGE_HH__ diff --git a/src/dev/x86/south_bridge/SConscript b/src/dev/x86/south_bridge/SConscript deleted file mode 100644 index 639298ca1..000000000 --- a/src/dev/x86/south_bridge/SConscript +++ /dev/null @@ -1,36 +0,0 @@ -# -*- mode:python -*- - -# Copyright (c) 2008 The Regents of The University of Michigan -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer; -# redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution; -# neither the name of the copyright holders nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# Authors: Gabe Black - -Import('*') - -if env['FULL_SYSTEM'] and env['TARGET_ISA'] == 'x86': - # Main device - SimObject('SouthBridge.py') - Source('south_bridge.cc') |