david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed register 0 usage - fixed mouse buttons

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1009 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2004-07-12 20:15:26 +00:00
parent cab84d9844
commit bec9d989db
1 changed files with 55 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
hw/adb.c
View File

@ -43,53 +43,62 @@
#define ADB_MODEM 5 #define ADB_MODEM 5
#define ADB_MISC 7 #define ADB_MISC 7
/* error codes */
#define ADB_RET_NOTPRESENT (-2)
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;
int devaddr, cmd, i; int devaddr, cmd, i;
cmd = buf[0] & 0xf; cmd = buf[0] & 0xf;
if (cmd == ADB_BUSRESET) {
for(i = 0; i < s->nb_devices; i++) {
d = &s->devices[i];
if (d->devreset) {
d->devreset(d);
}
}
return 0;
}
devaddr = buf[0] >> 4; devaddr = buf[0] >> 4;
if (buf[1] == ADB_BUSRESET) {
obuf[0] = 0x00;
obuf[1] = 0x00;
return 2;
}
if (cmd == ADB_FLUSH) {
obuf[0] = 0x00;
obuf[1] = 0x00;
return 2;
}
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); return d->devreq(d, obuf, buf, len);
} }
} }
return 0; return ADB_RET_NOTPRESENT;
} }
/* XXX: move that to cuda ? */
int adb_poll(ADBBusState *s, uint8_t *obuf) int adb_poll(ADBBusState *s, uint8_t *obuf)
{ {
ADBDevice *d; ADBDevice *d;
int olen, i; int olen, i;
uint8_t buf[1];
olen = 0; olen = 0;
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];
olen = d->devreq(d, obuf, NULL, 0); buf[0] = ADB_READREG | (d->devaddr << 4);
s->poll_index++; olen = adb_request(s, obuf + 1, buf, 1);
if (olen) /* if there is data, we poll again the same device */
if (olen > 0) {
obuf[0] = buf[0];
olen++;
break; break;
} }
s->poll_index++;
}
return olen; return olen;
} }
ADBDevice *adb_register_device(ADBBusState *s, int devaddr, ADBDevice *adb_register_device(ADBBusState *s, int devaddr,
ADBDeviceRequest *devreq, ADBDeviceRequest *devreq,
ADBDeviceReset *devreset,
void *opaque) void *opaque)
{ {
ADBDevice *d; ADBDevice *d;
@ -99,6 +108,7 @@ ADBDevice *adb_register_device(ADBBusState *s, int devaddr,
d->bus = s; d->bus = s;
d->devaddr = devaddr; d->devaddr = devaddr;
d->devreq = devreq; d->devreq = devreq;
d->devreset = devreset;
d->opaque = opaque; d->opaque = opaque;
return d; return d;
} }
@ -166,10 +176,10 @@ static int adb_kbd_poll(ADBDevice *d, uint8_t *obuf)
adb_keycode = pc_to_adb_keycode[keycode | 0x80]; adb_keycode = pc_to_adb_keycode[keycode | 0x80];
else else
adb_keycode = pc_to_adb_keycode[keycode & 0x7f]; adb_keycode = pc_to_adb_keycode[keycode & 0x7f];
obuf[0] = (d->devaddr << 4) | 0x0c; obuf[0] = adb_keycode | (keycode & 0x80);
obuf[1] = adb_keycode | (keycode & 0x80); /* NOTE: could put a second keycode if needed */
obuf[2] = 0xff; obuf[1] = 0xff;
olen = 3; olen = 2;
ext_keycode = 0; ext_keycode = 0;
break; break;
} }
@ -180,10 +190,13 @@ 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;
int cmd, reg, olen; int cmd, reg, olen;
if (!buf) { if ((buf[0] & 0x0f) == ADB_FLUSH) {
return adb_kbd_poll(d, obuf); /* flush keyboard fifo */
s->wptr = s->rptr = s->count = 0;
return 0;
} }
cmd = buf[0] & 0xc; cmd = buf[0] & 0xc;
@ -214,6 +227,9 @@ static int adb_kbd_request(ADBDevice *d, uint8_t *obuf,
break; break;
case ADB_READREG: case ADB_READREG:
switch(reg) { switch(reg) {
case 0:
olen = adb_kbd_poll(d, obuf);
break;
case 1: case 1:
break; break;
case 2: case 2:
@ -237,7 +253,7 @@ void adb_kbd_init(ADBBusState *bus)
ADBDevice *d; ADBDevice *d;
KBDState *s; KBDState *s;
s = qemu_mallocz(sizeof(KBDState)); s = qemu_mallocz(sizeof(KBDState));
d = adb_register_device(bus, ADB_KEYBOARD, adb_kbd_request, s); d = adb_register_device(bus, ADB_KEYBOARD, adb_kbd_request, NULL, s);
d->handler = 1; d->handler = 1;
qemu_add_kbd_event_handler(adb_kbd_put_keycode, d); qemu_add_kbd_event_handler(adb_kbd_put_keycode, d);
} }
@ -291,24 +307,29 @@ static int adb_mouse_poll(ADBDevice *d, uint8_t *obuf)
dx &= 0x7f; dx &= 0x7f;
dy &= 0x7f; dy &= 0x7f;
if (s->buttons_state & MOUSE_EVENT_LBUTTON) if (!(s->buttons_state & MOUSE_EVENT_LBUTTON))
dy |= 0x80; dy |= 0x80;
if (s->buttons_state & MOUSE_EVENT_RBUTTON) if (!(s->buttons_state & MOUSE_EVENT_RBUTTON))
dx |= 0x80; dx |= 0x80;
obuf[0] = (d->devaddr << 4) | 0x0c; obuf[0] = dy;
obuf[1] = dy; obuf[1] = dx;
obuf[2] = dx; return 2;
return 3;
} }
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;
int cmd, reg, olen; int cmd, reg, olen;
if (!buf) { if ((buf[0] & 0x0f) == ADB_FLUSH) {
return adb_mouse_poll(d, obuf); /* flush mouse fifo */
s->buttons_state = s->last_buttons_state;
s->dx = 0;
s->dy = 0;
s->dz = 0;
return 0;
} }
cmd = buf[0] & 0xc; cmd = buf[0] & 0xc;
@ -337,6 +358,9 @@ static int adb_mouse_request(ADBDevice *d, uint8_t *obuf,
break; break;
case ADB_READREG: case ADB_READREG:
switch(reg) { switch(reg) {
case 0:
olen = adb_mouse_poll(d, obuf);
break;
case 1: case 1:
break; break;
case 3: case 3:
@ -356,7 +380,7 @@ void adb_mouse_init(ADBBusState *bus)
MouseState *s; MouseState *s;
s = qemu_mallocz(sizeof(MouseState)); s = qemu_mallocz(sizeof(MouseState));
d = adb_register_device(bus, ADB_MOUSE, adb_mouse_request, s); d = adb_register_device(bus, ADB_MOUSE, adb_mouse_request, NULL, s);
d->handler = 2; d->handler = 2;
qemu_add_mouse_event_handler(adb_mouse_event, d); qemu_add_mouse_event_handler(adb_mouse_event, d);
} }