Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45390 )
Change subject: dev: Rename Ps2 namespace as ps2
......................................................................
dev: Rename Ps2 namespace as ps2
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.
::Ps2 became ::ps2.
Change-Id: I6630a0817ee4aa724ce4e76edac164c28a583d61
Signed-off-by: Daniel R. Carvalho <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45390
Tested-by: kokoro <[email protected]>
Reviewed-by: Bobby R. Bruce <[email protected]>
Maintainer: Bobby R. Bruce <[email protected]>
---
M src/dev/ps2/device.cc
M src/dev/ps2/keyboard.cc
M src/dev/ps2/mouse.cc
M src/dev/ps2/touchkit.cc
M src/dev/ps2/types.cc
M src/dev/ps2/types.hh
6 files changed, 63 insertions(+), 58 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/dev/ps2/device.cc b/src/dev/ps2/device.cc
index 47eb026..b9dfafb 100644
--- a/src/dev/ps2/device.cc
+++ b/src/dev/ps2/device.cc
@@ -119,5 +119,5 @@
void
PS2Device::sendAck()
{
- send(Ps2::Ack);
+ send(ps2::Ack);
}
diff --git a/src/dev/ps2/keyboard.cc b/src/dev/ps2/keyboard.cc
index d62ec44..86771f6 100644
--- a/src/dev/ps2/keyboard.cc
+++ b/src/dev/ps2/keyboard.cc
@@ -75,36 +75,36 @@
PS2Keyboard::recv(const std::vector<uint8_t> &data)
{
switch (data[0]) {
- case Ps2::ReadID:
+ case ps2::ReadID:
DPRINTF(PS2, "Got keyboard read ID command.\n");
sendAck();
- send(Ps2::Keyboard::ID);
+ send(ps2::Keyboard::ID);
return true;
- case Ps2::Enable:
+ case ps2::Enable:
DPRINTF(PS2, "Enabling the keyboard.\n");
enabled = true;
sendAck();
return true;
- case Ps2::Disable:
+ case ps2::Disable:
DPRINTF(PS2, "Disabling the keyboard.\n");
enabled = false;
sendAck();
return true;
- case Ps2::DefaultsAndDisable:
+ case ps2::DefaultsAndDisable:
DPRINTF(PS2, "Disabling and resetting the keyboard.\n");
enabled = false;
sendAck();
return true;
- case Ps2::Reset:
+ case ps2::Reset:
DPRINTF(PS2, "Resetting keyboard.\n");
enabled = true;
sendAck();
- send(Ps2::SelfTestPass);
+ send(ps2::SelfTestPass);
return true;
- case Ps2::Resend:
+ case ps2::Resend:
panic("Keyboard resend unimplemented.\n");
- case Ps2::Keyboard::LEDWrite:
+ case ps2::Keyboard::LEDWrite:
if (data.size() == 1) {
DPRINTF(PS2, "Got LED write command.\n");
sendAck();
@@ -118,11 +118,11 @@
sendAck();
return true;
}
- case Ps2::Keyboard::DiagnosticEcho:
+ case ps2::Keyboard::DiagnosticEcho:
panic("Keyboard diagnostic echo unimplemented.\n");
- case Ps2::Keyboard::AlternateScanCodes:
+ case ps2::Keyboard::AlternateScanCodes:
panic("Accessing alternate scan codes unimplemented.\n");
- case Ps2::Keyboard::TypematicInfo:
+ case ps2::Keyboard::TypematicInfo:
if (data.size() == 1) {
DPRINTF(PS2, "Setting typematic info.\n");
sendAck();
@@ -132,20 +132,20 @@
sendAck();
return true;
}
- case Ps2::Keyboard::AllKeysToTypematic:
+ case ps2::Keyboard::AllKeysToTypematic:
panic("Setting all keys to typemantic unimplemented.\n");
- case Ps2::Keyboard::AllKeysToMakeRelease:
+ case ps2::Keyboard::AllKeysToMakeRelease:
panic("Setting all keys to make/release unimplemented.\n");
- case Ps2::Keyboard::AllKeysToMake:
+ case ps2::Keyboard::AllKeysToMake:
panic("Setting all keys to make unimplemented.\n");
- case Ps2::Keyboard::AllKeysToTypematicMakeRelease:
+ case ps2::Keyboard::AllKeysToTypematicMakeRelease:
panic("Setting all keys to "
"typematic/make/release unimplemented.\n");
- case Ps2::Keyboard::KeyToTypematic:
+ case ps2::Keyboard::KeyToTypematic:
panic("Setting a key to typematic unimplemented.\n");
- case Ps2::Keyboard::KeyToMakeRelease:
+ case ps2::Keyboard::KeyToMakeRelease:
panic("Setting a key to make/release unimplemented.\n");
- case Ps2::Keyboard::KeyToMakeOnly:
+ case ps2::Keyboard::KeyToMakeOnly:
panic("Setting key to make only unimplemented.\n");
default:
panic("Unknown keyboard command %#02x.\n", data[0]);
@@ -159,7 +159,7 @@
// convert the X11 keysym into ps2 codes and update the shift
// state (shiftDown)
- Ps2::keySymToPs2(key, down, shiftDown, keys);
+ ps2::keySymToPs2(key, down, shiftDown, keys);
// Drop key presses if the keyboard hasn't been enabled by the
// host. We do that after translating the key code to ensure that
diff --git a/src/dev/ps2/mouse.cc b/src/dev/ps2/mouse.cc
index d8e32f4..108a759 100644
--- a/src/dev/ps2/mouse.cc
+++ b/src/dev/ps2/mouse.cc
@@ -57,45 +57,45 @@
PS2Mouse::recv(const std::vector<uint8_t> &data)
{
switch (data[0]) {
- case Ps2::ReadID:
+ case ps2::ReadID:
DPRINTF(PS2, "Mouse ID requested.\n");
sendAck();
- send(Ps2::Mouse::ID);
+ send(ps2::Mouse::ID);
return true;
- case Ps2::Disable:
+ case ps2::Disable:
DPRINTF(PS2, "Disabling data reporting.\n");
status.enabled = 0;
sendAck();
return true;
- case Ps2::Enable:
+ case ps2::Enable:
DPRINTF(PS2, "Enabling data reporting.\n");
status.enabled = 1;
sendAck();
return true;
- case Ps2::Resend:
+ case ps2::Resend:
panic("Mouse resend unimplemented.\n");
- case Ps2::Reset:
+ case ps2::Reset:
DPRINTF(PS2, "Resetting the mouse.\n");
sampleRate = 100;
resolution = 4;
status.twoToOne = 0;
status.enabled = 0;
sendAck();
- send(Ps2::SelfTestPass);
- send(Ps2::Mouse::ID);
+ send(ps2::SelfTestPass);
+ send(ps2::Mouse::ID);
return true;
- case Ps2::Mouse::Scale1to1:
+ case ps2::Mouse::Scale1to1:
DPRINTF(PS2, "Setting mouse scale to 1:1.\n");
status.twoToOne = 0;
sendAck();
return true;
- case Ps2::Mouse::Scale2to1:
+ case ps2::Mouse::Scale2to1:
DPRINTF(PS2, "Setting mouse scale to 2:1.\n");
status.twoToOne = 1;
sendAck();
return true;
- case Ps2::Mouse::SetResolution:
+ case ps2::Mouse::SetResolution:
if (data.size() == 1) {
DPRINTF(PS2, "Setting mouse resolution.\n");
sendAck();
@@ -106,22 +106,22 @@
sendAck();
return true;
}
- case Ps2::Mouse::GetStatus:
+ case ps2::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 Ps2::Mouse::ReadData:
+ case ps2::Mouse::ReadData:
panic("Reading mouse data unimplemented.\n");
- case Ps2::Mouse::ResetWrapMode:
+ case ps2::Mouse::ResetWrapMode:
panic("Resetting mouse wrap mode unimplemented.\n");
- case Ps2::Mouse::WrapMode:
+ case ps2::Mouse::WrapMode:
panic("Setting mouse wrap mode unimplemented.\n");
- case Ps2::Mouse::RemoteMode:
+ case ps2::Mouse::RemoteMode:
panic("Setting mouse remote mode unimplemented.\n");
- case Ps2::Mouse::SampleRate:
+ case ps2::Mouse::SampleRate:
if (data.size() == 1) {
DPRINTF(PS2, "Setting mouse sample rate.\n");
sendAck();
@@ -133,7 +133,7 @@
sendAck();
return true;
}
- case Ps2::DefaultsAndDisable:
+ case ps2::DefaultsAndDisable:
DPRINTF(PS2, "Disabling and resetting mouse.\n");
sampleRate = 100;
resolution = 4;
@@ -143,7 +143,7 @@
return true;
default:
warn("Unknown mouse command %#02x.\n", data[0]);
- send(Ps2::Resend);
+ send(ps2::Resend);
return true;
}
}
diff --git a/src/dev/ps2/touchkit.cc b/src/dev/ps2/touchkit.cc
index d772b2c..f07a2b4 100644
--- a/src/dev/ps2/touchkit.cc
+++ b/src/dev/ps2/touchkit.cc
@@ -77,48 +77,48 @@
PS2TouchKit::recv(const std::vector<uint8_t> &data)
{
switch (data[0]) {
- case Ps2::Reset:
+ case ps2::Reset:
DPRINTF(PS2, "Resetting device.\n");
enabled = false;
touchKitEnabled = false;
sendAck();
- send(Ps2::SelfTestPass);
+ send(ps2::SelfTestPass);
return true;
- case Ps2::ReadID:
+ case ps2::ReadID:
sendAck();
- send(Ps2::Mouse::ID);
+ send(ps2::Mouse::ID);
return true;
- case Ps2::Disable:
+ case ps2::Disable:
DPRINTF(PS2, "Disabling device.\n");
enabled = false;
sendAck();
return true;
- case Ps2::Enable:
+ case ps2::Enable:
DPRINTF(PS2, "Enabling device.\n");
enabled = true;
sendAck();
return true;
- case Ps2::DefaultsAndDisable:
+ case ps2::DefaultsAndDisable:
DPRINTF(PS2, "Setting defaults and disabling device.\n");
enabled = false;
sendAck();
return true;
- case Ps2::Mouse::Scale1to1:
- case Ps2::Mouse::Scale2to1:
+ case ps2::Mouse::Scale1to1:
+ case ps2::Mouse::Scale2to1:
sendAck();
return true;
- case Ps2::Mouse::SetResolution:
- case Ps2::Mouse::SampleRate:
+ case ps2::Mouse::SetResolution:
+ case ps2::Mouse::SampleRate:
sendAck();
return data.size() == 2;
- case Ps2::Mouse::GetStatus:
+ case ps2::Mouse::GetStatus:
sendAck();
send(0);
send(2); // default resolution
diff --git a/src/dev/ps2/types.cc b/src/dev/ps2/types.cc
index 067750e..f21c177 100644
--- a/src/dev/ps2/types.cc
+++ b/src/dev/ps2/types.cc
@@ -42,10 +42,12 @@
#include "base/logging.hh"
#include "x11keysym/keysym.h"
-const std::vector<uint8_t> Ps2::Keyboard::ID{0xAB, 0x83};
-const std::vector<uint8_t> Ps2::Mouse::ID{0x00};
+const std::vector<uint8_t> ps2::Keyboard::ID{0xAB, 0x83};
+const std::vector<uint8_t> ps2::Mouse::ID{0x00};
-namespace Ps2 {
+GEM5_DEPRECATED_NAMESPACE(Ps2, ps2);
+namespace ps2
+{
/** 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
@@ -204,5 +206,5 @@
return;
}
-} /* namespace Ps2 */
+} /* namespace ps2 */
diff --git a/src/dev/ps2/types.hh b/src/dev/ps2/types.hh
index 843497d..3a1170c 100644
--- a/src/dev/ps2/types.hh
+++ b/src/dev/ps2/types.hh
@@ -44,12 +44,15 @@
#include <vector>
#include "base/bitunion.hh"
+#include "base/compiler.hh"
/** @file misc functions and constants required to interface with or
* emulate ps2 devices
*/
-namespace Ps2 {
+GEM5_DEPRECATED_NAMESPACE(Ps2, ps2);
+namespace ps2
+{
enum
{
@@ -126,5 +129,5 @@
void keySymToPs2(uint32_t key, bool down, bool &cur_shift,
std::list<uint8_t> &keys);
-} /* namespace Ps2 */
+} /* namespace ps2 */
#endif // __DEV_PS2_HH__
4 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45390
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: I6630a0817ee4aa724ce4e76edac164c28a583d61
Gerrit-Change-Number: 45390
Gerrit-PatchSet: 6
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
