Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/45389 )
Change subject: dev: Rename ps2 variables as ps2Device
......................................................................
dev: Rename ps2 variables as ps2Device
Pave the way for a ps2 namespace.
Change-Id: I61fa33c57aee3e7c6df02a364420e4f83901f60b
Signed-off-by: Daniel R. Carvalho <[email protected]>
---
M src/dev/arm/kmi.cc
M src/dev/arm/kmi.hh
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/dev/arm/kmi.cc b/src/dev/arm/kmi.cc
index 18fb1f1..4f0541e 100644
--- a/src/dev/arm/kmi.cc
+++ b/src/dev/arm/kmi.cc
@@ -51,9 +51,9 @@
Pl050::Pl050(const Pl050Params &p)
: AmbaIntDevice(p, 0x1000), control(0), status(0x43), clkdiv(0),
rawInterrupts(0),
- ps2(p.ps2)
+ ps2Device(p.ps2)
{
- ps2->hostRegDataAvailable([this]() { this->updateRxInt(); });
+ ps2Device->hostRegDataAvailable([this]() { this->updateRxInt(); });
}
Tick
@@ -72,13 +72,13 @@
break;
case kmiStat:
- status.rxfull = ps2->hostDataAvailable() ? 1 : 0;
+ status.rxfull = ps2Device->hostDataAvailable() ? 1 : 0;
DPRINTF(Pl050, "Read Status: %#x\n", (uint32_t)status);
data = status;
break;
case kmiData:
- data = ps2->hostDataAvailable() ? ps2->hostRead() : 0;
+ data = ps2Device->hostDataAvailable() ? ps2Device->hostRead() : 0;
updateRxInt();
DPRINTF(Pl050, "Read Data: %#x\n", (uint32_t)data);
break;
@@ -134,7 +134,7 @@
DPRINTF(Pl050, "Write Data: %#x\n", data);
// Clear the TX interrupt before writing new data.
setTxInt(false);
- ps2->hostWrite((uint8_t)data);
+ ps2Device->hostWrite((uint8_t)data);
// Data is written in 0 time, so raise the TX interrupt again.
setTxInt(true);
break;
@@ -167,7 +167,7 @@
{
InterruptReg ints = rawInterrupts;
- ints.rx = ps2->hostDataAvailable() ? 1 : 0;
+ ints.rx = ps2Device->hostDataAvailable() ? 1 : 0;
setInterrupts(ints);
}
diff --git a/src/dev/arm/kmi.hh b/src/dev/arm/kmi.hh
index 2d83c13..03e9dbd 100644
--- a/src/dev/arm/kmi.hh
+++ b/src/dev/arm/kmi.hh
@@ -123,7 +123,7 @@
InterruptReg getInterrupt() const;
/** PS2 device connected to this KMI interface */
- PS2Device *ps2;
+ PS2Device *ps2Device;
public:
Pl050(const Pl050Params &p);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45389
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I61fa33c57aee3e7c6df02a364420e4f83901f60b
Gerrit-Change-Number: 45389
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
