Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/45461 )
Change subject: dev: Rename Mouse namespace as mouse
......................................................................
dev: Rename Mouse namespace as mouse
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.
ps2::Mouse became ps2::mouse.
Change-Id: Ie5f37768634dcc7321dabfdebc69c1fc3c4c3f51
Signed-off-by: Daniel R. Carvalho <[email protected]>
---
M src/dev/ps2/mouse.cc
M src/dev/ps2/touchkit.cc
M src/dev/ps2/types.cc
M src/dev/ps2/types.hh
4 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/src/dev/ps2/mouse.cc b/src/dev/ps2/mouse.cc
index 9b90c2f..c3f85b0 100644
--- a/src/dev/ps2/mouse.cc
+++ b/src/dev/ps2/mouse.cc
@@ -63,7 +63,7 @@
case ReadID:
DPRINTF(PS2, "Mouse ID requested.\n");
sendAck();
- send(Mouse::ID);
+ send(mouse::ID);
return true;
case Disable:
DPRINTF(PS2, "Disabling data reporting.\n");
@@ -85,20 +85,20 @@
status.enabled = 0;
sendAck();
send(SelfTestPass);
- send(Mouse::ID);
+ send(mouse::ID);
return true;
- case Mouse::Scale1to1:
+ case mouse::Scale1to1:
DPRINTF(PS2, "Setting mouse scale to 1:1.\n");
status.twoToOne = 0;
sendAck();
return true;
- case Mouse::Scale2to1:
+ case mouse::Scale2to1:
DPRINTF(PS2, "Setting mouse scale to 2:1.\n");
status.twoToOne = 1;
sendAck();
return true;
- case Mouse::SetResolution:
+ case mouse::SetResolution:
if (data.size() == 1) {
DPRINTF(PS2, "Setting mouse resolution.\n");
sendAck();
@@ -109,22 +109,22 @@
sendAck();
return true;
}
- case Mouse::GetStatus:
+ case mouse::GetStatus:
DPRINTF(PS2, "Getting mouse status.\n");
sendAck();
send((uint8_t *)&(status), 1);
send(&resolution, sizeof(resolution));
send(&sampleRate, sizeof(sampleRate));
return true;
- case Mouse::ReadData:
+ case mouse::ReadData:
panic("Reading mouse data unimplemented.\n");
- case Mouse::ResetWrapMode:
+ case mouse::ResetWrapMode:
panic("Resetting mouse wrap mode unimplemented.\n");
- case Mouse::WrapMode:
+ case mouse::WrapMode:
panic("Setting mouse wrap mode unimplemented.\n");
- case Mouse::RemoteMode:
+ case mouse::RemoteMode:
panic("Setting mouse remote mode unimplemented.\n");
- case Mouse::SampleRate:
+ case mouse::SampleRate:
if (data.size() == 1) {
DPRINTF(PS2, "Setting mouse sample rate.\n");
sendAck();
diff --git a/src/dev/ps2/touchkit.cc b/src/dev/ps2/touchkit.cc
index 67887ca..fa1af6f 100644
--- a/src/dev/ps2/touchkit.cc
+++ b/src/dev/ps2/touchkit.cc
@@ -93,7 +93,7 @@
case ReadID:
sendAck();
- send(Mouse::ID);
+ send(mouse::ID);
return true;
case Disable:
@@ -114,17 +114,17 @@
sendAck();
return true;
- case Mouse::Scale1to1:
- case Mouse::Scale2to1:
+ case mouse::Scale1to1:
+ case mouse::Scale2to1:
sendAck();
return true;
- case Mouse::SetResolution:
- case Mouse::SampleRate:
+ case mouse::SetResolution:
+ case mouse::SampleRate:
sendAck();
return data.size() == 2;
- case Mouse::GetStatus:
+ case mouse::GetStatus:
sendAck();
send(0);
send(2); // default resolution
diff --git a/src/dev/ps2/types.cc b/src/dev/ps2/types.cc
index a802987..ad6c844 100644
--- a/src/dev/ps2/types.cc
+++ b/src/dev/ps2/types.cc
@@ -47,7 +47,7 @@
{
const std::vector<uint8_t> keyboard::ID{0xAB, 0x83};
-const std::vector<uint8_t> Mouse::ID{0x00};
+const std::vector<uint8_t> mouse::ID{0x00};
/** Table to convert simple key symbols (0x00XX) into ps2 bytes. Lower byte
* is the scan code to send and upper byte is if a modifier is required to
diff --git a/src/dev/ps2/types.hh b/src/dev/ps2/types.hh
index d479db5..04e632e 100644
--- a/src/dev/ps2/types.hh
+++ b/src/dev/ps2/types.hh
@@ -90,7 +90,9 @@
} // namespace keyboard
-namespace Mouse {
+GEM5_DEPRECATED_NAMESPACE(Mouse, mouse);
+namespace mouse
+{
enum
{
@@ -107,7 +109,7 @@
extern const std::vector<uint8_t> ID;
-};
+} // namespace mouse
/** A bitfield that represents the first byte of a mouse movement packet
*/
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45461
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: Ie5f37768634dcc7321dabfdebc69c1fc3c4c3f51
Gerrit-Change-Number: 45461
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
