ChangeSet 1.2000.12.7, 2004/10/21 13:29:33-07:00, [EMAIL PROTECTED]
[PATCH] USB: net2280 compile fixes
Fix some compiler warnings that came up with net2280 on processors with
64bit dma_addr-t ... one of them would have been a bug on big-endian CPUs.
(Thanks to Randy Dunlap for reporting these.)
Signed-off-by: David Brownell <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
drivers/usb/gadget/net2280.c | 9 ++++++---
drivers/usb/gadget/net2280.h | 8 ++++----
2 files changed, 10 insertions(+), 7 deletions(-)
diff -Nru a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
--- a/drivers/usb/gadget/net2280.c 2004-10-22 16:12:35 -07:00
+++ b/drivers/usb/gadget/net2280.c 2004-10-22 16:12:35 -07:00
@@ -717,7 +717,7 @@
dmacount |= (1 << DMA_DONE_INTERRUPT_ENABLE);
/* td->dmadesc = previously set by caller */
- td->dmaaddr = cpu_to_le32p (&req->req.dma);
+ td->dmaaddr = cpu_to_le32 (req->req.dma);
/* 2280 may be polling VALID_BIT through ep->dma->dmadesc */
wmb ();
@@ -1707,8 +1707,10 @@
td = req->td;
t = scnprintf (next, size, "\t td %08x "
" count %08x buf %08x desc %08x\n",
- req->td_dma, td->dmacount,
- td->dmaaddr, td->dmadesc);
+ (u32) req->td_dma,
+ le32_to_cpu (td->dmacount),
+ le32_to_cpu (td->dmaaddr),
+ le32_to_cpu (td->dmadesc));
if (t <= 0 || t > size)
goto done;
size -= t;
@@ -2845,6 +2847,7 @@
dev->got_irq = 1;
/* DMA setup */
+ /* NOTE: we know only the 32 LSBs of dma addresses may be nonzero */
dev->requests = pci_pool_create ("requests", pdev,
sizeof (struct net2280_dma),
0 /* no alignment requirements */,
diff -Nru a/drivers/usb/gadget/net2280.h b/drivers/usb/gadget/net2280.h
--- a/drivers/usb/gadget/net2280.h 2004-10-22 16:12:35 -07:00
+++ b/drivers/usb/gadget/net2280.h 2004-10-22 16:12:35 -07:00
@@ -495,10 +495,10 @@
* use struct net2280_dma_regs bitfields
*/
struct net2280_dma {
- u32 dmacount;
- u32 dmaaddr; /* the buffer */
- u32 dmadesc; /* next dma descriptor */
- u32 _reserved;
+ __le32 dmacount;
+ __le32 dmaaddr; /* the buffer */
+ __le32 dmadesc; /* next dma descriptor */
+ __le32 _reserved;
} __attribute__ ((aligned (16)));
/*-------------------------------------------------------------------------*/
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
