ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary casts from PCI DMA code in usb-uhci 

This patch removes some unnecessary casts in the usb-uhci device,
introduced by commit fff23ee9a5
'usb-uhci: Use PCI DMA stub functions'.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
David Gibson 2011-11-04 12:03:38 +11:00 committed by Anthony Liguori
parent 4bf8011910
commit 9fe2fd6716
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/usb-uhci.c
View File

@ -876,7 +876,7 @@ static void uhci_async_complete(USBPort *port, USBPacket *packet)
uint32_t link = async->td; uint32_t link = async->td;
uint32_t int_mask = 0, val; uint32_t int_mask = 0, val;
pci_dma_read(&s->dev, link & ~0xf, (uint8_t *) &td, sizeof(td)); pci_dma_read(&s->dev, link & ~0xf, &td, sizeof(td));
le32_to_cpus(&td.link); le32_to_cpus(&td.link);
le32_to_cpus(&td.ctrl); le32_to_cpus(&td.ctrl);
le32_to_cpus(&td.token); le32_to_cpus(&td.token);
@ -888,8 +888,7 @@ static void uhci_async_complete(USBPort *port, USBPacket *packet)
/* update the status bits of the TD */ /* update the status bits of the TD */
val = cpu_to_le32(td.ctrl); val = cpu_to_le32(td.ctrl);
pci_dma_write(&s->dev, (link & ~0xf) + 4, pci_dma_write(&s->dev, (link & ~0xf) + 4, &val, sizeof(val));
(const uint8_t *)&val, sizeof(val));
uhci_async_free(s, async); uhci_async_free(s, async);
} else { } else {
async->done = 1; async->done = 1;
@ -952,7 +951,7 @@ static void uhci_process_frame(UHCIState *s)
DPRINTF("uhci: processing frame %d addr 0x%x\n" , s->frnum, frame_addr); DPRINTF("uhci: processing frame %d addr 0x%x\n" , s->frnum, frame_addr);
pci_dma_read(&s->dev, frame_addr, (uint8_t *)&link, 4); pci_dma_read(&s->dev, frame_addr, &link, 4);
le32_to_cpus(&link); le32_to_cpus(&link);
int_mask = 0; int_mask = 0;
@ -976,7 +975,7 @@ static void uhci_process_frame(UHCIState *s)
break; break;
} }
pci_dma_read(&s->dev, link & ~0xf, (uint8_t *) &qh, sizeof(qh)); pci_dma_read(&s->dev, link & ~0xf, &qh, sizeof(qh));
le32_to_cpus(&qh.link); le32_to_cpus(&qh.link);
le32_to_cpus(&qh.el_link); le32_to_cpus(&qh.el_link);
@ -996,7 +995,7 @@ static void uhci_process_frame(UHCIState *s)
} }
/* TD */ /* TD */
pci_dma_read(&s->dev, link & ~0xf, (uint8_t *) &td, sizeof(td)); pci_dma_read(&s->dev, link & ~0xf, &td, sizeof(td));
le32_to_cpus(&td.link); le32_to_cpus(&td.link);
le32_to_cpus(&td.ctrl); le32_to_cpus(&td.ctrl);
le32_to_cpus(&td.token); le32_to_cpus(&td.token);
@ -1010,8 +1009,7 @@ static void uhci_process_frame(UHCIState *s)
if (old_td_ctrl != td.ctrl) { if (old_td_ctrl != td.ctrl) {
/* update the status bits of the TD */ /* update the status bits of the TD */
val = cpu_to_le32(td.ctrl); val = cpu_to_le32(td.ctrl);
pci_dma_write(&s->dev, (link & ~0xf) + 4, pci_dma_write(&s->dev, (link & ~0xf) + 4, &val, sizeof(val));
(const uint8_t *)&val, sizeof(val));
} }
if (ret < 0) { if (ret < 0) {
@ -1039,8 +1037,7 @@ static void uhci_process_frame(UHCIState *s)
/* update QH element link */ /* update QH element link */
qh.el_link = link; qh.el_link = link;
val = cpu_to_le32(qh.el_link); val = cpu_to_le32(qh.el_link);
pci_dma_write(&s->dev, (curr_qh & ~0xf) + 4, pci_dma_write(&s->dev, (curr_qh & ~0xf) + 4, &val, sizeof(val));
(const uint8_t *)&val, sizeof(val));
if (!depth_first(link)) { if (!depth_first(link)) {
/* done with this QH */ /* done with this QH */