adb: QOM'ify Apple Desktop Bus
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 <afaerber@suse.de> Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
parent
45fa67fb68
commit
84ede32908
14
hw/adb.c
14
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)
|
||||
|
|
16
hw/adb.h
16
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);
|
||||
|
|
Loading…
Reference in a new issue