[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.4 v4 10/12] adb: QOM'ify Apple Desktop Bus
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-1.4 v4 10/12] adb: QOM'ify Apple Desktop Bus |
Date: |
Thu, 24 Jan 2013 10:04:03 +0100 |
It was not a qbus before, turn it into a first-class bus and initialize
it properly from CUDA. Leave it a global variable as long as devices are
not QOM'ified yet.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/adb.c | 14 ++++++++++++++
hw/adb.h | 16 +++++++++++++---
hw/cuda.c | 3 +++
3 Dateien geändert, 30 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)
diff --git a/hw/adb.c b/hw/adb.c
index cc8ad8e..5d46f59 100644
--- a/hw/adb.c
+++ b/hw/adb.c
@@ -126,6 +126,12 @@ static ADBDevice *adb_register_device(ADBBusState *s, int
devaddr,
return d;
}
+static const TypeInfo adb_bus_type_info = {
+ .name = TYPE_ADB_BUS,
+ .parent = TYPE_BUS,
+ .instance_size = sizeof(ADBBusState),
+};
+
/***************************************************************/
/* Keyboard ADB device */
@@ -453,3 +459,11 @@ void adb_mouse_init(ADBBusState *bus)
qemu_add_mouse_event_handler(adb_mouse_event, d, 0, "QEMU ADB Mouse");
vmstate_register(NULL, -1, &vmstate_adb_mouse, s);
}
+
+
+static void adb_register_types(void)
+{
+ type_register_static(&adb_bus_type_info);
+}
+
+type_init(adb_register_types)
diff --git a/hw/adb.h b/hw/adb.h
index 5b27da2..c23f804 100644
--- a/hw/adb.h
+++ b/hw/adb.h
@@ -26,10 +26,13 @@
#if !defined(__ADB_H__)
#define __ADB_H__
+#include "qdev.h"
+
#define MAX_ADB_DEVICES 16
#define ADB_MAX_OUT_LEN 16
+typedef struct ADBBusState ADBBusState;
typedef struct ADBDevice ADBDevice;
/* buf = NULL means polling */
@@ -38,7 +41,7 @@ typedef int ADBDeviceRequest(ADBDevice *d, uint8_t *buf_out,
typedef int ADBDeviceReset(ADBDevice *d);
struct ADBDevice {
- struct ADBBusState *bus;
+ ADBBusState *bus;
int devaddr;
int handler;
ADBDeviceRequest *devreq;
@@ -46,11 +49,18 @@ struct ADBDevice {
void *opaque;
};
-typedef struct ADBBusState {
+#define TYPE_ADB_BUS "apple-desktop-bus"
+#define ADB_BUS(obj) OBJECT_CHECK(ADBBusState, (obj), TYPE_ADB_BUS)
+
+struct ADBBusState {
+ /*< private >*/
+ BusState parent_obj;
+ /*< public >*/
+
ADBDevice devices[MAX_ADB_DEVICES];
int nb_devices;
int poll_index;
-} ADBBusState;
+};
int adb_request(ADBBusState *s, uint8_t *buf_out,
const uint8_t *buf, int len);
diff --git a/hw/cuda.c b/hw/cuda.c
index f863c38..b3a875c 100644
--- a/hw/cuda.c
+++ b/hw/cuda.c
@@ -712,6 +712,9 @@ static void cuda_initfn(Object *obj)
for (i = 0; i < ARRAY_SIZE(s->timers); i++) {
s->timers[i].index = i;
}
+
+ qbus_create_inplace((BusState *)&adb_bus, TYPE_ADB_BUS, DEVICE(obj),
+ "adb.0");
}
static void cuda_class_init(ObjectClass *oc, void *data)
--
1.7.10.4
- [Qemu-devel] [PATCH for-1.4 v4 00/12] target-ppc: MacIO QOM'ification, Andreas Färber, 2013/01/24
- [Qemu-devel] [PATCH for-1.4 v4 02/12] macio: QOM'ify some more, Andreas Färber, 2013/01/24
- [Qemu-devel] [PATCH for-1.4 v4 01/12] ppc: Move Mac machines to hw/ppc/, Andreas Färber, 2013/01/24
- [Qemu-devel] [PATCH for-1.4 v4 03/12] macio: Delay qdev init until all fields are initialized, Andreas Färber, 2013/01/24
- [Qemu-devel] [PATCH for-1.4 v4 06/12] mac_nvram: Mark as Big Endian, Andreas Färber, 2013/01/24
- [Qemu-devel] [PATCH for-1.4 v4 05/12] mac_nvram: Clean up public API, Andreas Färber, 2013/01/24
- [Qemu-devel] [PATCH for-1.4 v4 10/12] adb: QOM'ify Apple Desktop Bus,
Andreas Färber <=
- [Qemu-devel] [PATCH for-1.4 v4 07/12] mac_nvram: QOM'ify MacIO NVRAM, Andreas Färber, 2013/01/24
- [Qemu-devel] [PATCH for-1.4 v4 09/12] cuda: QOM'ify CUDA, Andreas Färber, 2013/01/24
- [Qemu-devel] [PATCH for-1.4 v4 12/12] cuda: Move ADB bus into CUDA state, Andreas Färber, 2013/01/24
- [Qemu-devel] [PATCH for-1.4 v4 04/12] macio: Split MacIO in two, Andreas Färber, 2013/01/24
- [Qemu-devel] [PATCH for-1.4 v4 08/12] ide/macio: QOM'ify MacIO IDE, Andreas Färber, 2013/01/24
- [Qemu-devel] [PATCH for-1.4 v4 11/12] adb: QOM'ify ADB devices, Andreas Färber, 2013/01/24
- Re: [Qemu-devel] [PATCH for-1.4 v4 00/12] target-ppc: MacIO QOM'ification, Alexander Graf, 2013/01/24