[v1] dev-serial: minor fixes and improvements

[PATCH 2/9] dev-serial: use USB_SERIAL QOM macro for USBSerialState assignments

Posted by Mark Cave-Ayland 5 years ago

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/usb/dev-serial.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index 7a5fa3770e..77ce89d38b 100644
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -204,7 +204,7 @@ static void usb_serial_reset(USBSerialState *s)
 
 static void usb_serial_handle_reset(USBDevice *dev)
 {
-    USBSerialState *s = (USBSerialState *)dev;
+    USBSerialState *s = USB_SERIAL(dev);
 
     DPRINTF("Reset\n");
 
@@ -243,7 +243,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p,
                                       int request, int value, int index,
                                       int length, uint8_t *data)
 {
-    USBSerialState *s = (USBSerialState *)dev;
+    USBSerialState *s = USB_SERIAL(dev);
     int ret;
 
     DPRINTF("got control %x, value %x\n", request, value);
@@ -430,7 +430,7 @@ static void usb_serial_token_in(USBSerialState *s, USBPacket *p)
 
 static void usb_serial_handle_data(USBDevice *dev, USBPacket *p)
 {
-    USBSerialState *s = (USBSerialState *)dev;
+    USBSerialState *s = USB_SERIAL(dev);
     uint8_t devep = p->ep->nr;
     struct iovec *iov;
     int i;
-- 
2.20.1

Re: [PATCH 2/9] dev-serial: use USB_SERIAL QOM macro for USBSerialState assignments

Posted by Samuel Thibault 5 years ago

Mark Cave-Ayland, le lun. 26 oct. 2020 08:33:54 +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 | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
> index 7a5fa3770e..77ce89d38b 100644
> --- a/hw/usb/dev-serial.c
> +++ b/hw/usb/dev-serial.c
> @@ -204,7 +204,7 @@ static void usb_serial_reset(USBSerialState *s)
>  
>  static void usb_serial_handle_reset(USBDevice *dev)
>  {
> -    USBSerialState *s = (USBSerialState *)dev;
> +    USBSerialState *s = USB_SERIAL(dev);
>  
>      DPRINTF("Reset\n");
>  
> @@ -243,7 +243,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p,
>                                        int request, int value, int index,
>                                        int length, uint8_t *data)
>  {
> -    USBSerialState *s = (USBSerialState *)dev;
> +    USBSerialState *s = USB_SERIAL(dev);
>      int ret;
>  
>      DPRINTF("got control %x, value %x\n", request, value);
> @@ -430,7 +430,7 @@ static void usb_serial_token_in(USBSerialState *s, USBPacket *p)
>  
>  static void usb_serial_handle_data(USBDevice *dev, USBPacket *p)
>  {
> -    USBSerialState *s = (USBSerialState *)dev;
> +    USBSerialState *s = USB_SERIAL(dev);
>      uint8_t devep = p->ep->nr;
>      struct iovec *iov;
>      int i;
> -- 
> 2.20.1
> 

-- 
Samuel
<h> t: bah c'est tendre le pattern pour se faire matcher, hein

Re: [PATCH 2/9] dev-serial: use USB_SERIAL QOM macro for USBSerialState assignments

Posted by Philippe Mathieu-Daudé 5 years ago

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 | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>