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

dev: Rename Mouse namespace as mouse

Browse Source 
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 <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45461
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:30:33 -03:00
committed by Daniel Carvalho
parent 9ffb3a86fc
commit 380715ef56
4 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/dev/ps2/mouse.cc
View File

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

12
src/dev/ps2/touchkit.cc
View File

@@ -93,7 +93,7 @@ TouchKit::recv(const std::vector<uint8_t> &data)
case ReadID:
sendAck();
send(Mouse::ID);
send(mouse::ID);
return true;
case Disable:
@@ -114,17 +114,17 @@ TouchKit::recv(const std::vector<uint8_t> &data)
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

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

@@ -47,7 +47,7 @@ namespace ps2
{
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

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

@@ -90,7 +90,9 @@ extern const std::vector<uint8_t> ID;
} // namespace keyboard
namespace Mouse {
GEM5_DEPRECATED_NAMESPACE(Mouse, mouse);
namespace mouse
{
enum
{
@@ -107,7 +109,7 @@ enum
extern const std::vector<uint8_t> ID;
};
} // namespace mouse
/** A bitfield that represents the first byte of a mouse movement packet
*/