[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 52/63] usb: Rename USB_REDIRECT to USB_REDIR
From: |
Eduardo Habkost |
Subject: |
[PATCH 52/63] usb: Rename USB_REDIRECT to USB_REDIR |
Date: |
Wed, 2 Sep 2020 18:43:00 -0400 |
Make the type checking macro name consistent with the TYPE_*
constant.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: qemu-devel@nongnu.org
---
hw/usb/redirect.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index a079ecd50c..721af75da4 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -145,7 +145,7 @@ struct USBRedirDevice {
};
#define TYPE_USB_REDIR "usb-redir"
-DECLARE_INSTANCE_CHECKER(USBRedirDevice, USB_REDIRECT,
+DECLARE_INSTANCE_CHECKER(USBRedirDevice, USB_REDIR,
TYPE_USB_REDIR)
static void usbredir_hello(void *priv, struct usb_redir_hello_header *h);
@@ -375,7 +375,7 @@ static void packet_id_queue_empty(struct PacketIdQueue *q)
static void usbredir_cancel_packet(USBDevice *udev, USBPacket *p)
{
- USBRedirDevice *dev = USB_REDIRECT(udev);
+ USBRedirDevice *dev = USB_REDIR(udev);
int i = USBEP2I(p->ep);
if (p->combined) {
@@ -516,7 +516,7 @@ static void usbredir_free_bufpq(USBRedirDevice *dev,
uint8_t ep)
static void usbredir_handle_reset(USBDevice *udev)
{
- USBRedirDevice *dev = USB_REDIRECT(udev);
+ USBRedirDevice *dev = USB_REDIR(udev);
DPRINTF("reset device\n");
usbredirparser_send_reset(dev->parser);
@@ -955,7 +955,7 @@ static void
usbredir_stop_interrupt_receiving(USBRedirDevice *dev,
static void usbredir_handle_data(USBDevice *udev, USBPacket *p)
{
- USBRedirDevice *dev = USB_REDIRECT(udev);
+ USBRedirDevice *dev = USB_REDIR(udev);
uint8_t ep;
ep = p->ep->nr;
@@ -1024,7 +1024,7 @@ static void usbredir_stop_ep(USBRedirDevice *dev, int i)
static void usbredir_ep_stopped(USBDevice *udev, USBEndpoint *uep)
{
- USBRedirDevice *dev = USB_REDIRECT(udev);
+ USBRedirDevice *dev = USB_REDIR(udev);
usbredir_stop_ep(dev, USBEP2I(uep));
usbredirparser_do_write(dev->parser);
@@ -1094,7 +1094,7 @@ static void usbredir_get_interface(USBRedirDevice *dev,
USBPacket *p,
static void usbredir_handle_control(USBDevice *udev, USBPacket *p,
int request, int value, int index, int length, uint8_t *data)
{
- USBRedirDevice *dev = USB_REDIRECT(udev);
+ USBRedirDevice *dev = USB_REDIR(udev);
struct usb_redir_control_packet_header control_packet;
if (usbredir_already_in_flight(dev, p->id)) {
@@ -1149,7 +1149,7 @@ static void usbredir_handle_control(USBDevice *udev,
USBPacket *p,
static int usbredir_alloc_streams(USBDevice *udev, USBEndpoint **eps,
int nr_eps, int streams)
{
- USBRedirDevice *dev = USB_REDIRECT(udev);
+ USBRedirDevice *dev = USB_REDIR(udev);
#if USBREDIR_VERSION >= 0x000700
struct usb_redir_alloc_bulk_streams_header alloc_streams;
int i;
@@ -1188,7 +1188,7 @@ static void usbredir_free_streams(USBDevice *udev,
USBEndpoint **eps,
int nr_eps)
{
#if USBREDIR_VERSION >= 0x000700
- USBRedirDevice *dev = USB_REDIRECT(udev);
+ USBRedirDevice *dev = USB_REDIR(udev);
struct usb_redir_free_bulk_streams_header free_streams;
int i;
@@ -1417,7 +1417,7 @@ static void usbredir_init_endpoints(USBRedirDevice *dev)
static void usbredir_realize(USBDevice *udev, Error **errp)
{
- USBRedirDevice *dev = USB_REDIRECT(udev);
+ USBRedirDevice *dev = USB_REDIR(udev);
int i;
if (!qemu_chr_fe_backend_connected(&dev->cs)) {
@@ -1472,7 +1472,7 @@ static void usbredir_cleanup_device_queues(USBRedirDevice
*dev)
static void usbredir_unrealize(USBDevice *udev)
{
- USBRedirDevice *dev = USB_REDIRECT(udev);
+ USBRedirDevice *dev = USB_REDIR(udev);
qemu_chr_fe_deinit(&dev->cs, true);
@@ -2593,7 +2593,7 @@ static void usbredir_class_initfn(ObjectClass *klass,
void *data)
static void usbredir_instance_init(Object *obj)
{
USBDevice *udev = USB_DEVICE(obj);
- USBRedirDevice *dev = USB_REDIRECT(udev);
+ USBRedirDevice *dev = USB_REDIR(udev);
device_add_bootindex_property(obj, &dev->bootindex,
"bootindex", NULL,
--
2.26.2
- [PATCH 45/63] renesas: Rename RSCI to RENESAS_SCI, (continued)
- [PATCH 45/63] renesas: Rename RSCI to RENESAS_SCI, Eduardo Habkost, 2020/09/02
- [PATCH 47/63] rs6000_mc: Rename RS6000MC_DEVICE to RS6000MC, Eduardo Habkost, 2020/09/02
- [PATCH 49/63] stm32f205: Rename STM32F2XXTIMER to STM32F2XX_TIMER, Eduardo Habkost, 2020/09/02
- [PATCH 48/63] sabre: Rename SABRE_DEVICE to SABRE, Eduardo Habkost, 2020/09/02
- [PATCH 50/63] tpm_crb: Rename CRB to TPM_CRB, Eduardo Habkost, 2020/09/02
- [PATCH 52/63] usb: Rename USB_REDIRECT to USB_REDIR,
Eduardo Habkost <=
- [PATCH 51/63] tpm_spapr: Rename VIO_SPAPR_VTPM to TPM_SPAPR, Eduardo Habkost, 2020/09/02
- [PATCH 53/63] usb: Rename USB_SERIAL_DEV to USB_SERIAL, Eduardo Habkost, 2020/09/02
- [PATCH 54/63] usb: Rename USB_STORAGE_DEV to USB_STORAGE, Eduardo Habkost, 2020/09/02
- [PATCH 56/63] vmxnet3: Rename VMXNET3_DEVICE* to VMXNET3*, Eduardo Habkost, 2020/09/02
- [PATCH 55/63] vfio: Rename PCI_VFIO to VFIO_PCI, Eduardo Habkost, 2020/09/02
- [PATCH 58/63] hvf: Rename HVF_STATE to HVF_ACCEL, Eduardo Habkost, 2020/09/02
- [PATCH 57/63] xen: Rename XENBACKEND_DEVICE to XENBACKEND, Eduardo Habkost, 2020/09/02