derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev: Rename Keyboard namespace as keyboard

Browse Source 
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 <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45460
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Hoa Nguyen <hoanguyen@ucdavis.edu>
Maintainer: Gabe Black <gabe.black@gmail.com>
This commit is contained in:
Daniel R. Carvalho
2021-05-13 10:24:12 -03:00
committed by Daniel Carvalho
parent 71460cb13e
commit 9ffb3a86fc
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/dev/ps2/keyboard.cc
View File

@@ -84,7 +84,7 @@ PS2Keyboard::recv(const std::vector<uint8_t> &data)
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 @@ PS2Keyboard::recv(const std::vector<uint8_t> &data)
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 @@ PS2Keyboard::recv(const std::vector<uint8_t> &data)
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 @@ PS2Keyboard::recv(const std::vector<uint8_t> &data)
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]);

2
src/dev/ps2/types.cc
View File

@@ -46,7 +46,7 @@ GEM5_DEPRECATED_NAMESPACE(Ps2, ps2);
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

6
src/dev/ps2/types.hh
View File

@@ -67,7 +67,9 @@ enum
Reset = 0xFF,
};
namespace Keyboard {
GEM5_DEPRECATED_NAMESPACE(Keyboard, keyboard);
namespace keyboard
{
enum
{
@@ -86,7 +88,7 @@ enum
extern const std::vector<uint8_t> ID;
};
} // namespace keyboard
namespace Mouse {