Commit 2c63a07e authored by David Brownell's avatar David Brownell Committed by Tony Lindgren

musb_hdrc, CamelCase begone (cppi descriptors, ...)

More CamelCase removal from the CPPI support.  In this case:

 - CPPI descriptor members;
 - Some members of the controller struct;
 - Rename "regBase" variables (as "tibase", vs Mentor registers)
 - Rename otgCh variables as cppi_ch;

This code still has a bunch of CaMeLcAsInG going on.
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
parent 7fbb7785
This diff is collapsed.
......@@ -44,7 +44,7 @@ struct cppi_rx_stateram {
u32 rx_complete;
};
/* hOptions bit masks for CPPI BDs */
/* hw_options bits in CPPI buffer descriptors */
#define CPPI_SOP_SET ((u32)(1 << 31))
#define CPPI_EOP_SET ((u32)(1 << 30))
#define CPPI_OWN_SET ((u32)(1 << 29)) /* owned by cppi */
......@@ -62,17 +62,15 @@ struct cppi_rx_stateram {
#define CPPI_DESCRIPTOR_ALIGN 16 /* bytes; 5-dec docs say 4-byte align */
struct cppi_descriptor {
/* Hardware Overlay */
u32 hNext; /* Next(hardware) Buffer Descriptor Pointer */
u32 buffPtr; /* Buffer Pointer (dma_addr_t) */
u32 bOffBLen; /* Buffer_offset16,buffer_length16 */
u32 hOptions; /* Option fields for SOP,EOP etc*/
/* hardware overlay */
u32 hw_next; /* next buffer descriptor Pointer */
u32 hw_bufp; /* i/o buffer pointer */
u32 hw_off_len; /* buffer_offset16, buffer_length16 */
u32 hw_options; /* flags: SOP, EOP etc*/
struct cppi_descriptor *next;
dma_addr_t dma; /* address of this descriptor */
/* for Rx Desc, track original Buffer len to detect short packets */
u32 enqBuffLen;
dma_addr_t dma; /* address of this descriptor */
u32 buflen; /* for RX: original buffer length */
} __attribute__ ((aligned(CPPI_DESCRIPTOR_ALIGN)));
......@@ -85,7 +83,7 @@ struct cppi_channel {
*/
struct dma_channel Channel;
/* back pointer to the DMA Controller structure */
/* back pointer to the DMA controller structure */
struct cppi *controller;
/* which direction of which endpoint? */
......@@ -119,12 +117,13 @@ struct cppi_channel {
/* CPPI DMA controller object */
struct cppi {
struct dma_controller Controller;
struct dma_controller controller;
struct musb *musb;
void __iomem *pCoreBase;
void __iomem *mregs; /* Mentor regs */
void __iomem *tibase; /* TI/CPPI regs */
struct cppi_channel txCppi[MUSB_C_NUM_EPT - 1];
struct cppi_channel rxCppi[MUSB_C_NUM_EPR - 1];
struct cppi_channel tx[MUSB_C_NUM_EPT - 1];
struct cppi_channel rx[MUSB_C_NUM_EPR - 1];
struct dma_pool *pool;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment