Changeset 2246 in vbox for trunk/src

Timestamp:

Apr 19, 2007 9:34:32 PM (18 years ago)

Author:

vboxsync

Message:

Input/pckbd.c => Input/DevPS2.cpp

Location:

trunk/src/VBox/Devices

Files:

• Input/DevPS2.cpp (moved) (moved from trunk/src/VBox/Devices/Input/pckbd.c ) (12 diffs)
• Makefile (modified) (3 diffs)
• testcase/tstDeviceStructSize.cpp (modified) (1 diff)
• testcase/tstDeviceStructSizeGC.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Input/DevPS2.cpp

@@ -70 +70 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
+__BEGIN_DECLS
 PDMBOTHCBDECL(int) kbdIOPortDataRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb);
 PDMBOTHCBDECL(int) kbdIOPortDataWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb);
 PDMBOTHCBDECL(int) kbdIOPortStatusRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb);
 PDMBOTHCBDECL(int) kbdIOPortCommandWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb);
-
+__END_DECLS
 #endif /* !VBOX_DEVICE_STRUCT_TESTCASE */
 #endif /* VBOX */
@@ -380 +381 @@
 static void pc_kbd_put_keycode(void *opaque, int keycode)
 {
-    KBDState *s = opaque;
+    KBDState *s = (KBDState*)opaque;
     kbd_queue(s, keycode, 0);
 }
@@ -387 +388 @@
 static uint32_t kbd_read_status(void *opaque, uint32_t addr)
 {
-    KBDState *s = opaque;
+    KBDState *s = (KBDState*)opaque;
     int val;
     val = s->status;
@@ -404 +405 @@
     int rc = VINF_SUCCESS;
 #endif /* VBOX */
-    KBDState *s = opaque;
+    KBDState *s = (KBDState*)opaque;
 
 #ifdef DEBUG_KBD
@@ -515 +516 @@
 static uint32_t kbd_read_data(void *opaque, uint32_t addr)
 {
-    KBDState *s = opaque;
+    KBDState *s = (KBDState*)opaque;
     KBDQueue *q;
 #ifdef VBOX
@@ -654 +655 @@
         {
 #ifdef IN_RING3
-            PDMKEYBLEDS enmLeds = 0
-                                | ((val & 0x01) ? PDMKEYBLEDS_SCROLLLOCK : 0)
-                                | ((val & 0x02) ? PDMKEYBLEDS_NUMLOCK    : 0)
-                                | ((val & 0x04) ? PDMKEYBLEDS_CAPSLOCK   : 0)
-                                ;
+            PDMKEYBLEDS enmLeds = PDMKEYBLEDS_NONE;
+            if (val & 0x01)
+                enmLeds = (PDMKEYBLEDS)(enmLeds | PDMKEYBLEDS_SCROLLLOCK);
+            if (val & 0x02)
+                enmLeds = (PDMKEYBLEDS)(enmLeds | PDMKEYBLEDS_NUMLOCK);
+            if (val & 0x04)
+                enmLeds = (PDMKEYBLEDS)(enmLeds | PDMKEYBLEDS_CAPSLOCK);
             s->Keyboard.pDrv->pfnLedStatusChange(s->Keyboard.pDrv, enmLeds);
 #else
@@ -749 +752 @@
                                int dx, int dy, int dz, int buttons_state)
 {
-    KBDState *s = opaque;
+    KBDState *s = (KBDState*)opaque;
 
     /* check if deltas are recorded when disabled */
@@ -945 +948 @@
     int rc = VINF_SUCCESS;
 #endif /* VBOX */
-    KBDState *s = opaque;
+    KBDState *s = (KBDState*)opaque;
 
 #ifdef DEBUG_KBD
@@ -1007 +1010 @@
 static void kbd_reset(void *opaque)
 {
-    KBDState *s = opaque;
+    KBDState *s = (KBDState*)opaque;
     KBDQueue *q;
 #ifdef VBOX
@@ -1202 +1205 @@
     if (VBOX_FAILURE(rc))
         return rc;
-    if (u32 != ~0)
+    if (u32 != ~0U)
     {
         AssertMsgFailed(("u32=%#x\n", u32));
@@ -1496 +1499 @@
             if (VBOX_SUCCESS(rc))
             {
-                pData->Keyboard.pDrv = pData->Keyboard.pDrvBase->pfnQueryInterface(pData->Keyboard.pDrvBase, PDMINTERFACE_KEYBOARD_CONNECTOR);
+                pData->Keyboard.pDrv = (PDMIKEYBOARDCONNECTOR*)(pData->Keyboard.pDrvBase->pfnQueryInterface(pData->Keyboard.pDrvBase, PDMINTERFACE_KEYBOARD_CONNECTOR));
                 if (!pData->Keyboard.pDrv)
                 {
@@ -1517 +1520 @@
             if (VBOX_SUCCESS(rc))
             {
-                pData->Mouse.pDrv = pData->Mouse.pDrvBase->pfnQueryInterface(pData->Mouse.pDrvBase, PDMINTERFACE_MOUSE_CONNECTOR);
+                pData->Mouse.pDrv = (PDMIMOUSECONNECTOR*)(pData->Mouse.pDrvBase->pfnQueryInterface(pData->Mouse.pDrvBase, PDMINTERFACE_MOUSE_CONNECTOR));
                 if (!pData->Mouse.pDrv)
                 {

trunk/src/VBox/Devices/Makefile

@@ -170 +170 @@
         $(PATH_CURRENT)
 DevicesR3_SOURCES       = \
-        Input/pckbd.c \
+        Input/DevPS2.cpp \
         Bus/DevPCI.cpp \
         Graphics/DevVGA.cpp \
@@ -221 +221 @@
         Bus/DevPCI.cpp \
         Graphics/DevVGA.cpp \
-        Input/pckbd.c \
+        Input/DevPS2.cpp \
         PC/DevACPI.cpp \
         PC/DevPit-i8254.cpp \
@@ -257 +257 @@
         Bus/DevPCI.cpp \
         Graphics/DevVGA.cpp \
-        Input/pckbd.c \
+        Input/DevPS2.cpp \
         PC/DevACPI.cpp \
         PC/DevPit-i8254.cpp \

trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

@@ -34 +34 @@
 #include "Graphics/DevVGA.cpp"
 #undef LOG_GROUP
-#include "Input/pckbd.c"
+#include "Input/DevPS2.cpp"
 #undef LOG_GROUP
 #include "Network/DevPCNet.cpp"

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp

@@ -44 +44 @@
 #include "Graphics/DevVGA.cpp"
 #undef LOG_GROUP
-#include "Input/pckbd.c"
+#include "Input/DevPS2.cpp"
 #undef LOG_GROUP
 #include "Network/DevPCNet.cpp"