mirror of https://github.com/proxmox/mirror_qemu
adb: QOM'ify ADB devices
They were not qdev'ified before. Derive ADBDevice from DeviceState and convert reset callbacks to DeviceClass::reset, ADBDevice::opaque pointer to ADBDevice subtypes for mouse and keyboard and adb_{kbd,mouse}_init() to regular qdev functions. Fixing Coding Style issues and splitting keyboard and mouse off into their own files is left for a later point in time. Signed-off-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Alexander Graf <agraf@suse.de>master
parent
84ede32908
commit
2e4a7c9c5d
244
hw/adb.c
244
hw/adb.c
|
@ -48,16 +48,21 @@ do { printf("ADB: " fmt , ## __VA_ARGS__); } while (0)
|
||||||
#define ADB_CMD_CHANGE_ID_AND_ENABLE 0x00
|
#define ADB_CMD_CHANGE_ID_AND_ENABLE 0x00
|
||||||
|
|
||||||
/* ADB default device IDs (upper 4 bits of ADB command byte) */
|
/* ADB default device IDs (upper 4 bits of ADB command byte) */
|
||||||
#define ADB_DONGLE 1
|
#define ADB_DEVID_DONGLE 1
|
||||||
#define ADB_KEYBOARD 2
|
#define ADB_DEVID_KEYBOARD 2
|
||||||
#define ADB_MOUSE 3
|
#define ADB_DEVID_MOUSE 3
|
||||||
#define ADB_TABLET 4
|
#define ADB_DEVID_TABLET 4
|
||||||
#define ADB_MODEM 5
|
#define ADB_DEVID_MODEM 5
|
||||||
#define ADB_MISC 7
|
#define ADB_DEVID_MISC 7
|
||||||
|
|
||||||
/* error codes */
|
/* error codes */
|
||||||
#define ADB_RET_NOTPRESENT (-2)
|
#define ADB_RET_NOTPRESENT (-2)
|
||||||
|
|
||||||
|
static void adb_device_reset(ADBDevice *d)
|
||||||
|
{
|
||||||
|
qdev_reset_all(DEVICE(d));
|
||||||
|
}
|
||||||
|
|
||||||
int adb_request(ADBBusState *s, uint8_t *obuf, const uint8_t *buf, int len)
|
int adb_request(ADBBusState *s, uint8_t *obuf, const uint8_t *buf, int len)
|
||||||
{
|
{
|
||||||
ADBDevice *d;
|
ADBDevice *d;
|
||||||
|
@ -66,18 +71,17 @@ int adb_request(ADBBusState *s, uint8_t *obuf, const uint8_t *buf, int len)
|
||||||
cmd = buf[0] & 0xf;
|
cmd = buf[0] & 0xf;
|
||||||
if (cmd == ADB_BUSRESET) {
|
if (cmd == ADB_BUSRESET) {
|
||||||
for(i = 0; i < s->nb_devices; i++) {
|
for(i = 0; i < s->nb_devices; i++) {
|
||||||
d = &s->devices[i];
|
d = s->devices[i];
|
||||||
if (d->devreset) {
|
adb_device_reset(d);
|
||||||
d->devreset(d);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
devaddr = buf[0] >> 4;
|
devaddr = buf[0] >> 4;
|
||||||
for(i = 0; i < s->nb_devices; i++) {
|
for(i = 0; i < s->nb_devices; i++) {
|
||||||
d = &s->devices[i];
|
d = s->devices[i];
|
||||||
if (d->devaddr == devaddr) {
|
if (d->devaddr == devaddr) {
|
||||||
return d->devreq(d, obuf, buf, len);
|
ADBDeviceClass *adc = ADB_DEVICE_GET_CLASS(d);
|
||||||
|
return adc->devreq(d, obuf, buf, len);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return ADB_RET_NOTPRESENT;
|
return ADB_RET_NOTPRESENT;
|
||||||
|
@ -94,7 +98,7 @@ int adb_poll(ADBBusState *s, uint8_t *obuf)
|
||||||
for(i = 0; i < s->nb_devices; i++) {
|
for(i = 0; i < s->nb_devices; i++) {
|
||||||
if (s->poll_index >= s->nb_devices)
|
if (s->poll_index >= s->nb_devices)
|
||||||
s->poll_index = 0;
|
s->poll_index = 0;
|
||||||
d = &s->devices[s->poll_index];
|
d = s->devices[s->poll_index];
|
||||||
buf[0] = ADB_READREG | (d->devaddr << 4);
|
buf[0] = ADB_READREG | (d->devaddr << 4);
|
||||||
olen = adb_request(s, obuf + 1, buf, 1);
|
olen = adb_request(s, obuf + 1, buf, 1);
|
||||||
/* if there is data, we poll again the same device */
|
/* if there is data, we poll again the same device */
|
||||||
|
@ -108,38 +112,67 @@ int adb_poll(ADBBusState *s, uint8_t *obuf)
|
||||||
return olen;
|
return olen;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ADBDevice *adb_register_device(ADBBusState *s, int devaddr,
|
|
||||||
ADBDeviceRequest *devreq,
|
|
||||||
ADBDeviceReset *devreset,
|
|
||||||
void *opaque)
|
|
||||||
{
|
|
||||||
ADBDevice *d;
|
|
||||||
if (s->nb_devices >= MAX_ADB_DEVICES)
|
|
||||||
return NULL;
|
|
||||||
d = &s->devices[s->nb_devices++];
|
|
||||||
d->bus = s;
|
|
||||||
d->devaddr = devaddr;
|
|
||||||
d->devreq = devreq;
|
|
||||||
d->devreset = devreset;
|
|
||||||
d->opaque = opaque;
|
|
||||||
qemu_register_reset((QEMUResetHandler *)devreset, d);
|
|
||||||
return d;
|
|
||||||
}
|
|
||||||
|
|
||||||
static const TypeInfo adb_bus_type_info = {
|
static const TypeInfo adb_bus_type_info = {
|
||||||
.name = TYPE_ADB_BUS,
|
.name = TYPE_ADB_BUS,
|
||||||
.parent = TYPE_BUS,
|
.parent = TYPE_BUS,
|
||||||
.instance_size = sizeof(ADBBusState),
|
.instance_size = sizeof(ADBBusState),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static void adb_device_realizefn(DeviceState *dev, Error **errp)
|
||||||
|
{
|
||||||
|
ADBDevice *d = ADB_DEVICE(dev);
|
||||||
|
ADBBusState *bus = ADB_BUS(qdev_get_parent_bus(dev));
|
||||||
|
|
||||||
|
if (bus->nb_devices >= MAX_ADB_DEVICES) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
bus->devices[bus->nb_devices++] = d;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void adb_device_class_init(ObjectClass *oc, void *data)
|
||||||
|
{
|
||||||
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
||||||
|
|
||||||
|
dc->realize = adb_device_realizefn;
|
||||||
|
dc->bus_type = TYPE_ADB_BUS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const TypeInfo adb_device_type_info = {
|
||||||
|
.name = TYPE_ADB_DEVICE,
|
||||||
|
.parent = TYPE_DEVICE,
|
||||||
|
.instance_size = sizeof(ADBDevice),
|
||||||
|
.abstract = true,
|
||||||
|
.class_init = adb_device_class_init,
|
||||||
|
};
|
||||||
|
|
||||||
/***************************************************************/
|
/***************************************************************/
|
||||||
/* Keyboard ADB device */
|
/* Keyboard ADB device */
|
||||||
|
|
||||||
|
#define ADB_KEYBOARD(obj) OBJECT_CHECK(KBDState, (obj), TYPE_ADB_KEYBOARD)
|
||||||
|
|
||||||
typedef struct KBDState {
|
typedef struct KBDState {
|
||||||
|
/*< private >*/
|
||||||
|
ADBDevice parent_obj;
|
||||||
|
/*< public >*/
|
||||||
|
|
||||||
uint8_t data[128];
|
uint8_t data[128];
|
||||||
int rptr, wptr, count;
|
int rptr, wptr, count;
|
||||||
} KBDState;
|
} KBDState;
|
||||||
|
|
||||||
|
#define ADB_KEYBOARD_CLASS(class) \
|
||||||
|
OBJECT_CLASS_CHECK(ADBKeyboardClass, (class), TYPE_ADB_KEYBOARD)
|
||||||
|
#define ADB_KEYBOARD_GET_CLASS(obj) \
|
||||||
|
OBJECT_GET_CLASS(ADBKeyboardClass, (obj), TYPE_ADB_KEYBOARD)
|
||||||
|
|
||||||
|
typedef struct ADBKeyboardClass {
|
||||||
|
/*< private >*/
|
||||||
|
ADBDeviceClass parent_class;
|
||||||
|
/*< public >*/
|
||||||
|
|
||||||
|
DeviceRealize parent_realize;
|
||||||
|
} ADBKeyboardClass;
|
||||||
|
|
||||||
static const uint8_t pc_to_adb_keycode[256] = {
|
static const uint8_t pc_to_adb_keycode[256] = {
|
||||||
0, 53, 18, 19, 20, 21, 23, 22, 26, 28, 25, 29, 27, 24, 51, 48,
|
0, 53, 18, 19, 20, 21, 23, 22, 26, 28, 25, 29, 27, 24, 51, 48,
|
||||||
12, 13, 14, 15, 17, 16, 32, 34, 31, 35, 33, 30, 36, 54, 0, 1,
|
12, 13, 14, 15, 17, 16, 32, 34, 31, 35, 33, 30, 36, 54, 0, 1,
|
||||||
|
@ -161,8 +194,7 @@ static const uint8_t pc_to_adb_keycode[256] = {
|
||||||
|
|
||||||
static void adb_kbd_put_keycode(void *opaque, int keycode)
|
static void adb_kbd_put_keycode(void *opaque, int keycode)
|
||||||
{
|
{
|
||||||
ADBDevice *d = opaque;
|
KBDState *s = opaque;
|
||||||
KBDState *s = d->opaque;
|
|
||||||
|
|
||||||
if (s->count < sizeof(s->data)) {
|
if (s->count < sizeof(s->data)) {
|
||||||
s->data[s->wptr] = keycode;
|
s->data[s->wptr] = keycode;
|
||||||
|
@ -175,7 +207,7 @@ static void adb_kbd_put_keycode(void *opaque, int keycode)
|
||||||
static int adb_kbd_poll(ADBDevice *d, uint8_t *obuf)
|
static int adb_kbd_poll(ADBDevice *d, uint8_t *obuf)
|
||||||
{
|
{
|
||||||
static int ext_keycode;
|
static int ext_keycode;
|
||||||
KBDState *s = d->opaque;
|
KBDState *s = ADB_KEYBOARD(d);
|
||||||
int adb_keycode, keycode;
|
int adb_keycode, keycode;
|
||||||
int olen;
|
int olen;
|
||||||
|
|
||||||
|
@ -209,7 +241,7 @@ static int adb_kbd_poll(ADBDevice *d, uint8_t *obuf)
|
||||||
static int adb_kbd_request(ADBDevice *d, uint8_t *obuf,
|
static int adb_kbd_request(ADBDevice *d, uint8_t *obuf,
|
||||||
const uint8_t *buf, int len)
|
const uint8_t *buf, int len)
|
||||||
{
|
{
|
||||||
KBDState *s = d->opaque;
|
KBDState *s = ADB_KEYBOARD(d);
|
||||||
int cmd, reg, olen;
|
int cmd, reg, olen;
|
||||||
|
|
||||||
if ((buf[0] & 0x0f) == ADB_FLUSH) {
|
if ((buf[0] & 0x0f) == ADB_FLUSH) {
|
||||||
|
@ -281,41 +313,90 @@ static const VMStateDescription vmstate_adb_kbd = {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
static int adb_kbd_reset(ADBDevice *d)
|
static void adb_kbd_reset(DeviceState *dev)
|
||||||
{
|
{
|
||||||
KBDState *s = d->opaque;
|
ADBDevice *d = ADB_DEVICE(dev);
|
||||||
|
KBDState *s = ADB_KEYBOARD(dev);
|
||||||
|
|
||||||
d->handler = 1;
|
d->handler = 1;
|
||||||
d->devaddr = ADB_KEYBOARD;
|
d->devaddr = ADB_DEVID_KEYBOARD;
|
||||||
memset(s, 0, sizeof(KBDState));
|
memset(s->data, 0, sizeof(s->data));
|
||||||
|
s->rptr = 0;
|
||||||
return 0;
|
s->wptr = 0;
|
||||||
|
s->count = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void adb_kbd_init(ADBBusState *bus)
|
static void adb_kbd_realizefn(DeviceState *dev, Error **errp)
|
||||||
{
|
{
|
||||||
ADBDevice *d;
|
ADBDevice *d = ADB_DEVICE(dev);
|
||||||
KBDState *s;
|
ADBKeyboardClass *akc = ADB_KEYBOARD_GET_CLASS(dev);
|
||||||
s = g_malloc0(sizeof(KBDState));
|
|
||||||
d = adb_register_device(bus, ADB_KEYBOARD, adb_kbd_request,
|
akc->parent_realize(dev, errp);
|
||||||
adb_kbd_reset, s);
|
|
||||||
qemu_add_kbd_event_handler(adb_kbd_put_keycode, d);
|
qemu_add_kbd_event_handler(adb_kbd_put_keycode, d);
|
||||||
vmstate_register(NULL, -1, &vmstate_adb_kbd, s);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void adb_kbd_initfn(Object *obj)
|
||||||
|
{
|
||||||
|
ADBDevice *d = ADB_DEVICE(obj);
|
||||||
|
|
||||||
|
d->devaddr = ADB_DEVID_KEYBOARD;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void adb_kbd_class_init(ObjectClass *oc, void *data)
|
||||||
|
{
|
||||||
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
||||||
|
ADBDeviceClass *adc = ADB_DEVICE_CLASS(oc);
|
||||||
|
ADBKeyboardClass *akc = ADB_KEYBOARD_CLASS(oc);
|
||||||
|
|
||||||
|
akc->parent_realize = dc->realize;
|
||||||
|
dc->realize = adb_kbd_realizefn;
|
||||||
|
|
||||||
|
adc->devreq = adb_kbd_request;
|
||||||
|
dc->reset = adb_kbd_reset;
|
||||||
|
dc->vmsd = &vmstate_adb_kbd;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const TypeInfo adb_kbd_type_info = {
|
||||||
|
.name = TYPE_ADB_KEYBOARD,
|
||||||
|
.parent = TYPE_ADB_DEVICE,
|
||||||
|
.instance_size = sizeof(KBDState),
|
||||||
|
.instance_init = adb_kbd_initfn,
|
||||||
|
.class_init = adb_kbd_class_init,
|
||||||
|
.class_size = sizeof(ADBKeyboardClass),
|
||||||
|
};
|
||||||
|
|
||||||
/***************************************************************/
|
/***************************************************************/
|
||||||
/* Mouse ADB device */
|
/* Mouse ADB device */
|
||||||
|
|
||||||
|
#define ADB_MOUSE(obj) OBJECT_CHECK(MouseState, (obj), TYPE_ADB_MOUSE)
|
||||||
|
|
||||||
typedef struct MouseState {
|
typedef struct MouseState {
|
||||||
|
/*< public >*/
|
||||||
|
ADBDevice parent_obj;
|
||||||
|
/*< private >*/
|
||||||
|
|
||||||
int buttons_state, last_buttons_state;
|
int buttons_state, last_buttons_state;
|
||||||
int dx, dy, dz;
|
int dx, dy, dz;
|
||||||
} MouseState;
|
} MouseState;
|
||||||
|
|
||||||
|
#define ADB_MOUSE_CLASS(class) \
|
||||||
|
OBJECT_CLASS_CHECK(ADBMouseClass, (class), TYPE_ADB_MOUSE)
|
||||||
|
#define ADB_MOUSE_GET_CLASS(obj) \
|
||||||
|
OBJECT_GET_CLASS(ADBMouseClass, (obj), TYPE_ADB_MOUSE)
|
||||||
|
|
||||||
|
typedef struct ADBMouseClass {
|
||||||
|
/*< public >*/
|
||||||
|
ADBDeviceClass parent_class;
|
||||||
|
/*< private >*/
|
||||||
|
|
||||||
|
DeviceRealize parent_realize;
|
||||||
|
} ADBMouseClass;
|
||||||
|
|
||||||
static void adb_mouse_event(void *opaque,
|
static void adb_mouse_event(void *opaque,
|
||||||
int dx1, int dy1, int dz1, int buttons_state)
|
int dx1, int dy1, int dz1, int buttons_state)
|
||||||
{
|
{
|
||||||
ADBDevice *d = opaque;
|
MouseState *s = opaque;
|
||||||
MouseState *s = d->opaque;
|
|
||||||
|
|
||||||
s->dx += dx1;
|
s->dx += dx1;
|
||||||
s->dy += dy1;
|
s->dy += dy1;
|
||||||
|
@ -326,7 +407,7 @@ static void adb_mouse_event(void *opaque,
|
||||||
|
|
||||||
static int adb_mouse_poll(ADBDevice *d, uint8_t *obuf)
|
static int adb_mouse_poll(ADBDevice *d, uint8_t *obuf)
|
||||||
{
|
{
|
||||||
MouseState *s = d->opaque;
|
MouseState *s = ADB_MOUSE(d);
|
||||||
int dx, dy;
|
int dx, dy;
|
||||||
|
|
||||||
if (s->last_buttons_state == s->buttons_state &&
|
if (s->last_buttons_state == s->buttons_state &&
|
||||||
|
@ -365,7 +446,7 @@ static int adb_mouse_poll(ADBDevice *d, uint8_t *obuf)
|
||||||
static int adb_mouse_request(ADBDevice *d, uint8_t *obuf,
|
static int adb_mouse_request(ADBDevice *d, uint8_t *obuf,
|
||||||
const uint8_t *buf, int len)
|
const uint8_t *buf, int len)
|
||||||
{
|
{
|
||||||
MouseState *s = d->opaque;
|
MouseState *s = ADB_MOUSE(d);
|
||||||
int cmd, reg, olen;
|
int cmd, reg, olen;
|
||||||
|
|
||||||
if ((buf[0] & 0x0f) == ADB_FLUSH) {
|
if ((buf[0] & 0x0f) == ADB_FLUSH) {
|
||||||
|
@ -422,15 +503,15 @@ static int adb_mouse_request(ADBDevice *d, uint8_t *obuf,
|
||||||
return olen;
|
return olen;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int adb_mouse_reset(ADBDevice *d)
|
static void adb_mouse_reset(DeviceState *dev)
|
||||||
{
|
{
|
||||||
MouseState *s = d->opaque;
|
ADBDevice *d = ADB_DEVICE(dev);
|
||||||
|
MouseState *s = ADB_MOUSE(dev);
|
||||||
|
|
||||||
d->handler = 2;
|
d->handler = 2;
|
||||||
d->devaddr = ADB_MOUSE;
|
d->devaddr = ADB_DEVID_MOUSE;
|
||||||
memset(s, 0, sizeof(MouseState));
|
s->last_buttons_state = s->buttons_state = 0;
|
||||||
|
s->dx = s->dy = s->dz = 0;
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const VMStateDescription vmstate_adb_mouse = {
|
static const VMStateDescription vmstate_adb_mouse = {
|
||||||
|
@ -448,22 +529,53 @@ static const VMStateDescription vmstate_adb_mouse = {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
void adb_mouse_init(ADBBusState *bus)
|
static void adb_mouse_realizefn(DeviceState *dev, Error **errp)
|
||||||
{
|
{
|
||||||
ADBDevice *d;
|
MouseState *s = ADB_MOUSE(dev);
|
||||||
MouseState *s;
|
ADBMouseClass *amc = ADB_MOUSE_GET_CLASS(dev);
|
||||||
|
|
||||||
s = g_malloc0(sizeof(MouseState));
|
amc->parent_realize(dev, errp);
|
||||||
d = adb_register_device(bus, ADB_MOUSE, adb_mouse_request,
|
|
||||||
adb_mouse_reset, s);
|
qemu_add_mouse_event_handler(adb_mouse_event, s, 0, "QEMU ADB Mouse");
|
||||||
qemu_add_mouse_event_handler(adb_mouse_event, d, 0, "QEMU ADB Mouse");
|
|
||||||
vmstate_register(NULL, -1, &vmstate_adb_mouse, s);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void adb_mouse_initfn(Object *obj)
|
||||||
|
{
|
||||||
|
ADBDevice *d = ADB_DEVICE(obj);
|
||||||
|
|
||||||
|
d->devaddr = ADB_DEVID_MOUSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void adb_mouse_class_init(ObjectClass *oc, void *data)
|
||||||
|
{
|
||||||
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
||||||
|
ADBDeviceClass *adc = ADB_DEVICE_CLASS(oc);
|
||||||
|
ADBMouseClass *amc = ADB_MOUSE_CLASS(oc);
|
||||||
|
|
||||||
|
amc->parent_realize = dc->realize;
|
||||||
|
dc->realize = adb_mouse_realizefn;
|
||||||
|
|
||||||
|
adc->devreq = adb_mouse_request;
|
||||||
|
dc->reset = adb_mouse_reset;
|
||||||
|
dc->vmsd = &vmstate_adb_mouse;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const TypeInfo adb_mouse_type_info = {
|
||||||
|
.name = TYPE_ADB_MOUSE,
|
||||||
|
.parent = TYPE_ADB_DEVICE,
|
||||||
|
.instance_size = sizeof(MouseState),
|
||||||
|
.instance_init = adb_mouse_initfn,
|
||||||
|
.class_init = adb_mouse_class_init,
|
||||||
|
.class_size = sizeof(ADBMouseClass),
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
static void adb_register_types(void)
|
static void adb_register_types(void)
|
||||||
{
|
{
|
||||||
type_register_static(&adb_bus_type_info);
|
type_register_static(&adb_bus_type_info);
|
||||||
|
type_register_static(&adb_device_type_info);
|
||||||
|
type_register_static(&adb_kbd_type_info);
|
||||||
|
type_register_static(&adb_mouse_type_info);
|
||||||
}
|
}
|
||||||
|
|
||||||
type_init(adb_register_types)
|
type_init(adb_register_types)
|
||||||
|
|
31
hw/adb.h
31
hw/adb.h
|
@ -38,17 +38,32 @@ typedef struct ADBDevice ADBDevice;
|
||||||
/* buf = NULL means polling */
|
/* buf = NULL means polling */
|
||||||
typedef int ADBDeviceRequest(ADBDevice *d, uint8_t *buf_out,
|
typedef int ADBDeviceRequest(ADBDevice *d, uint8_t *buf_out,
|
||||||
const uint8_t *buf, int len);
|
const uint8_t *buf, int len);
|
||||||
typedef int ADBDeviceReset(ADBDevice *d);
|
|
||||||
|
#define TYPE_ADB_DEVICE "adb-device"
|
||||||
|
#define ADB_DEVICE(obj) OBJECT_CHECK(ADBDevice, (obj), TYPE_ADB_DEVICE)
|
||||||
|
|
||||||
struct ADBDevice {
|
struct ADBDevice {
|
||||||
ADBBusState *bus;
|
/*< private >*/
|
||||||
|
DeviceState parent_obj;
|
||||||
|
/*< public >*/
|
||||||
|
|
||||||
int devaddr;
|
int devaddr;
|
||||||
int handler;
|
int handler;
|
||||||
ADBDeviceRequest *devreq;
|
|
||||||
ADBDeviceReset *devreset;
|
|
||||||
void *opaque;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define ADB_DEVICE_CLASS(cls) \
|
||||||
|
OBJECT_CLASS_CHECK(ADBDeviceClass, (cls), TYPE_ADB_DEVICE)
|
||||||
|
#define ADB_DEVICE_GET_CLASS(obj) \
|
||||||
|
OBJECT_GET_CLASS(ADBDeviceClass, (obj), TYPE_ADB_DEVICE)
|
||||||
|
|
||||||
|
typedef struct ADBDeviceClass {
|
||||||
|
/*< private >*/
|
||||||
|
DeviceClass parent_class;
|
||||||
|
/*< public >*/
|
||||||
|
|
||||||
|
ADBDeviceRequest *devreq;
|
||||||
|
} ADBDeviceClass;
|
||||||
|
|
||||||
#define TYPE_ADB_BUS "apple-desktop-bus"
|
#define TYPE_ADB_BUS "apple-desktop-bus"
|
||||||
#define ADB_BUS(obj) OBJECT_CHECK(ADBBusState, (obj), TYPE_ADB_BUS)
|
#define ADB_BUS(obj) OBJECT_CHECK(ADBBusState, (obj), TYPE_ADB_BUS)
|
||||||
|
|
||||||
|
@ -57,7 +72,7 @@ struct ADBBusState {
|
||||||
BusState parent_obj;
|
BusState parent_obj;
|
||||||
/*< public >*/
|
/*< public >*/
|
||||||
|
|
||||||
ADBDevice devices[MAX_ADB_DEVICES];
|
ADBDevice *devices[MAX_ADB_DEVICES];
|
||||||
int nb_devices;
|
int nb_devices;
|
||||||
int poll_index;
|
int poll_index;
|
||||||
};
|
};
|
||||||
|
@ -66,8 +81,8 @@ int adb_request(ADBBusState *s, uint8_t *buf_out,
|
||||||
const uint8_t *buf, int len);
|
const uint8_t *buf, int len);
|
||||||
int adb_poll(ADBBusState *s, uint8_t *buf_out);
|
int adb_poll(ADBBusState *s, uint8_t *buf_out);
|
||||||
|
|
||||||
void adb_kbd_init(ADBBusState *bus);
|
#define TYPE_ADB_KEYBOARD "adb-keyboard"
|
||||||
void adb_mouse_init(ADBBusState *bus);
|
#define TYPE_ADB_MOUSE "adb-mouse"
|
||||||
|
|
||||||
extern ADBBusState adb_bus;
|
extern ADBBusState adb_bus;
|
||||||
#endif /* !defined(__ADB_H__) */
|
#endif /* !defined(__ADB_H__) */
|
||||||
|
|
|
@ -381,8 +381,10 @@ static void ppc_core99_init(QEMUMachineInitArgs *args)
|
||||||
"ide[1]"));
|
"ide[1]"));
|
||||||
macio_ide_init_drives(macio_ide, &hd[MAX_IDE_DEVS]);
|
macio_ide_init_drives(macio_ide, &hd[MAX_IDE_DEVS]);
|
||||||
|
|
||||||
adb_kbd_init(&adb_bus);
|
dev = qdev_create(BUS(&adb_bus), TYPE_ADB_KEYBOARD);
|
||||||
adb_mouse_init(&adb_bus);
|
qdev_init_nofail(dev);
|
||||||
|
dev = qdev_create(BUS(&adb_bus), TYPE_ADB_MOUSE);
|
||||||
|
qdev_init_nofail(dev);
|
||||||
|
|
||||||
if (usb_enabled(machine_arch == ARCH_MAC99_U3)) {
|
if (usb_enabled(machine_arch == ARCH_MAC99_U3)) {
|
||||||
pci_create_simple(pci_bus, -1, "pci-ohci");
|
pci_create_simple(pci_bus, -1, "pci-ohci");
|
||||||
|
|
|
@ -281,8 +281,10 @@ static void ppc_heathrow_init(QEMUMachineInitArgs *args)
|
||||||
hd[3] = hd[2] = NULL;
|
hd[3] = hd[2] = NULL;
|
||||||
pci_cmd646_ide_init(pci_bus, hd, 0);
|
pci_cmd646_ide_init(pci_bus, hd, 0);
|
||||||
|
|
||||||
adb_kbd_init(&adb_bus);
|
dev = qdev_create(BUS(&adb_bus), TYPE_ADB_KEYBOARD);
|
||||||
adb_mouse_init(&adb_bus);
|
qdev_init_nofail(dev);
|
||||||
|
dev = qdev_create(BUS(&adb_bus), TYPE_ADB_MOUSE);
|
||||||
|
qdev_init_nofail(dev);
|
||||||
|
|
||||||
if (usb_enabled(false)) {
|
if (usb_enabled(false)) {
|
||||||
pci_create_simple(pci_bus, -1, "pci-ohci");
|
pci_create_simple(pci_bus, -1, "pci-ohci");
|
||||||
|
|
Loading…
Reference in New Issue