| Message ID | 20201026083401.13231-5-mark.cave-ayland@ilande.co.uk |
|---|---|
| State | New |
| Headers | show |
| Series | dev-serial: minor fixes and improvements | expand |
Mark Cave-Ayland, le lun. 26 oct. 2020 08:33:56 +0000, a ecrit: > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org> > --- > hw/usb/dev-serial.c | 3 +++ > hw/usb/trace-events | 2 ++ > 2 files changed, 5 insertions(+) > > diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c > index abc316c7bf..badf8785db 100644 > --- a/hw/usb/dev-serial.c > +++ b/hw/usb/dev-serial.c > @@ -307,6 +307,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p, > } > > s->params.speed = (48000000 / 2) / (8 * divisor + subdivisor8); > + trace_usb_serial_set_baud(bus->busnr, dev->addr, s->params.speed); > qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_SET_PARAMS, &s->params); > break; > } > @@ -340,6 +341,8 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p, > goto fail; > } > > + trace_usb_serial_set_data(bus->busnr, dev->addr, s->params.parity, > + s->params.data_bits, s->params.stop_bits); > qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_SET_PARAMS, &s->params); > /* TODO: TX ON/OFF */ > break; > diff --git a/hw/usb/trace-events b/hw/usb/trace-events > index e5871cbbbc..9e984b2e0c 100644 > --- a/hw/usb/trace-events > +++ b/hw/usb/trace-events > @@ -328,3 +328,5 @@ usb_serial_unsupported_parity(int bus, int addr, int value) "dev %d:%d unsupport > usb_serial_unsupported_stopbits(int bus, int addr, int value) "dev %d:%d unsupported stop bits %d" > usb_serial_unsupported_control(int bus, int addr, int request, int value) "dev %d:%d got unsupported/bogus control 0x%x, value 0x%x" > usb_serial_bad_token(int bus, int addr) "dev %d:%d bad token" > +usb_serial_set_baud(int bus, int addr, int baud) "dev %d:%d baud rate %d" > +usb_serial_set_data(int bus, int addr, int parity, int data, int stop) "dev %d:%d parity %c, data bits %d, stop bits %d" > -- > 2.20.1 >
On 10/26/20 9:33 AM, Mark Cave-Ayland wrote: > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > --- > hw/usb/dev-serial.c | 3 +++ > hw/usb/trace-events | 2 ++ > 2 files changed, 5 insertions(+) > > diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c > index abc316c7bf..badf8785db 100644 > --- a/hw/usb/dev-serial.c > +++ b/hw/usb/dev-serial.c > @@ -307,6 +307,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p, > } > > s->params.speed = (48000000 / 2) / (8 * divisor + subdivisor8); > + trace_usb_serial_set_baud(bus->busnr, dev->addr, s->params.speed); > qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_SET_PARAMS, &s->params); > break; > } > @@ -340,6 +341,8 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p, > goto fail; > } > > + trace_usb_serial_set_data(bus->busnr, dev->addr, s->params.parity, > + s->params.data_bits, s->params.stop_bits); > qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_SET_PARAMS, &s->params); > /* TODO: TX ON/OFF */ > break; > diff --git a/hw/usb/trace-events b/hw/usb/trace-events > index e5871cbbbc..9e984b2e0c 100644 > --- a/hw/usb/trace-events > +++ b/hw/usb/trace-events > @@ -328,3 +328,5 @@ usb_serial_unsupported_parity(int bus, int addr, int value) "dev %d:%d unsupport > usb_serial_unsupported_stopbits(int bus, int addr, int value) "dev %d:%d unsupported stop bits %d" > usb_serial_unsupported_control(int bus, int addr, int request, int value) "dev %d:%d got unsupported/bogus control 0x%x, value 0x%x" > usb_serial_bad_token(int bus, int addr) "dev %d:%d bad token" > +usb_serial_set_baud(int bus, int addr, int baud) "dev %d:%d baud rate %d" > +usb_serial_set_data(int bus, int addr, int parity, int data, int stop) "dev %d:%d parity %c, data bits %d, stop bits %d" > Using "%u" for addr: Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index abc316c7bf..badf8785db 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -307,6 +307,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p, } s->params.speed = (48000000 / 2) / (8 * divisor + subdivisor8); + trace_usb_serial_set_baud(bus->busnr, dev->addr, s->params.speed); qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_SET_PARAMS, &s->params); break; } @@ -340,6 +341,8 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p, goto fail; } + trace_usb_serial_set_data(bus->busnr, dev->addr, s->params.parity, + s->params.data_bits, s->params.stop_bits); qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_SET_PARAMS, &s->params); /* TODO: TX ON/OFF */ break; diff --git a/hw/usb/trace-events b/hw/usb/trace-events index e5871cbbbc..9e984b2e0c 100644 --- a/hw/usb/trace-events +++ b/hw/usb/trace-events @@ -328,3 +328,5 @@ usb_serial_unsupported_parity(int bus, int addr, int value) "dev %d:%d unsupport usb_serial_unsupported_stopbits(int bus, int addr, int value) "dev %d:%d unsupported stop bits %d" usb_serial_unsupported_control(int bus, int addr, int request, int value) "dev %d:%d got unsupported/bogus control 0x%x, value 0x%x" usb_serial_bad_token(int bus, int addr) "dev %d:%d bad token" +usb_serial_set_baud(int bus, int addr, int baud) "dev %d:%d baud rate %d" +usb_serial_set_data(int bus, int addr, int parity, int data, int stop) "dev %d:%d parity %c, data bits %d, stop bits %d"
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/usb/dev-serial.c | 3 +++ hw/usb/trace-events | 2 ++ 2 files changed, 5 insertions(+)