diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 17:48:02 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-07-25 17:48:02 -0700 |
| commit | 6cfe67b3b6c6827a1fca860a36bbb8cda6d2056b (patch) | |
| tree | 256687529fcf5e6adc8798878d899143077714de /android/hw-qemud.c | |
| parent | 2b8ea29e2bd12f876a4d06647e6077bf72de567e (diff) | |
| parent | c5b127050f2dbed015d6b01703a33062d6910d4a (diff) | |
| download | external_qemu-6cfe67b3b6c6827a1fca860a36bbb8cda6d2056b.zip external_qemu-6cfe67b3b6c6827a1fca860a36bbb8cda6d2056b.tar.gz external_qemu-6cfe67b3b6c6827a1fca860a36bbb8cda6d2056b.tar.bz2 | |
Merge korg/donut into korg/master
Diffstat (limited to 'android/hw-qemud.c')
| -rw-r--r-- | android/hw-qemud.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/android/hw-qemud.c b/android/hw-qemud.c index ba4ab42..efe6a99 100644 --- a/android/hw-qemud.c +++ b/android/hw-qemud.c @@ -545,7 +545,7 @@ qemud_client_recv( void* opaque, uint8_t* msg, int msglen ) /* no framing, things are simple */ if (!c->framing) { if (c->clie_recv) - c->clie_recv( c->clie_opaque, msg, msglen ); + c->clie_recv( c->clie_opaque, msg, msglen, c ); return; } @@ -566,7 +566,7 @@ qemud_client_recv( void* opaque, uint8_t* msg, int msglen ) if (c->clie_recv) c->clie_recv( c->clie_opaque, msg+FRAME_HEADER_SIZE, - msglen-FRAME_HEADER_SIZE); + msglen-FRAME_HEADER_SIZE, c ); return; } } @@ -606,7 +606,7 @@ qemud_client_recv( void* opaque, uint8_t* msg, int msglen ) if (c->clie_recv) - c->clie_recv( c->clie_opaque, c->payload->buff, c->payload->size ); + c->clie_recv( c->clie_opaque, c->payload->buff, c->payload->size, c ); AFREE(c->payload->buff); c->need_header = 1; @@ -893,9 +893,10 @@ qemud_multiplexer_disconnect( QemudMultiplexer* m, * (i.e. msg[msglen] is a valid memory read that returns '\0') */ static void -qemud_multiplexer_control_recv( void* opaque, - uint8_t* msg, - int msglen ) +qemud_multiplexer_control_recv( void* opaque, + uint8_t* msg, + int msglen, + QemudClient* client ) { QemudMultiplexer* mult = opaque; uint8_t* msgend = msg + msglen; @@ -1226,7 +1227,8 @@ typedef struct { * this simply sends the message through the charpipe to the user. */ static void -_qemud_char_client_recv( void* opaque, uint8_t* msg, int msglen ) +_qemud_char_client_recv( void* opaque, uint8_t* msg, int msglen, + QemudClient* client ) { CharDriverState* cs = opaque; qemu_chr_write(cs, msg, msglen); |