Commit cd665715 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

ehci: move ehci_flush_qh 



Move ehci_flush_qh() function up in the source code.
No code change.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent e59928b3

hw/usb/hcd-ehci.c

+18 −17
Original line number Diff line number Diff line
@@ -1553,6 +1553,24 @@ static int ehci_process_itd(EHCIState *ehci, 
    return 0;

}





/*

 *  Write the qh back to guest physical memory.  This step isn't

 *  in the EHCI spec but we need to do it since we don't share

 *  physical memory with our guest VM.

 *

 *  The first three dwords are read-only for the EHCI, so skip them

 *  when writing back the qh.

 */

static void ehci_flush_qh(EHCIQueue *q)

{

    uint32_t *qh = (uint32_t *) &q->qh;

    uint32_t dwords = sizeof(EHCIqh) >> 2;

    uint32_t addr = NLPTR_GET(q->qhaddr);



    put_dwords(q->ehci, addr + 3 * sizeof(uint32_t), qh + 3, dwords - 3);

}



/*  This state is the entry point for asynchronous schedule

 *  processing.  Entry here consitutes a EHCI start event state (4.8.5)

 */
@@ -1869,23 +1887,6 @@ static int ehci_state_horizqh(EHCIQueue *q, int async) 
    return again;

}



/*

 *  Write the qh back to guest physical memory.  This step isn't

 *  in the EHCI spec but we need to do it since we don't share

 *  physical memory with our guest VM.

 *

 *  The first three dwords are read-only for the EHCI, so skip them

 *  when writing back the qh.

 */

static void ehci_flush_qh(EHCIQueue *q)

{

    uint32_t *qh = (uint32_t *) &q->qh;

    uint32_t dwords = sizeof(EHCIqh) >> 2;

    uint32_t addr = NLPTR_GET(q->qhaddr);



    put_dwords(q->ehci, addr + 3 * sizeof(uint32_t), qh + 3, dwords - 3);

}



static int ehci_state_execute(EHCIQueue *q, int async)

{

    EHCIPacket *p = QTAILQ_FIRST(&q->packets);