Change member variable names to lower case

--HG--
extra : convert_revision : 390c30b8313e7acbd7d77b106716f7147d181111
This commit is contained in:
Andrew Schultz 2004-03-22 16:58:18 -05:00
parent 8baccdc6d3
commit c8640365c2
2 changed files with 16 additions and 16 deletions

View file

@ -52,8 +52,8 @@ using namespace std;
PciDev::PciDev(const string &name, MemoryController *mmu, PciConfigAll *cf, PciDev::PciDev(const string &name, MemoryController *mmu, PciConfigAll *cf,
PciConfigData *cd, uint32_t bus, uint32_t dev, uint32_t func) PciConfigData *cd, uint32_t bus, uint32_t dev, uint32_t func)
: DmaDevice(name), MMU(mmu), ConfigSpace(cf), ConfigData(cd), BusNum(bus), : DmaDevice(name), mmu(mmu), configSpace(cf), configData(cd), busNum(bus),
DeviceNum(dev), FunctionNum(func) deviceNum(dev), functionNum(func)
{ {
// copy the config data from the PciConfigData object // copy the config data from the PciConfigData object
if (cd) { if (cd) {
@ -78,7 +78,7 @@ PciDev::ReadConfig(int offset, int size, uint8_t *data)
memcpy((uint32_t*)data, config.data + offset, sizeof(uint32_t)); memcpy((uint32_t*)data, config.data + offset, sizeof(uint32_t));
DPRINTF(PCIDEV, DPRINTF(PCIDEV,
"read device: %#x function: %#x register: %#x data: %#x\n", "read device: %#x function: %#x register: %#x data: %#x\n",
DeviceNum, FunctionNum, offset, deviceNum, functionNum, offset,
*(uint32_t*)(config.data + offset)); *(uint32_t*)(config.data + offset));
break; break;
@ -86,7 +86,7 @@ PciDev::ReadConfig(int offset, int size, uint8_t *data)
memcpy((uint16_t*)data, config.data + offset, sizeof(uint16_t)); memcpy((uint16_t*)data, config.data + offset, sizeof(uint16_t));
DPRINTF(PCIDEV, DPRINTF(PCIDEV,
"read device: %#x function: %#x register: %#x data: %#x\n", "read device: %#x function: %#x register: %#x data: %#x\n",
DeviceNum, FunctionNum, offset, deviceNum, functionNum, offset,
*(uint16_t*)(config.data + offset)); *(uint16_t*)(config.data + offset));
break; break;
@ -94,7 +94,7 @@ PciDev::ReadConfig(int offset, int size, uint8_t *data)
memcpy((uint8_t*)data, config.data + offset, sizeof(uint8_t)); memcpy((uint8_t*)data, config.data + offset, sizeof(uint8_t));
DPRINTF(PCIDEV, DPRINTF(PCIDEV,
"read device: %#x function: %#x register: %#x data: %#x\n", "read device: %#x function: %#x register: %#x data: %#x\n",
DeviceNum, FunctionNum, offset, deviceNum, functionNum, offset,
(uint16_t)(*(uint8_t*)(config.data + offset))); (uint16_t)(*(uint8_t*)(config.data + offset)));
break; break;
@ -117,7 +117,7 @@ PciDev::WriteConfig(int offset, int size, uint32_t data)
DPRINTF(PCIDEV, DPRINTF(PCIDEV,
"write device: %#x function: %#x reg: %#x size: %#x data: %#x\n", "write device: %#x function: %#x reg: %#x size: %#x data: %#x\n",
DeviceNum, FunctionNum, offset, size, word_value); deviceNum, functionNum, offset, size, word_value);
barnum = (offset - PCI0_BASE_ADDR0) >> 2; barnum = (offset - PCI0_BASE_ADDR0) >> 2;
@ -186,11 +186,11 @@ PciDev::WriteConfig(int offset, int size, uint32_t data)
// It's never been set // It's never been set
if (BARAddrs[barnum] == 0) if (BARAddrs[barnum] == 0)
MMU->add_child((FunctionalMemory *)this, mmu->add_child((FunctionalMemory *)this,
Range<Addr>(base_addr, Range<Addr>(base_addr,
base_addr + base_size)); base_addr + base_size));
else else
MMU->update_child((FunctionalMemory *)this, mmu->update_child((FunctionalMemory *)this,
Range<Addr>(BARAddrs[barnum], Range<Addr>(BARAddrs[barnum],
BARAddrs[barnum] + BARAddrs[barnum] +
base_size), base_size),
@ -214,11 +214,11 @@ PciDev::WriteConfig(int offset, int size, uint32_t data)
// It's never been set // It's never been set
if (BARAddrs[barnum] == 0) if (BARAddrs[barnum] == 0)
MMU->add_child((FunctionalMemory *)this, mmu->add_child((FunctionalMemory *)this,
Range<Addr>(base_addr, Range<Addr>(base_addr,
base_addr + base_size)); base_addr + base_size));
else else
MMU->update_child((FunctionalMemory *)this, mmu->update_child((FunctionalMemory *)this,
Range<Addr>(BARAddrs[barnum], Range<Addr>(BARAddrs[barnum],
BARAddrs[barnum] + BARAddrs[barnum] +
base_size), base_size),

View file

@ -65,12 +65,12 @@ class PciConfigData : public SimObject
class PciDev : public DmaDevice class PciDev : public DmaDevice
{ {
protected: protected:
MemoryController *MMU; MemoryController *mmu;
PciConfigAll *ConfigSpace; PciConfigAll *configSpace;
PciConfigData *ConfigData; PciConfigData *configData;
uint32_t BusNum; uint32_t busNum;
uint32_t DeviceNum; uint32_t deviceNum;
uint32_t FunctionNum; uint32_t functionNum;
PCIConfig config; PCIConfig config;
uint32_t BARSize[6]; uint32_t BARSize[6];