UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: octeon-usb: cvmx_usb_tx_fifo_t -> struct cvmx_usb_tx_fifo 

Replace cvmx_usb_tx_fifo_t with struct cvmx_usb_tx_fifo_t.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aaro Koskinen 2013-07-30 23:43:09 +03:00 committed by Greg Kroah-Hartman
parent bb06528d6e
commit 0ff6ac84f9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/octeon-usb/cvmx-usb.c
View File

@ -217,7 +217,7 @@ struct cvmx_usb_pipe_list {
struct cvmx_usb_pipe *tail; struct cvmx_usb_pipe *tail;
}; };
typedef struct { struct cvmx_usb_tx_fifo {
struct { struct {
int channel; int channel;
int size; int size;
@ -225,7 +225,7 @@ typedef struct {
} entry[MAX_CHANNELS+1]; } entry[MAX_CHANNELS+1];
int head; int head;
int tail; int tail;
} cvmx_usb_tx_fifo_t; };
/** /**
* The state of the USB block is stored in this structure * The state of the USB block is stored in this structure
@ -249,8 +249,8 @@ typedef struct {
struct cvmx_usb_pipe_list active_pipes[4]; /**< Active pipes indexed by transfer type */ struct cvmx_usb_pipe_list active_pipes[4]; /**< Active pipes indexed by transfer type */
uint64_t frame_number; /**< Increments every SOF interrupt for time keeping */ uint64_t frame_number; /**< Increments every SOF interrupt for time keeping */
struct cvmx_usb_transaction *active_split; /**< Points to the current active split, or NULL */ struct cvmx_usb_transaction *active_split; /**< Points to the current active split, or NULL */
cvmx_usb_tx_fifo_t periodic; struct cvmx_usb_tx_fifo periodic;
cvmx_usb_tx_fifo_t nonperiodic; struct cvmx_usb_tx_fifo nonperiodic;
} cvmx_usb_internal_state_t; } cvmx_usb_internal_state_t;
/* This macro spins on a field waiting for it to reach a value */ /* This macro spins on a field waiting for it to reach a value */
@ -1288,7 +1288,7 @@ static void __cvmx_usb_poll_rx_fifo(cvmx_usb_internal_state_t *usb)
* Returns: Non zero if the hardware fifo was too small and needs * Returns: Non zero if the hardware fifo was too small and needs
* to be serviced again. * to be serviced again.
*/ */
static int __cvmx_usb_fill_tx_hw(cvmx_usb_internal_state_t *usb, cvmx_usb_tx_fifo_t *fifo, int available) static int __cvmx_usb_fill_tx_hw(cvmx_usb_internal_state_t *usb, struct cvmx_usb_tx_fifo *fifo, int available)
{ {
/* /*
* We're done either when there isn't anymore space or the software FIFO * We're done either when there isn't anymore space or the software FIFO
@ -1378,7 +1378,7 @@ static void __cvmx_usb_fill_tx_fifo(cvmx_usb_internal_state_t *usb, int channel)
cvmx_usbcx_hccharx_t hcchar; cvmx_usbcx_hccharx_t hcchar;
cvmx_usbcx_hcspltx_t usbc_hcsplt; cvmx_usbcx_hcspltx_t usbc_hcsplt;
cvmx_usbcx_hctsizx_t usbc_hctsiz; cvmx_usbcx_hctsizx_t usbc_hctsiz;
cvmx_usb_tx_fifo_t *fifo; struct cvmx_usb_tx_fifo *fifo;
/* We only need to fill data on outbound channels */ /* We only need to fill data on outbound channels */
hcchar.u32 = __cvmx_usb_read_csr32(usb, CVMX_USBCX_HCCHARX(channel, usb->index)); hcchar.u32 = __cvmx_usb_read_csr32(usb, CVMX_USBCX_HCCHARX(channel, usb->index));