Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/45394 )
Change subject: base,dev: Remove ps2::Keyboard namespace
......................................................................
base,dev: Remove ps2::Keyboard namespace
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.
This namespace didn't bring any benefit on top of
the existing PS2Keyboard class, so it was removed.
Change-Id: I52b66ddd81003735548fc87d30b543853e4c2d32
Signed-off-by: Daniel R. Carvalho <[email protected]>
---
M src/dev/ps2/keyboard.cc
M src/dev/ps2/keyboard.hh
M src/dev/ps2/types.cc
M src/dev/ps2/types.hh
4 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/src/dev/ps2/keyboard.cc b/src/dev/ps2/keyboard.cc
index 86771f6..29ff9ee 100644
--- a/src/dev/ps2/keyboard.cc
+++ b/src/dev/ps2/keyboard.cc
@@ -46,6 +46,8 @@
#include "dev/ps2/types.hh"
#include "params/PS2Keyboard.hh"
+const std::vector<uint8_t> PS2Keyboard::ID{0xAB, 0x83};
+
PS2Keyboard::PS2Keyboard(const PS2KeyboardParams &p)
: PS2Device(p),
shiftDown(false),
@@ -78,7 +80,7 @@
case ps2::ReadID:
DPRINTF(PS2, "Got keyboard read ID command.\n");
sendAck();
- send(ps2::Keyboard::ID);
+ send(ID);
return true;
case ps2::Enable:
DPRINTF(PS2, "Enabling the keyboard.\n");
@@ -104,7 +106,7 @@
case ps2::Resend:
panic("Keyboard resend unimplemented.\n");
- case ps2::Keyboard::LEDWrite:
+ case LEDWrite:
if (data.size() == 1) {
DPRINTF(PS2, "Got LED write command.\n");
sendAck();
@@ -118,11 +120,11 @@
sendAck();
return true;
}
- case ps2::Keyboard::DiagnosticEcho:
+ case DiagnosticEcho:
panic("Keyboard diagnostic echo unimplemented.\n");
- case ps2::Keyboard::AlternateScanCodes:
+ case AlternateScanCodes:
panic("Accessing alternate scan codes unimplemented.\n");
- case ps2::Keyboard::TypematicInfo:
+ case TypematicInfo:
if (data.size() == 1) {
DPRINTF(PS2, "Setting typematic info.\n");
sendAck();
@@ -132,20 +134,20 @@
sendAck();
return true;
}
- case ps2::Keyboard::AllKeysToTypematic:
+ case AllKeysToTypematic:
panic("Setting all keys to typemantic unimplemented.\n");
- case ps2::Keyboard::AllKeysToMakeRelease:
+ case AllKeysToMakeRelease:
panic("Setting all keys to make/release unimplemented.\n");
- case ps2::Keyboard::AllKeysToMake:
+ case AllKeysToMake:
panic("Setting all keys to make unimplemented.\n");
- case ps2::Keyboard::AllKeysToTypematicMakeRelease:
+ case AllKeysToTypematicMakeRelease:
panic("Setting all keys to "
"typematic/make/release unimplemented.\n");
- case ps2::Keyboard::KeyToTypematic:
+ case KeyToTypematic:
panic("Setting a key to typematic unimplemented.\n");
- case ps2::Keyboard::KeyToMakeRelease:
+ case KeyToMakeRelease:
panic("Setting a key to make/release unimplemented.\n");
- case ps2::Keyboard::KeyToMakeOnly:
+ case KeyToMakeOnly:
panic("Setting key to make only unimplemented.\n");
default:
panic("Unknown keyboard command %#02x.\n", data[0]);
diff --git a/src/dev/ps2/keyboard.hh b/src/dev/ps2/keyboard.hh
index 68514cc..b213333 100644
--- a/src/dev/ps2/keyboard.hh
+++ b/src/dev/ps2/keyboard.hh
@@ -41,6 +41,9 @@
#ifndef __DEV_PS2_KEYBOARD_HH__
#define __DEV_PS2_KEYBOARD_HH__
+#include <cstdint>
+#include <vector>
+
#include "base/vnc/vncinput.hh"
#include "dev/ps2/device.hh"
@@ -56,6 +59,23 @@
bool enabled;
public:
+ enum
+ {
+ LEDWrite = 0xED,
+ DiagnosticEcho = 0xEE,
+ AlternateScanCodes = 0xF0,
+ TypematicInfo = 0xF3,
+ AllKeysToTypematic = 0xF7,
+ AllKeysToMakeRelease = 0xF8,
+ AllKeysToMake = 0xF9,
+ AllKeysToTypematicMakeRelease = 0xFA,
+ KeyToTypematic = 0xFB,
+ KeyToMakeRelease = 0xFC,
+ KeyToMakeOnly = 0xFD,
+ };
+
+ static const std::vector<uint8_t> ID;
+
PS2Keyboard(const PS2KeyboardParams &p);
void serialize(CheckpointOut &cp) const override;
diff --git a/src/dev/ps2/types.cc b/src/dev/ps2/types.cc
index bb2233a..d66189c 100644
--- a/src/dev/ps2/types.cc
+++ b/src/dev/ps2/types.cc
@@ -42,8 +42,7 @@
#include "base/logging.hh"
#include "x11keysym/keysym.h"
-const std::vector<uint8_t> ps2::Keyboard::ID{0xAB, 0x83};
-
+GEM5_DEPRECATED_NAMESPACE(Ps2, ps2);
namespace ps2 {
/** 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 8c5d3a0..a01c7f3 100644
--- a/src/dev/ps2/types.hh
+++ b/src/dev/ps2/types.hh
@@ -41,7 +41,6 @@
#include <stdint.h>
#include <list>
-#include <vector>
#include "base/bitunion.hh"
#include "base/compiler.hh"
@@ -66,27 +65,6 @@
Reset = 0xFF,
};
-namespace Keyboard {
-
-enum
-{
- LEDWrite = 0xED,
- DiagnosticEcho = 0xEE,
- AlternateScanCodes = 0xF0,
- TypematicInfo = 0xF3,
- AllKeysToTypematic = 0xF7,
- AllKeysToMakeRelease = 0xF8,
- AllKeysToMake = 0xF9,
- AllKeysToTypematicMakeRelease = 0xFA,
- KeyToTypematic = 0xFB,
- KeyToMakeRelease = 0xFC,
- KeyToMakeOnly = 0xFD,
-};
-
-extern const std::vector<uint8_t> ID;
-
-};
-
/** A bitfield that represents the first byte of a mouse movement packet
*/
BitUnion8(Ps2MouseMovement)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45394
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: I52b66ddd81003735548fc87d30b543853e4c2d32
Gerrit-Change-Number: 45394
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
