diff options
| author | ajmeyer@mit.edu <ajmeyer@mit.edu@749a229e-a60e-11de-b98f-4500b42dc123> | 2009-12-19 08:41:53 +0000 |
|---|---|---|
| committer | ajmeyer@mit.edu <ajmeyer@mit.edu@749a229e-a60e-11de-b98f-4500b42dc123> | 2009-12-19 08:41:53 +0000 |
| commit | af4c4985cef82b80b936584d686c80d9538082b6 (patch) | |
| tree | cc07bda1a5a080e079b44c9606f66eab5003cf76 /src/lib | |
| parent | 7021adc50a041bfb69bc4432b712aa07ef710ca3 (diff) | |
| download | librambutan-af4c4985cef82b80b936584d686c80d9538082b6.tar.gz librambutan-af4c4985cef82b80b936584d686c80d9538082b6.zip | |
fixed some minor naming issues in usb.c/h usb_serialWriteStr is nonfunctional
git-svn-id: https://leaflabs.googlecode.com/svn/trunk/library@73 749a229e-a60e-11de-b98f-4500b42dc123
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/usb.c | 10 | ||||
| -rw-r--r-- | src/lib/usb.h | 14 |
2 files changed, 10 insertions, 14 deletions
diff --git a/src/lib/usb.c b/src/lib/usb.c index e0d7d42..e83bf98 100644 --- a/src/lib/usb.c +++ b/src/lib/usb.c @@ -1,5 +1,5 @@ -#include "usb.h" #include <inttypes.h> +#include "usb.h" void usb_lpIRQHandler(void) { @@ -10,7 +10,7 @@ void usb_lpIRQHandler(void) ptrToUsbISR(); } -void UserToPMABufferCopy(u8 *pbUsrBuf, u16 wPMABufAddr, u16 wNBytes) +void usb_userToPMABufferCopy(u8 *pbUsrBuf, u16 wPMABufAddr, u16 wNBytes) { u32 n = (wNBytes + 1) >> 1; /* n = (wNBytes + 1) / 2 */ u32 i, temp1, temp2; @@ -27,7 +27,7 @@ void UserToPMABufferCopy(u8 *pbUsrBuf, u16 wPMABufAddr, u16 wNBytes) } } -void PMAToUserBufferCopy(u8 *pbUsrBuf, u16 wPMABufAddr, u16 wNBytes) +void usb_PMAToUserBufferCopy(u8 *pbUsrBuf, u16 wPMABufAddr, u16 wNBytes) { u32 n = (wNBytes + 1) >> 1;/* /2*/ u32 i; @@ -40,7 +40,7 @@ void PMAToUserBufferCopy(u8 *pbUsrBuf, u16 wPMABufAddr, u16 wNBytes) } } -void serialWriteStr(char* outStr) { +void usb_serialWriteStr(const char* outStr) { u8 offset=0; while ((outStr[offset] != 0) && (offset < USB_SERIAL_BUF_SIZE)) { @@ -49,7 +49,7 @@ void serialWriteStr(char* outStr) { while (_GetEPTxCount(USB_SERIAL_ENDP_TX) > 0) {} - UserToPMABufferCopy(outStr,USB_SERIAL_ENDP_TXADDR,offset); + usb_userToPMABufferCopy(outStr,USB_SERIAL_ENDP_TXADDR,offset); _SetEPTxCount(USB_SERIAL_ENDP_TX,offset); _SetEPTxValid(USB_SERIAL_ENDP_TX); } diff --git a/src/lib/usb.h b/src/lib/usb.h index be632dd..d057b1d 100644 --- a/src/lib/usb.h +++ b/src/lib/usb.h @@ -6,7 +6,7 @@ #include "cortexm3_macro.h" #include "usb_regs.h" -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif @@ -18,16 +18,12 @@ extern "C" { #define USB_SERIAL_BUF_SIZE (0x40) void usb_lpIRQHandler(void); -void usb_userToPMABufferCopy(uint8_t *pbUsrBuf, - uint16_t *wPMABufAddr, - uint16_t *wNBytes); -void usb_PMABToUserufferCopy(uint8_t *pbUsrBuf, - uint16_t *wPMABufAddr, - uint16_t *wNBytes); -void usb_serialWriteStr(char* str); +void usb_userToPMABufferCopy(u8 *pbUsrBuf,u16 wPMABufAddr,u16 wNBytes); +void usb_PMAToUserBufferCopy(u8 *pbUsrBuf,u16 wPMABufAddr,u16 wNBytes); +void usb_serialWriteStr(const char *outStr); -#ifdef __cpluscplus +#ifdef __cplusplus } // extern "C" #endif #endif //_USB_H |