motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 17:53:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/usb/uhci: checkpatch cleanup

Browse source 
Fix reported checkpatch issues to prepare for next patches
in the series.

No functional change.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Message-ID: <20240906122542.3808997-2-linux@roeck-us.net>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Guenter Roeck 2024-09-06 05:25:35 -07:00 • committed by Philippe Mathieu-Daudé
parent 4daf88c165
commit 9d59b65d82
1 changed files with 56 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

70
hw/usb/hcd-uhci.c
View file

@ -220,8 +220,9 @@ static void uhci_async_cancel(UHCIAsync *async)
uhci_async_unlink(async); uhci_async_unlink(async);
trace_usb_uhci_packet_cancel(async->queue->token, async->td_addr, trace_usb_uhci_packet_cancel(async->queue->token, async->td_addr,
async->done); async->done);
if (!async->done) if (!async->done) {
usb_cancel_packet(&async->packet); usb_cancel_packet(&async->packet);
}
uhci_async_free(async); uhci_async_free(async);
} }
@ -425,10 +426,13 @@ static void uhci_port_write(void *opaque, hwaddr addr,
break; break;
case 0x02: case 0x02:
s->status &= ~val; s->status &= ~val;
/* XXX: the chip spec is not coherent, so we add a hidden /*
register to distinguish between IOC and SPD */ * XXX: the chip spec is not coherent, so we add a hidden
if (val & UHCI_STS_USBINT) * register to distinguish between IOC and SPD
*/
if (val & UHCI_STS_USBINT) {
s->status2 = 0; s->status2 = 0;
}
uhci_update_irq(s); uhci_update_irq(s);
break; break;
case 0x04: case 0x04:
@ -436,8 +440,9 @@ static void uhci_port_write(void *opaque, hwaddr addr,
uhci_update_irq(s); uhci_update_irq(s);
break; break;
case 0x06: case 0x06:
if (s->status & UHCI_STS_HCHALTED) if (s->status & UHCI_STS_HCHALTED) {
s->frnum = val & 0x7ff; s->frnum = val & 0x7ff;
}
break; break;
case 0x08: case 0x08:
s->fl_base_addr &= 0xffff0000; s->fl_base_addr &= 0xffff0000;
@ -537,8 +542,9 @@ static void uhci_resume (void *opaque)
{ {
UHCIState *s = (UHCIState *)opaque; UHCIState *s = (UHCIState *)opaque;
if (!s) if (!s) {
return; return;
}
if (s->cmd & UHCI_CMD_EGSM) { if (s->cmd & UHCI_CMD_EGSM) {
s->cmd |= UHCI_CMD_FGR; s->cmd |= UHCI_CMD_FGR;
@ -674,7 +680,8 @@ static int uhci_handle_td_error(UHCIState *s, UHCI_TD *td, uint32_t td_addr,
return ret; return ret;
} }
static int uhci_complete_td(UHCIState *s, UHCI_TD *td, UHCIAsync *async, uint32_t *int_mask) static int uhci_complete_td(UHCIState *s, UHCI_TD *td, UHCIAsync *async,
uint32_t *int_mask)
{ {
int len = 0, max_len; int len = 0, max_len;
uint8_t pid; uint8_t pid;
@ -682,8 +689,9 @@ static int uhci_complete_td(UHCIState *s, UHCI_TD *td, UHCIAsync *async, uint32_
max_len = ((td->token >> 21) + 1) & 0x7ff; max_len = ((td->token >> 21) + 1) & 0x7ff;
pid = td->token & 0xff; pid = td->token & 0xff;
if (td->ctrl & TD_CTRL_IOS) if (td->ctrl & TD_CTRL_IOS) {
td->ctrl &= ~TD_CTRL_ACTIVE; td->ctrl &= ~TD_CTRL_ACTIVE;
}
if (async->packet.status != USB_RET_SUCCESS) { if (async->packet.status != USB_RET_SUCCESS) {
return uhci_handle_td_error(s, td, async->td_addr, return uhci_handle_td_error(s, td, async->td_addr,
@ -693,12 +701,15 @@ static int uhci_complete_td(UHCIState *s, UHCI_TD *td, UHCIAsync *async, uint32_
len = async->packet.actual_length; len = async->packet.actual_length;
td->ctrl = (td->ctrl & ~0x7ff) | ((len - 1) & 0x7ff); td->ctrl = (td->ctrl & ~0x7ff) | ((len - 1) & 0x7ff);
/* The NAK bit may have been set by a previous frame, so clear it /*
here. The docs are somewhat unclear, but win2k relies on this * The NAK bit may have been set by a previous frame, so clear it
behavior. */ * here. The docs are somewhat unclear, but win2k relies on this
* behavior.
*/
td->ctrl &= ~(TD_CTRL_ACTIVE | TD_CTRL_NAK); td->ctrl &= ~(TD_CTRL_ACTIVE | TD_CTRL_NAK);
if (td->ctrl & TD_CTRL_IOC) if (td->ctrl & TD_CTRL_IOC) {
*int_mask |= 0x01; *int_mask |= 0x01;
}
if (pid == USB_TOKEN_IN) { if (pid == USB_TOKEN_IN) {
pci_dma_write(&s->dev, td->buffer, async->buf, len); pci_dma_write(&s->dev, td->buffer, async->buf, len);
@ -780,9 +791,11 @@ static int uhci_handle_td(UHCIState *s, UHCIQueue *q, uint32_t qh_addr,
if (async) { if (async) {
if (queuing) { if (queuing) {
/* we are busy filling the queue, we are not prepared /*
to consume completed packages then, just leave them * we are busy filling the queue, we are not prepared
in async state */ * to consume completed packages then, just leave them
* in async state
*/
return TD_RESULT_ASYNC_CONT; return TD_RESULT_ASYNC_CONT;
} }
if (!async->done) { if (!async->done) {
@ -911,12 +924,15 @@ static void qhdb_reset(QhDb *db)
static int qhdb_insert(QhDb *db, uint32_t addr) static int qhdb_insert(QhDb *db, uint32_t addr)
{ {
int i; int i;
for (i = 0; i < db->count; i++) for (i = 0; i < db->count; i++) {
if (db->addr[i] == addr) if (db->addr[i] == addr) {
return 1; return 1;
}
}
if (db->count >= UHCI_MAX_QUEUES) if (db->count >= UHCI_MAX_QUEUES) {
return 1; return 1;
}
db->addr[db->count++] = addr; db->addr[db->count++] = addr;
return 0; return 0;
@ -970,8 +986,10 @@ static void uhci_process_frame(UHCIState *s)
for (cnt = FRAME_MAX_LOOPS; is_valid(link) && cnt; cnt--) { for (cnt = FRAME_MAX_LOOPS; is_valid(link) && cnt; cnt--) {
if (!s->completions_only && s->frame_bytes >= s->frame_bandwidth) { if (!s->completions_only && s->frame_bytes >= s->frame_bandwidth) {
/* We've reached the usb 1.1 bandwidth, which is /*
1280 bytes/frame, stop processing */ * We've reached the usb 1.1 bandwidth, which is
* 1280 bytes/frame, stop processing
*/
trace_usb_uhci_frame_stop_bandwidth(); trace_usb_uhci_frame_stop_bandwidth();
break; break;
} }
@ -1120,8 +1138,10 @@ static void uhci_frame_timer(void *opaque)
uhci_async_validate_begin(s); uhci_async_validate_begin(s);
uhci_process_frame(s); uhci_process_frame(s);
uhci_async_validate_end(s); uhci_async_validate_end(s);
/* The spec says frnum is the frame currently being processed, and /*
* the guest must look at frnum - 1 on interrupt, so inc frnum now */ * The spec says frnum is the frame currently being processed, and
* the guest must look at frnum - 1 on interrupt, so inc frnum now
*/
s->frnum = (s->frnum + 1) & 0x7ff; s->frnum = (s->frnum + 1) & 0x7ff;
s->expire_time += frame_t; s->expire_time += frame_t;
} }
@ -1200,8 +1220,10 @@ void usb_uhci_common_realize(PCIDevice *dev, Error **errp)
memory_region_init_io(&s->io_bar, OBJECT(s), &uhci_ioport_ops, s, memory_region_init_io(&s->io_bar, OBJECT(s), &uhci_ioport_ops, s,
"uhci", 0x20); "uhci", 0x20);
/* Use region 4 for consistency with real hardware. BSD guests seem /*
to rely on this. */ * Use region 4 for consistency with real hardware. BSD guests seem
* to rely on this.
*/
pci_register_bar(&s->dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &s->io_bar); pci_register_bar(&s->dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &s->io_bar);
} }