Record device property types

[qemu.git] / hw / adb.c

diff --git a/hw/adb.c b/hw/adb.c
index 2acfe65bf45963aa994ef56375839924e575eb25..cceb098a4cbd9f5b16ae3b3146d6b83d60f37c5d 100644 (file)
--- a/hw/adb.c
+++ b/hw/adb.c
@@ -1,8 +1,8 @@
 /*
  * QEMU ADB support
 /*
  * QEMU ADB support

- * 
+ *

  * Copyright (c) 2004 Fabrice Bellard
  * Copyright (c) 2004 Fabrice Bellard

- * 
+ *

  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights


@@ -21,7 +21,19 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */

-#include "vl.h"
+#include "hw.h"
+#include "ppc_mac.h"
+#include "console.h"
+
+/* debug ADB */
+//#define DEBUG_ADB
+
+#ifdef DEBUG_ADB
+#define ADB_DPRINTF(fmt, ...) \
+do { printf("ADB: " fmt , ## __VA_ARGS__); } while (0)
+#else
+#define ADB_DPRINTF(fmt, ...)
+#endif

 
 /* ADB commands */
 #define ADB_BUSRESET           0x00
 
 /* ADB commands */
 #define ADB_BUSRESET           0x00


@@ -96,9 +108,9 @@ int adb_poll(ADBBusState *s, uint8_t *obuf)
     return olen;
 }
 
     return olen;
 }
 

-ADBDevice *adb_register_device(ADBBusState *s, int devaddr, 
-                               ADBDeviceRequest *devreq, 
-                               ADBDeviceReset *devreset, 
+ADBDevice *adb_register_device(ADBBusState *s, int devaddr,
+                               ADBDeviceRequest *devreq,
+                               ADBDeviceReset *devreset,

                                void *opaque)
 {
     ADBDevice *d;
                                void *opaque)
 {
     ADBDevice *d;


@@ -110,6 +122,8 @@ ADBDevice *adb_register_device(ADBBusState *s, int devaddr,
     d->devreq = devreq;
     d->devreset = devreset;
     d->opaque = opaque;
     d->devreq = devreq;
     d->devreset = devreset;
     d->opaque = opaque;

+    qemu_register_reset((QEMUResetHandler *)devreset, 0, d);
+    d->devreset(d);

     return d;
 }
 
     return d;
 }
 


@@ -248,6 +262,31 @@ static int adb_kbd_request(ADBDevice *d, uint8_t *obuf,
     return olen;
 }
 
     return olen;
 }
 

+static void adb_kbd_save(QEMUFile *f, void *opaque)
+{
+    KBDState *s = (KBDState *)opaque;
+
+    qemu_put_buffer(f, s->data, sizeof(s->data));
+    qemu_put_sbe32s(f, &s->rptr);
+    qemu_put_sbe32s(f, &s->wptr);
+    qemu_put_sbe32s(f, &s->count);
+}
+
+static int adb_kbd_load(QEMUFile *f, void *opaque, int version_id)
+{
+    KBDState *s = (KBDState *)opaque;
+
+    if (version_id != 1)
+        return -EINVAL;
+
+    qemu_get_buffer(f, s->data, sizeof(s->data));
+    qemu_get_sbe32s(f, &s->rptr);
+    qemu_get_sbe32s(f, &s->wptr);
+    qemu_get_sbe32s(f, &s->count);
+
+    return 0;
+}
+

 static int adb_kbd_reset(ADBDevice *d)
 {
     KBDState *s = d->opaque;
 static int adb_kbd_reset(ADBDevice *d)
 {
     KBDState *s = d->opaque;


@@ -266,8 +305,9 @@ void adb_kbd_init(ADBBusState *bus)
     s = qemu_mallocz(sizeof(KBDState));
     d = adb_register_device(bus, ADB_KEYBOARD, adb_kbd_request,
                             adb_kbd_reset, s);
     s = qemu_mallocz(sizeof(KBDState));
     d = adb_register_device(bus, ADB_KEYBOARD, adb_kbd_request,
                             adb_kbd_reset, s);

-    adb_kbd_reset(d);

     qemu_add_kbd_event_handler(adb_kbd_put_keycode, d);
     qemu_add_kbd_event_handler(adb_kbd_put_keycode, d);

+    register_savevm("adb_kbd", -1, 1, adb_kbd_save,
+                    adb_kbd_load, s);

 }
 
 /***************************************************************/
 }
 
 /***************************************************************/


@@ -299,31 +339,31 @@ static int adb_mouse_poll(ADBDevice *d, uint8_t *obuf)
     if (s->last_buttons_state == s->buttons_state &&
         s->dx == 0 && s->dy == 0)
         return 0;
     if (s->last_buttons_state == s->buttons_state &&
         s->dx == 0 && s->dy == 0)
         return 0;

-        
+

     dx = s->dx;
     if (dx < -63)
         dx = -63;
     else if (dx > 63)
         dx = 63;
     dx = s->dx;
     if (dx < -63)
         dx = -63;
     else if (dx > 63)
         dx = 63;

-    
+

     dy = s->dy;
     if (dy < -63)
         dy = -63;
     else if (dy > 63)
         dy = 63;
     dy = s->dy;
     if (dy < -63)
         dy = -63;
     else if (dy > 63)
         dy = 63;

-    
+

     s->dx -= dx;
     s->dy -= dy;
     s->last_buttons_state = s->buttons_state;
     s->dx -= dx;
     s->dy -= dy;
     s->last_buttons_state = s->buttons_state;

-    
+

     dx &= 0x7f;
     dy &= 0x7f;
     dx &= 0x7f;
     dy &= 0x7f;

-    
+

     if (!(s->buttons_state & MOUSE_EVENT_LBUTTON))
         dy |= 0x80;
     if (!(s->buttons_state & MOUSE_EVENT_RBUTTON))
         dx |= 0x80;
     if (!(s->buttons_state & MOUSE_EVENT_LBUTTON))
         dy |= 0x80;
     if (!(s->buttons_state & MOUSE_EVENT_RBUTTON))
         dx |= 0x80;

-    
+

     obuf[0] = dy;
     obuf[1] = dx;
     return 2;
     obuf[0] = dy;
     obuf[1] = dx;
     return 2;


@@ -334,7 +374,7 @@ static int adb_mouse_request(ADBDevice *d, uint8_t *obuf,
 {
     MouseState *s = d->opaque;
     int cmd, reg, olen;
 {
     MouseState *s = d->opaque;
     int cmd, reg, olen;

-    
+

     if ((buf[0] & 0x0f) == ADB_FLUSH) {
         /* flush mouse fifo */
         s->buttons_state = s->last_buttons_state;
     if ((buf[0] & 0x0f) == ADB_FLUSH) {
         /* flush mouse fifo */
         s->buttons_state = s->last_buttons_state;


@@ -349,6 +389,7 @@ static int adb_mouse_request(ADBDevice *d, uint8_t *obuf,
     olen = 0;
     switch(cmd) {
     case ADB_WRITEREG:
     olen = 0;
     switch(cmd) {
     case ADB_WRITEREG:

+        ADB_DPRINTF("write reg %d val 0x%2.2x\n", reg, buf[1]);

         switch(reg) {
         case 2:
             break;
         switch(reg) {
         case 2:
             break;


@@ -381,6 +422,8 @@ static int adb_mouse_request(ADBDevice *d, uint8_t *obuf,
             olen = 2;
             break;
         }
             olen = 2;
             break;
         }

+        ADB_DPRINTF("read reg %d obuf[0] 0x%2.2x obuf[1] 0x%2.2x\n", reg,
+                    obuf[0], obuf[1]);

         break;
     }
     return olen;
         break;
     }
     return olen;


@@ -397,6 +440,33 @@ static int adb_mouse_reset(ADBDevice *d)
     return 0;
 }
 
     return 0;
 }
 

+static void adb_mouse_save(QEMUFile *f, void *opaque)
+{
+    MouseState *s = (MouseState *)opaque;
+
+    qemu_put_sbe32s(f, &s->buttons_state);
+    qemu_put_sbe32s(f, &s->last_buttons_state);
+    qemu_put_sbe32s(f, &s->dx);
+    qemu_put_sbe32s(f, &s->dy);
+    qemu_put_sbe32s(f, &s->dz);
+}
+
+static int adb_mouse_load(QEMUFile *f, void *opaque, int version_id)
+{
+    MouseState *s = (MouseState *)opaque;
+
+    if (version_id != 1)
+        return -EINVAL;
+
+    qemu_get_sbe32s(f, &s->buttons_state);
+    qemu_get_sbe32s(f, &s->last_buttons_state);
+    qemu_get_sbe32s(f, &s->dx);
+    qemu_get_sbe32s(f, &s->dy);
+    qemu_get_sbe32s(f, &s->dz);
+
+    return 0;
+}
+

 void adb_mouse_init(ADBBusState *bus)
 {
     ADBDevice *d;
 void adb_mouse_init(ADBBusState *bus)
 {
     ADBDevice *d;


@@ -405,6 +475,7 @@ void adb_mouse_init(ADBBusState *bus)
     s = qemu_mallocz(sizeof(MouseState));
     d = adb_register_device(bus, ADB_MOUSE, adb_mouse_request,
                             adb_mouse_reset, s);
     s = qemu_mallocz(sizeof(MouseState));
     d = adb_register_device(bus, ADB_MOUSE, adb_mouse_request,
                             adb_mouse_reset, s);

-    adb_mouse_reset(d);
-    qemu_add_mouse_event_handler(adb_mouse_event, d);
+    qemu_add_mouse_event_handler(adb_mouse_event, d, 0, "QEMU ADB Mouse");
+    register_savevm("adb_mouse", -1, 1, adb_mouse_save,
+                    adb_mouse_load, s);

 }
 }