sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

forgot to check this in earlier - no confusion between types and member names!

Browse source 
dev/pcidev.cc:
    member variables should begin with lowercase so they don't get confused with types.
dev/pcidev.hh:
    member variables must begin with lowercase so they don't get confused with types.

--HG--
extra : convert_revision : f083baa60d0fbf64d858d684ff70ee06e7b7765d
This commit is contained in:
Lisa Hsu 2004-03-22 13:15:14 -05:00
parent b4ff8c555f
commit 3bc851b7db
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dev/pcidev.cc
View file

@ -53,8 +53,8 @@ using namespace std;
PciDev::PciDev(const string &name, MemoryController *mmu, PciConfigAll *cf,
PciConfigData *cd, uint32_t bus, uint32_t dev, uint32_t func)
: FunctionalMemory(name), MMU(mmu), ConfigSpace(cf), ConfigData(cd),
Bus(bus), Device(dev), Function(func)
: FunctionalMemory(name), MMU(mmu), configSpace(cf), configData(cd),
bus(bus), device(dev), function(func)
{
// copy the config data from the PciConfigData object
if (cd) {
@ -79,21 +79,21 @@ PciDev::ReadConfig(int offset, int size, uint8_t *data)
memcpy((uint32_t*)data, config.data + offset, sizeof(uint32_t));
DPRINTF(PCIDEV,
"read device: %#x function: %#x register: %#x data: %#x\n",
Device, Function, offset, *(uint32_t*)(config.data + offset));
device, function, offset, *(uint32_t*)(config.data + offset));
break;
case sizeof(uint16_t):
memcpy((uint16_t*)data, config.data + offset, sizeof(uint16_t));
DPRINTF(PCIDEV,
"read device: %#x function: %#x register: %#x data: %#x\n",
Device, Function, offset, *(uint16_t*)(config.data + offset));
device, function, offset, *(uint16_t*)(config.data + offset));
break;
case sizeof(uint8_t):
memcpy((uint8_t*)data, config.data + offset, sizeof(uint8_t));
DPRINTF(PCIDEV,
"read device: %#x function: %#x register: %#x data: %#x\n",
Device, Function, offset, (uint16_t)(*(uint8_t*)(config.data + offset)));
device, function, offset, (uint16_t)(*(uint8_t*)(config.data + offset)));
break;
default:
@ -115,7 +115,7 @@ PciDev::WriteConfig(int offset, int size, uint32_t data)
DPRINTF(PCIDEV,
"write device: %#x function: %#x reg: %#x size: %#x data: %#x\n",
Device, Function, offset, size, word_value);
device, function, offset, size, word_value);
barnum = (offset - PCI0_BASE_ADDR0) >> 2;

10
dev/pcidev.hh
View file

@ -67,11 +67,11 @@ class PciDev : public FunctionalMemory
{
protected:
MemoryController *MMU;
PciConfigAll *ConfigSpace;
PciConfigData *ConfigData;
uint32_t Bus;
uint32_t Device;
uint32_t Function;
PciConfigAll *configSpace;
PciConfigData *configData;
uint32_t bus;
uint32_t device;
uint32_t function;
PCIConfig config;
uint32_t BARSize[6];