i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix copy&paste typos. Thanks Urias for spotting!

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33299 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2009-09-26 00:18:17 +00:00
parent 04aa141beb
commit 38a1d67039
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/input_server/filters/vmware_mouse/VMWareMouse.cpp
+14 -14
View File
@@ -60,7 +60,7 @@ VMWareMouseFilter::Filter(BMessage *message, BList *outList)
{ {
uint16 status, numWords; uint16 status, numWords;
_GetStatus(&status, &numWords); _GetStatus(&status, &numWords);
if (status == VMWWARE_ERROR) { if (status == VMWARE_ERROR) {
TRACE_ERROR("error indicated when reading status, resetting\n"); TRACE_ERROR("error indicated when reading status, resetting\n");
_Disable(); _Disable();
fIsEnabled = _Enable(); fIsEnabled = _Enable();
@@ -98,8 +98,8 @@ VMWareMouseFilter::Filter(BMessage *message, BList *outList)
void void
VMWareMouseFilter::_ExecuteCommand(union packet_u &packet) VMWareMouseFilter::_ExecuteCommand(union packet_u &packet)
{ {
packet.command.magic = VMWWARE_PORT_MAGIC; packet.command.magic = VMWARE_PORT_MAGIC;
packet.command.port = VMWWARE_PORT_NUMBER; packet.command.port = VMWARE_PORT_NUMBER;
int dummy; int dummy;
asm volatile ( asm volatile (
@@ -126,8 +126,8 @@ bool
VMWareMouseFilter::_Enable() VMWareMouseFilter::_Enable()
{ {
union packet_u packet; union packet_u packet;
packet.command.command = VMWWARE_COMMAND_POINTER_COMMAND; packet.command.command = VMWARE_COMMAND_POINTER_COMMAND;
packet.command.value = VMWWARE_VALUE_READ_ID; packet.command.value = VMWARE_VALUE_READ_ID;
_ExecuteCommand(packet); _ExecuteCommand(packet);
uint16 numWords; uint16 numWords;
@@ -137,19 +137,19 @@ VMWareMouseFilter::_Enable()
return false; return false;
} }
packet.command.command = VMWWARE_COMMAND_POINTER_DATA; packet.command.command = VMWARE_COMMAND_POINTER_DATA;
packet.command.value = 1; // read size, 1 word packet.command.value = 1; // read size, 1 word
_ExecuteCommand(packet); _ExecuteCommand(packet);
if (packet.version.version != VMWWARE_VERSION_ID) { if (packet.version.version != VMWARE_VERSION_ID) {
TRACE_ERROR("got back unexpected version 0x%08lx\n", TRACE_ERROR("got back unexpected version 0x%08lx\n",
packet.version.version); packet.version.version);
return false; return false;
} }
// request absolute data // request absolute data
packet.command.command = VMWWARE_COMMAND_POINTER_COMMAND; packet.command.command = VMWARE_COMMAND_POINTER_COMMAND;
packet.command.value = VMWWARE_VALUE_REQUEST_ABSOLUTE; packet.command.value = VMWARE_VALUE_REQUEST_ABSOLUTE;
_ExecuteCommand(packet); _ExecuteCommand(packet);
TRACE_ALWAYS("successfully enabled\n"); TRACE_ALWAYS("successfully enabled\n");
@@ -161,13 +161,13 @@ void
VMWareMouseFilter::_Disable() VMWareMouseFilter::_Disable()
{ {
union packet_u packet; union packet_u packet;
packet.command.command = VMWWARE_COMMAND_POINTER_COMMAND; packet.command.command = VMWARE_COMMAND_POINTER_COMMAND;
packet.command.value = VMWWARE_VALUE_DISABLE; packet.command.value = VMWARE_VALUE_DISABLE;
_ExecuteCommand(packet); _ExecuteCommand(packet);
uint16 status; uint16 status;
_GetStatus(&status, NULL); _GetStatus(&status, NULL);
if (status != VMWWARE_ERROR) { if (status != VMWARE_ERROR) {
TRACE_ERROR("didn't get expected status value after disabling\n"); TRACE_ERROR("didn't get expected status value after disabling\n");
return; return;
} }
@@ -180,7 +180,7 @@ void
VMWareMouseFilter::_GetStatus(uint16 *status, uint16 *numWords) VMWareMouseFilter::_GetStatus(uint16 *status, uint16 *numWords)
{ {
union packet_u packet; union packet_u packet;
packet.command.command = VMWWARE_COMMAND_POINTER_STATUS; packet.command.command = VMWARE_COMMAND_POINTER_STATUS;
packet.command.value = 0; packet.command.value = 0;
_ExecuteCommand(packet); _ExecuteCommand(packet);
@@ -195,7 +195,7 @@ void
VMWareMouseFilter::_GetPosition(int32 &x, int32 &y) VMWareMouseFilter::_GetPosition(int32 &x, int32 &y)
{ {
union packet_u packet; union packet_u packet;
packet.command.command = VMWWARE_COMMAND_POINTER_DATA; packet.command.command = VMWARE_COMMAND_POINTER_DATA;
packet.command.value = 4; // read size, 4 words packet.command.value = 4; // read size, 4 words
_ExecuteCommand(packet); _ExecuteCommand(packet);
x = packet.data.x; x = packet.data.x;
src/add-ons/input_server/filters/vmware_mouse/VMWareTypes.h
+10 -10
View File
@@ -8,19 +8,19 @@
#ifndef VMWARE_TYPES_H #ifndef VMWARE_TYPES_H
#define VMWARE_TYPES_H #define VMWARE_TYPES_H
#define VMWWARE_PORT_MAGIC 0x564d5868 #define VMWARE_PORT_MAGIC 0x564d5868
#define VMWWARE_PORT_NUMBER 0x5658 #define VMWARE_PORT_NUMBER 0x5658
#define VMWWARE_VERSION_ID 0x3442554a #define VMWARE_VERSION_ID 0x3442554a
#define VMWWARE_ERROR 0xffff #define VMWARE_ERROR 0xffff
#define VMWWARE_VALUE_DISABLE 0x000000f5 #define VMWARE_VALUE_DISABLE 0x000000f5
#define VMWWARE_VALUE_READ_ID 0x45414552 #define VMWARE_VALUE_READ_ID 0x45414552
#define VMWWARE_VALUE_REQUEST_ABSOLUTE 0x53424152 #define VMWARE_VALUE_REQUEST_ABSOLUTE 0x53424152
#define VMWWARE_COMMAND_POINTER_DATA 39 #define VMWARE_COMMAND_POINTER_DATA 39
#define VMWWARE_COMMAND_POINTER_STATUS 40 #define VMWARE_COMMAND_POINTER_STATUS 40
#define VMWWARE_COMMAND_POINTER_COMMAND 41 #define VMWARE_COMMAND_POINTER_COMMAND 41
struct command_s { struct command_s {