diff options
Diffstat (limited to 'hw/char/bcm2835_aux.c')
| -rw-r--r-- | hw/char/bcm2835_aux.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/char/bcm2835_aux.c b/hw/char/bcm2835_aux.c index f7a845d3e2..4bc5d02135 100644 --- a/hw/char/bcm2835_aux.c +++ b/hw/char/bcm2835_aux.c @@ -79,8 +79,8 @@ static uint64_t bcm2835_aux_read(void *opaque, hwaddr offset, unsigned size) s->read_pos = 0; } } - if (s->chr) { - qemu_chr_accept_input(s->chr); + if (s->chr.chr) { + qemu_chr_accept_input(s->chr.chr); } bcm2835_aux_update(s); return c; @@ -168,10 +168,10 @@ static void bcm2835_aux_write(void *opaque, hwaddr offset, uint64_t value, case AUX_MU_IO_REG: /* "DLAB bit set means access baudrate register" is NYI */ ch = value; - if (s->chr) { + if (s->chr.chr) { /* XXX this blocks entire thread. Rewrite to use * qemu_chr_fe_write and background I/O callbacks */ - qemu_chr_fe_write_all(s->chr, &ch, 1); + qemu_chr_fe_write_all(s->chr.chr, &ch, 1); } break; @@ -282,8 +282,8 @@ static void bcm2835_aux_realize(DeviceState *dev, Error **errp) { BCM2835AuxState *s = BCM2835_AUX(dev); - if (s->chr) { - qemu_chr_add_handlers(s->chr, bcm2835_aux_can_receive, + if (s->chr.chr) { + qemu_chr_add_handlers(s->chr.chr, bcm2835_aux_can_receive, bcm2835_aux_receive, NULL, s); } } |