Skip to content

P
PHASE
Commit e0e5eb0e authored by Wesley W. Terpstra's avatar Wesley W. Terpstra
Browse files
Options

Use same name as other LM32 components

parent 5b3533f0
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
src/components/lm32/lm32-drom.cpp
View file @ e0e5eb0e
......@@ -6,7 +6,7 @@
#include <cstring>
#include <assert.h>
LM32_DROM::LM32_DROM(Interconnect* ic)
LM32DROM::LM32DROM(Interconnect* ic)
: Component(ic),
register_address(*addMasterPort("register/address", Pinout("address", 8))),
register_write (*addMasterPort("register/write", Pinout("data", 32))),
......@@ -21,7 +21,7 @@ LM32_DROM::LM32_DROM(Interconnect* ic)
state(STOPPED) {
}
SendQueue::const_iterator LM32_DROM::send(SendQueue::const_iterator i, SendQueue::const_iterator end) {
SendQueue::const_iterator LM32DROM::send(SendQueue::const_iterator i, SendQueue::const_iterator end) {
for (; i != end; ++i) {
if (i->master == &reset) {
state = RUNNING;
......@@ -80,7 +80,7 @@ SendQueue::const_iterator LM32_DROM::send(SendQueue::const_iterator i, SendQueue
return i;
}
void LM32_DROM::recv(RecvQueue::const_iterator i, RecvQueue::const_iterator end) {
void LM32DROM::recv(RecvQueue::const_iterator i, RecvQueue::const_iterator end) {
for (; i != end; ++i) {
if (i->slave == &echo) {
register_read(i->bits);
......@@ -161,7 +161,7 @@ void LM32_DROM::recv(RecvQueue::const_iterator i, RecvQueue::const_iterator end)
}
}
void LM32_DROM::read(uint32_t address, uint32_t len) {
void LM32DROM::read(uint32_t address, uint32_t len) {
while (len > 0) {
uint32_t cut;
if (len > 127) cut = 127; else cut = len;
......@@ -179,7 +179,7 @@ void LM32_DROM::read(uint32_t address, uint32_t len) {
}
}
void LM32_DROM::write(uint32_t address, SendQueue::const_iterator& i, SendQueue::const_iterator end) {
void LM32DROM::write(uint32_t address, SendQueue::const_iterator& i, SendQueue::const_iterator end) {
uint32_t len = 0;
for (SendQueue::const_iterator scan = i; scan != end && scan->master == &memory_write; ++scan)
++len;
......@@ -201,14 +201,14 @@ void LM32_DROM::write(uint32_t address, SendQueue::const_iterator& i, SendQueue:
}
}
void LM32_DROM::setReg(int reg, uint32_t val) {
void LM32DROM::setReg(int reg, uint32_t val) {
now[reg*4+0] = val >> 24;
now[reg*4+1] = val >> 16;
now[reg*4+2] = val >> 8;
now[reg*4+3] = val >> 0;
}
uint32_t LM32_DROM::getReg(int reg) {
uint32_t LM32DROM::getReg(int reg) {
return
static_cast<uint32_t>(now[reg*4+0]) << 24 |
static_cast<uint32_t>(now[reg*4+1]) << 16 |
......@@ -216,7 +216,7 @@ uint32_t LM32_DROM::getReg(int reg) {
static_cast<uint32_t>(now[reg*4+3]) << 0;
}
void LM32_DROM::update() {
void LM32DROM::update() {
now[0] = now[1] = now[2] = now[3] = 0; /* R0 */
#if 0
......
src/components/lm32/lm32-drom.h
View file @ e0e5eb0e
......@@ -3,9 +3,9 @@
#include "common/component.h"
class LM32_DROM : public Component {
class LM32DROM : public Component {
public:
LM32_DROM(Interconnect* ic);
LM32DROM(Interconnect* ic);
SendQueue::const_iterator send(SendQueue::const_iterator i, SendQueue::const_iterator end);
void recv(RecvQueue::const_iterator i, RecvQueue::const_iterator end);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment