derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix formatting, move default size (0x8) of TsunamiFake from C++ code to Python code.

Browse Source 
dev/ide_disk.cc:
    Fix formatting.  Panic if unexpected register type is given.
python/m5/objects/Tsunami.py:
    Add default size of TsunamiFake device.

--HG--
extra : convert_revision : 03a35a2f6468b95746cba41ce7e93afeeb70ccef
This commit is contained in:
Benjamin Nash
2005-07-01 13:06:35 -04:00
parent 6cf1740bf5
commit 81b57af241
2 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
dev/ide_disk.cc
View File

@@ -220,34 +220,34 @@ IdeDisk::read(const Addr &offset, RegType_t type)
else if (offset == DATA_OFFSET)
action = ACT_DATA_READ_SHORT;
switch (offset) {
case DATA_OFFSET:
data = cmdReg.data;
break;
case ERROR_OFFSET:
data = cmdReg.error;
break;
case NSECTOR_OFFSET:
data = cmdReg.sec_count;
break;
case SECTOR_OFFSET:
data = cmdReg.sec_num;
break;
case LCYL_OFFSET:
data = cmdReg.cyl_low;
break;
case HCYL_OFFSET:
data = cmdReg.cyl_high;
break;
case SELECT_OFFSET:
data = cmdReg.drive;
break;
case STATUS_OFFSET:
data = status;
break;
default:
panic("Invalid IDE command register offset: %#x\n", offset);
}
switch (offset) {
case DATA_OFFSET:
data = cmdReg.data;
break;
case ERROR_OFFSET:
data = cmdReg.error;
break;
case NSECTOR_OFFSET:
data = cmdReg.sec_count;
break;
case SECTOR_OFFSET:
data = cmdReg.sec_num;
break;
case LCYL_OFFSET:
data = cmdReg.cyl_low;
break;
case HCYL_OFFSET:
data = cmdReg.cyl_high;
break;
case SELECT_OFFSET:
data = cmdReg.drive;
break;
case STATUS_OFFSET:
data = status;
break;
default:
panic("Invalid IDE command register offset: %#x\n", offset);
}
}
else if (type == CONTROL_BLOCK) {
if (offset != ALTSTAT_OFFSET)
@@ -255,6 +255,9 @@ IdeDisk::read(const Addr &offset, RegType_t type)
data = status;
}
else {
panic("Invalid IDE register type: %#x\n", type);
}
if (action != ACT_NONE)
updateState(action);

2
python/m5/objects/Tsunami.py
View File

@@ -13,7 +13,7 @@ class TsunamiCChip(FooPioDevice):
class TsunamiFake(FooPioDevice):
type = 'TsunamiFake'
size = Param.Addr("Size of address range")
size = Param.Addr(0x8, "Size of address range")
class TsunamiIO(FooPioDevice):
type = 'TsunamiIO'