haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

move mux focus field from CharDriverState to MuxDriver

Browse source 
Now that monitor stopped using focus we can make it internal
to the mux driver.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gerd Hoffmann 2009-09-10 10:58:55 +02:00 committed by Anthony Liguori
parent a7aec5da4d
commit 799f1f2325
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
qemu-char.c
View file

@ -233,6 +233,7 @@ typedef struct {
IOEventHandler *chr_event[MAX_MUX]; IOEventHandler *chr_event[MAX_MUX];
void *ext_opaque[MAX_MUX]; void *ext_opaque[MAX_MUX];
CharDriverState *drv; CharDriverState *drv;
int focus;
int mux_cnt; int mux_cnt;
int term_got_escape; int term_got_escape;
int max_size; int max_size;
@ -361,11 +362,11 @@ static int mux_proc_byte(CharDriverState *chr, MuxDriver *d, int ch)
break; break;
case 'c': case 'c':
/* Switch to the next registered device */ /* Switch to the next registered device */
mux_chr_send_event(d, chr->focus, CHR_EVENT_MUX_OUT); mux_chr_send_event(d, d->focus, CHR_EVENT_MUX_OUT);
chr->focus++; d->focus++;
if (chr->focus >= d->mux_cnt) if (d->focus >= d->mux_cnt)
chr->focus = 0; d->focus = 0;
mux_chr_send_event(d, chr->focus, CHR_EVENT_MUX_IN); mux_chr_send_event(d, d->focus, CHR_EVENT_MUX_IN);
break; break;
case 't': case 't':
d->timestamps = !d->timestamps; d->timestamps = !d->timestamps;
@ -384,8 +385,8 @@ static int mux_proc_byte(CharDriverState *chr, MuxDriver *d, int ch)
static void mux_chr_accept_input(CharDriverState *chr) static void mux_chr_accept_input(CharDriverState *chr)
{ {
int m = chr->focus;
MuxDriver *d = chr->opaque; MuxDriver *d = chr->opaque;
int m = d->focus;
while (d->prod[m] != d->cons[m] && while (d->prod[m] != d->cons[m] &&
d->chr_can_read[m] && d->chr_can_read[m] &&
@ -399,7 +400,7 @@ static int mux_chr_can_read(void *opaque)
{ {
CharDriverState *chr = opaque; CharDriverState *chr = opaque;
MuxDriver *d = chr->opaque; MuxDriver *d = chr->opaque;
int m = chr->focus; int m = d->focus;
if ((d->prod[m] - d->cons[m]) < MUX_BUFFER_SIZE) if ((d->prod[m] - d->cons[m]) < MUX_BUFFER_SIZE)
return 1; return 1;
@ -412,7 +413,7 @@ static void mux_chr_read(void *opaque, const uint8_t *buf, int size)
{ {
CharDriverState *chr = opaque; CharDriverState *chr = opaque;
MuxDriver *d = chr->opaque; MuxDriver *d = chr->opaque;
int m = chr->focus; int m = d->focus;
int i; int i;
mux_chr_accept_input (opaque); mux_chr_accept_input (opaque);
@ -456,12 +457,12 @@ static void mux_chr_update_read_handler(CharDriverState *chr)
qemu_chr_add_handlers(d->drv, mux_chr_can_read, mux_chr_read, qemu_chr_add_handlers(d->drv, mux_chr_can_read, mux_chr_read,
mux_chr_event, chr); mux_chr_event, chr);
} }
if (chr->focus != -1) { if (d->focus != -1) {
mux_chr_send_event(d, chr->focus, CHR_EVENT_MUX_OUT); mux_chr_send_event(d, d->focus, CHR_EVENT_MUX_OUT);
} }
chr->focus = d->mux_cnt; d->focus = d->mux_cnt;
d->mux_cnt++; d->mux_cnt++;
mux_chr_send_event(d, chr->focus, CHR_EVENT_MUX_IN); mux_chr_send_event(d, d->focus, CHR_EVENT_MUX_IN);
} }
static CharDriverState *qemu_chr_open_mux(CharDriverState *drv) static CharDriverState *qemu_chr_open_mux(CharDriverState *drv)
@ -474,7 +475,7 @@ static CharDriverState *qemu_chr_open_mux(CharDriverState *drv)
chr->opaque = d; chr->opaque = d;
d->drv = drv; d->drv = drv;
chr->focus = -1; d->focus = -1;
chr->chr_write = mux_chr_write; chr->chr_write = mux_chr_write;
chr->chr_update_read_handler = mux_chr_update_read_handler; chr->chr_update_read_handler = mux_chr_update_read_handler;
chr->chr_accept_input = mux_chr_accept_input; chr->chr_accept_input = mux_chr_accept_input;

1
qemu-char.h
View file

@ -63,7 +63,6 @@ struct CharDriverState {
void (*chr_close)(struct CharDriverState *chr); void (*chr_close)(struct CharDriverState *chr);
void (*chr_accept_input)(struct CharDriverState *chr); void (*chr_accept_input)(struct CharDriverState *chr);
void *opaque; void *opaque;
int focus;
QEMUBH *bh; QEMUBH *bh;
char *label; char *label;
char *filename; char *filename;