On Fri, Jan 09, 2009 at 05:44:55PM -0500, ext Hugo Villeneuve wrote:
> With CONFIG_USB_MUSB_HDRC selected, we have the
> following compilation errors:
>
> drivers/usb/musb/cppi_dma.c:437:5: warning: "MUSB_DEBUG" is not defined
> drivers/usb/musb/cppi_dma.c: In function 'cppi_next_rx_segment':
> drivers/usb/musb/cppi_dma.c:884: error: 'debug' undeclared (first use in this function)
>
> These compilation errors are related to incorrect
> debugging macro and variable names.
>
> Signed-off-by: Hugo Villeneuve <hugo@xxxxxxxxxxx>
> ---
> drivers/usb/musb/cppi_dma.c | 11 +++++++++--
> 1 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c
> index 5ad6d08..3aac8d5 100644
> --- a/drivers/usb/musb/cppi_dma.c
> +++ b/drivers/usb/musb/cppi_dma.c
> @@ -41,6 +41,9 @@
> #define NUM_TXCHAN_BD 64
> #define NUM_RXCHAN_BD 64
>
> +/* Defined in musb_core.c */
> +extern unsigned musb_debug;
you should include musb_debug.h
> +
> static inline void cpu_drain_writebuffer(void)
> {
> wmb();
> @@ -423,6 +426,7 @@ cppi_rndis_update(struct cppi_channel *c, int is_rx,
> }
> }
>
> +#ifdef CONFIG_USB_MUSB_DEBUG
> static void cppi_dump_rxbd(const char *tag, struct cppi_descriptor *bd)
> {
> pr_debug("RXBD/%s %08x: "
> @@ -431,10 +435,11 @@ static void cppi_dump_rxbd(const char *tag, struct cppi_descriptor *bd)
> bd->hw_next, bd->hw_bufp, bd->hw_off_len,
> bd->hw_options);
> }
> +#endif
>
> static void cppi_dump_rxq(int level, const char *tag, struct cppi_channel *rx)
> {
> -#if MUSB_DEBUG > 0
> +#ifdef CONFIG_USB_MUSB_DEBUG
> struct cppi_descriptor *bd;
>
> if (!_dbg_level(level))
> @@ -881,12 +886,14 @@ cppi_next_rx_segment(struct musb *musb, struct cppi_channel *rx, int onepacket)
> bd->hw_options |= CPPI_SOP_SET;
> tail->hw_options |= CPPI_EOP_SET;
>
> - if (debug >= 5) {
> +#ifdef CONFIG_USB_MUSB_DEBUG
> + if (musb_debug >= 5) {
and use _dbg_level(5)
> struct cppi_descriptor *d;
>
> for (d = rx->head; d; d = d->next)
> cppi_dump_rxbd("S", d);
> }
> +#endif
>
> /* in case the preceding transfer left some state... */
> tail = rx->last_processed;
> --
> 1.5.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
