Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45460 )
Change subject: dev: Rename Keyboard namespace as keyboard
......................................................................
dev: Rename Keyboard namespace as keyboard
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.
ps2::Keyboard became ps2::keyboard.
Change-Id: Ia474f77c96685d74ca484135c80ae6edeae671d2
Signed-off-by: Daniel R. Carvalho <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45460
Tested-by: kokoro <[email protected]>
Reviewed-by: Hoa Nguyen <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M src/dev/ps2/keyboard.cc
M src/dev/ps2/types.cc
M src/dev/ps2/types.hh
3 files changed, 17 insertions(+), 15 deletions(-)
Approvals:
Hoa Nguyen: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/dev/ps2/keyboard.cc b/src/dev/ps2/keyboard.cc
index 3264f45..99fe636 100644
--- a/src/dev/ps2/keyboard.cc
+++ b/src/dev/ps2/keyboard.cc
@@ -84,7 +84,7 @@
case ReadID:
DPRINTF(PS2, "Got keyboard read ID command.\n");
sendAck();
- send(Keyboard::ID);
+ send(keyboard::ID);
return true;
case Enable:
DPRINTF(PS2, "Enabling the keyboard.\n");
@@ -110,7 +110,7 @@
case Resend:
panic("Keyboard resend unimplemented.\n");
- case Keyboard::LEDWrite:
+ case keyboard::LEDWrite:
if (data.size() == 1) {
DPRINTF(PS2, "Got LED write command.\n");
sendAck();
@@ -124,11 +124,11 @@
sendAck();
return true;
}
- case Keyboard::DiagnosticEcho:
+ case keyboard::DiagnosticEcho:
panic("Keyboard diagnostic echo unimplemented.\n");
- case Keyboard::AlternateScanCodes:
+ case keyboard::AlternateScanCodes:
panic("Accessing alternate scan codes unimplemented.\n");
- case Keyboard::TypematicInfo:
+ case keyboard::TypematicInfo:
if (data.size() == 1) {
DPRINTF(PS2, "Setting typematic info.\n");
sendAck();
@@ -138,20 +138,20 @@
sendAck();
return true;
}
- case Keyboard::AllKeysToTypematic:
+ case keyboard::AllKeysToTypematic:
panic("Setting all keys to typemantic unimplemented.\n");
- case Keyboard::AllKeysToMakeRelease:
+ case keyboard::AllKeysToMakeRelease:
panic("Setting all keys to make/release unimplemented.\n");
- case Keyboard::AllKeysToMake:
+ case keyboard::AllKeysToMake:
panic("Setting all keys to make unimplemented.\n");
- case Keyboard::AllKeysToTypematicMakeRelease:
+ case keyboard::AllKeysToTypematicMakeRelease:
panic("Setting all keys to "
"typematic/make/release unimplemented.\n");
- case Keyboard::KeyToTypematic:
+ case keyboard::KeyToTypematic:
panic("Setting a key to typematic unimplemented.\n");
- case Keyboard::KeyToMakeRelease:
+ case keyboard::KeyToMakeRelease:
panic("Setting a key to make/release unimplemented.\n");
- case Keyboard::KeyToMakeOnly:
+ case keyboard::KeyToMakeOnly:
panic("Setting key to make only unimplemented.\n");
default:
panic("Unknown keyboard command %#02x.\n", data[0]);
diff --git a/src/dev/ps2/types.cc b/src/dev/ps2/types.cc
index 8d1d636..a802987 100644
--- a/src/dev/ps2/types.cc
+++ b/src/dev/ps2/types.cc
@@ -46,7 +46,7 @@
namespace ps2
{
-const std::vector<uint8_t> Keyboard::ID{0xAB, 0x83};
+const std::vector<uint8_t> keyboard::ID{0xAB, 0x83};
const std::vector<uint8_t> Mouse::ID{0x00};
/** Table to convert simple key symbols (0x00XX) into ps2 bytes. Lower byte
diff --git a/src/dev/ps2/types.hh b/src/dev/ps2/types.hh
index 3a1170c..d479db5 100644
--- a/src/dev/ps2/types.hh
+++ b/src/dev/ps2/types.hh
@@ -67,7 +67,9 @@
Reset = 0xFF,
};
-namespace Keyboard {
+GEM5_DEPRECATED_NAMESPACE(Keyboard, keyboard);
+namespace keyboard
+{
enum
{
@@ -86,7 +88,7 @@
extern const std::vector<uint8_t> ID;
-};
+} // namespace keyboard
namespace Mouse {
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/+/45460
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: Ia474f77c96685d74ca484135c80ae6edeae671d2
Gerrit-Change-Number: 45460
Gerrit-PatchSet: 7
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Hoa Nguyen <[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
