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

uhci: Rename UHCIAsync->td to UHCIAsync->td_addr 

We use the name td both to refer to a UHCI_TD read from guest memory as
well as to refer to the guest address where a td is stored, switch over
to always use td_addr in the second case for consistency.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Hans de Goede 2012-10-24 18:31:10 +02:00 committed by Gerd Hoffmann
parent 4050737726
commit 1f250cc772
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
hw/usb/hcd-uhci.c
View File

@ -100,7 +100,7 @@ struct UHCIAsync {
QEMUSGList sgl; QEMUSGList sgl;
UHCIQueue *queue; UHCIQueue *queue;
QTAILQ_ENTRY(UHCIAsync) next; QTAILQ_ENTRY(UHCIAsync) next;
uint32_t td; uint32_t td_addr;
uint8_t done; uint8_t done;
}; };
@ -203,22 +203,22 @@ static void uhci_queue_free(UHCIQueue *queue)
g_free(queue); g_free(queue);
} }
static UHCIAsync *uhci_async_alloc(UHCIQueue *queue, uint32_t addr) static UHCIAsync *uhci_async_alloc(UHCIQueue *queue, uint32_t td_addr)
{ {
UHCIAsync *async = g_new0(UHCIAsync, 1); UHCIAsync *async = g_new0(UHCIAsync, 1);
async->queue = queue; async->queue = queue;
async->td = addr; async->td_addr = td_addr;
usb_packet_init(&async->packet); usb_packet_init(&async->packet);
pci_dma_sglist_init(&async->sgl, &queue->uhci->dev, 1); pci_dma_sglist_init(&async->sgl, &queue->uhci->dev, 1);
trace_usb_uhci_packet_add(async->queue->token, async->td); trace_usb_uhci_packet_add(async->queue->token, async->td_addr);
return async; return async;
} }
static void uhci_async_free(UHCIAsync *async) static void uhci_async_free(UHCIAsync *async)
{ {
trace_usb_uhci_packet_del(async->queue->token, async->td); trace_usb_uhci_packet_del(async->queue->token, async->td_addr);
usb_packet_cleanup(&async->packet); usb_packet_cleanup(&async->packet);
qemu_sglist_destroy(&async->sgl); qemu_sglist_destroy(&async->sgl);
g_free(async); g_free(async);
@ -228,20 +228,21 @@ static void uhci_async_link(UHCIAsync *async)
{ {
UHCIQueue *queue = async->queue; UHCIQueue *queue = async->queue;
QTAILQ_INSERT_TAIL(&queue->asyncs, async, next); QTAILQ_INSERT_TAIL(&queue->asyncs, async, next);
trace_usb_uhci_packet_link_async(async->queue->token, async->td); trace_usb_uhci_packet_link_async(async->queue->token, async->td_addr);
} }
static void uhci_async_unlink(UHCIAsync *async) static void uhci_async_unlink(UHCIAsync *async)
{ {
UHCIQueue *queue = async->queue; UHCIQueue *queue = async->queue;
QTAILQ_REMOVE(&queue->asyncs, async, next); QTAILQ_REMOVE(&queue->asyncs, async, next);
trace_usb_uhci_packet_unlink_async(async->queue->token, async->td); trace_usb_uhci_packet_unlink_async(async->queue->token, async->td_addr);
} }
static void uhci_async_cancel(UHCIAsync *async) 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, async->done); trace_usb_uhci_packet_cancel(async->queue->token, async->td_addr,
async->done);
if (!async->done) if (!async->done)
usb_cancel_packet(&async->packet); usb_cancel_packet(&async->packet);
usb_packet_unmap(&async->packet, &async->sgl); usb_packet_unmap(&async->packet, &async->sgl);
@ -300,7 +301,8 @@ static void uhci_async_cancel_all(UHCIState *s)
} }
} }
static UHCIAsync *uhci_async_find_td(UHCIState *s, uint32_t addr, UHCI_TD *td) static UHCIAsync *uhci_async_find_td(UHCIState *s, uint32_t td_addr,
UHCI_TD *td)
{ {
uint32_t token = uhci_queue_token(td); uint32_t token = uhci_queue_token(td);
UHCIQueue *queue; UHCIQueue *queue;
@ -316,7 +318,7 @@ static UHCIAsync *uhci_async_find_td(UHCIState *s, uint32_t addr, UHCI_TD *td)
} }
QTAILQ_FOREACH(async, &queue->asyncs, next) { QTAILQ_FOREACH(async, &queue->asyncs, next) {
if (async->td == addr) { if (async->td_addr == td_addr) {
return async; return async;
} }
} }
@ -722,13 +724,14 @@ static int uhci_complete_td(UHCIState *s, UHCI_TD *td, UHCIAsync *async, uint32_
*int_mask |= 0x02; *int_mask |= 0x02;
/* short packet: do not update QH */ /* short packet: do not update QH */
trace_usb_uhci_packet_complete_shortxfer(async->queue->token, trace_usb_uhci_packet_complete_shortxfer(async->queue->token,
async->td); async->td_addr);
return TD_RESULT_NEXT_QH; return TD_RESULT_NEXT_QH;
} }
} }
/* success */ /* success */
trace_usb_uhci_packet_complete_success(async->queue->token, async->td); trace_usb_uhci_packet_complete_success(async->queue->token,
async->td_addr);
return TD_RESULT_COMPLETE; return TD_RESULT_COMPLETE;
out: out:
@ -739,14 +742,16 @@ out:
case USB_RET_STALL: case USB_RET_STALL:
td->ctrl |= TD_CTRL_STALL; td->ctrl |= TD_CTRL_STALL;
trace_usb_uhci_packet_complete_stall(async->queue->token, async->td); trace_usb_uhci_packet_complete_stall(async->queue->token,
async->td_addr);
err = TD_RESULT_NEXT_QH; err = TD_RESULT_NEXT_QH;
break; break;
case USB_RET_BABBLE: case USB_RET_BABBLE:
td->ctrl |= TD_CTRL_BABBLE | TD_CTRL_STALL; td->ctrl |= TD_CTRL_BABBLE | TD_CTRL_STALL;
/* frame interrupted */ /* frame interrupted */
trace_usb_uhci_packet_complete_babble(async->queue->token, async->td); trace_usb_uhci_packet_complete_babble(async->queue->token,
async->td_addr);
err = TD_RESULT_STOP_FRAME; err = TD_RESULT_STOP_FRAME;
break; break;
@ -755,7 +760,8 @@ out:
default: default:
td->ctrl |= TD_CTRL_TIMEOUT; td->ctrl |= TD_CTRL_TIMEOUT;
td->ctrl &= ~(3 << TD_CTRL_ERROR_SHIFT); td->ctrl &= ~(3 << TD_CTRL_ERROR_SHIFT);
trace_usb_uhci_packet_complete_error(async->queue->token, async->td); trace_usb_uhci_packet_complete_error(async->queue->token,
async->td_addr);
err = TD_RESULT_NEXT_QH; err = TD_RESULT_NEXT_QH;
break; break;
} }
@ -769,7 +775,7 @@ out:
return err; return err;
} }
static int uhci_handle_td(UHCIState *s, uint32_t addr, UHCI_TD *td, static int uhci_handle_td(UHCIState *s, uint32_t td_addr, UHCI_TD *td,
uint32_t *int_mask, bool queuing, uint32_t *int_mask, bool queuing,
struct USBEndpoint **ep_ret) struct USBEndpoint **ep_ret)
{ {
@ -792,7 +798,7 @@ static int uhci_handle_td(UHCIState *s, uint32_t addr, UHCI_TD *td,
return TD_RESULT_NEXT_QH; return TD_RESULT_NEXT_QH;
} }
async = uhci_async_find_td(s, addr, td); async = uhci_async_find_td(s, td_addr, td);
if (async) { if (async) {
/* Already submitted */ /* Already submitted */
async->queue->valid = 32; async->queue->valid = 32;
@ -811,7 +817,7 @@ static int uhci_handle_td(UHCIState *s, uint32_t addr, UHCI_TD *td,
} }
/* Allocate new packet */ /* Allocate new packet */
async = uhci_async_alloc(uhci_queue_get(s, td), addr); async = uhci_async_alloc(uhci_queue_get(s, td), td_addr);
/* valid needs to be large enough to handle 10 frame delay /* valid needs to be large enough to handle 10 frame delay
* for initial isochronous requests * for initial isochronous requests
@ -827,7 +833,7 @@ static int uhci_handle_td(UHCIState *s, uint32_t addr, UHCI_TD *td,
if (ep_ret) { if (ep_ret) {
*ep_ret = ep; *ep_ret = ep;
} }
usb_packet_setup(&async->packet, pid, ep, addr, spd, usb_packet_setup(&async->packet, pid, ep, td_addr, spd,
(td->ctrl & TD_CTRL_IOC) != 0); (td->ctrl & TD_CTRL_IOC) != 0);
qemu_sglist_add(&async->sgl, td->buffer, max_len); qemu_sglist_add(&async->sgl, td->buffer, max_len);
usb_packet_map(&async->packet, &async->sgl); usb_packet_map(&async->packet, &async->sgl);