Merge branch 'master' into rcc-dev

Conflicts:
	Makefile

1 files changed, 83 insertions, 0 deletions

diff --git a/libmaple/usb.c b/libmaple/usb.c
new file mode 100644
index 0000000..8c312f8
--- /dev/null
+++ b/libmaple/usb.c
@@ -0,0 +1,83 @@
+#include <inttypes.h>
+#include "usb.h"
+
+void usb_lpIRQHandler(void)
+{
+  typedef void (*funcPtr)(void);
+  
+  const uint32_t usbIsrAddr = *(uint32_t*)(USB_ISR_ADDR);
+  void (*ptrToUsbISR)(void) = (funcPtr) usbIsrAddr;
+  ptrToUsbISR();
+}
+
+void usb_userToPMABufferCopy(u8 *pbUsrBuf, u16 wPMABufAddr, u16 wNBytes)
+{
+  u32 n = (wNBytes + 1) >> 1;   /* n = (wNBytes + 1) / 2 */
+  u32 i, temp1, temp2;
+  u16 *pdwVal;
+  pdwVal = (u16 *)(wPMABufAddr * 2 + PMAAddr);
+  for (i = n; i != 0; i--)
+    {
+      temp1 = (u16) * pbUsrBuf;
+      pbUsrBuf++;
+      temp2 = temp1 | (u16) * pbUsrBuf << 8;
+      *pdwVal++ = temp2;
+      pdwVal++;
+      pbUsrBuf++;
+    }
+}
+
+void usb_PMAToUserBufferCopy(u8 *pbUsrBuf, u16 wPMABufAddr, u16 wNBytes)
+{
+  u32 n = (wNBytes + 1) >> 1;/* /2*/
+  u32 i;
+  u32 *pdwVal;
+  pdwVal = (u32 *)(wPMABufAddr * 2 + PMAAddr);
+  for (i = n; i != 0; i--)
+    {
+      *(u16*)pbUsrBuf++ = *pdwVal++;
+      pbUsrBuf++;
+    }
+}
+
+void usb_serialWriteStr(const char* outStr) {
+  u8 offset=0;
+  BootVectTable *bootVector = ((BootVectTable*)BOOTLOADER_VECT_TABLE);
+
+  while ((outStr[offset] != '\0')
+	 && (offset < USB_SERIAL_BUF_SIZE)) {
+    offset++;
+  }
+
+  delay(offset*1);
+
+  bootVector->serial_count_in = (u32*) &offset;
+  usb_userToPMABufferCopy((u8*)outStr,USB_SERIAL_ENDP_TXADDR,offset);
+  _SetEPTxCount(USB_SERIAL_ENDP_TX,offset);
+  _SetEPTxValid(USB_SERIAL_ENDP_TX);
+
+}
+
+void usb_serialWriteChar(unsigned char ch) {
+  BootVectTable *bootVector = ((BootVectTable*)BOOTLOADER_VECT_TABLE);
+
+  delay(1);
+
+  *(bootVector->serial_count_in) = 1;
+  usb_userToPMABufferCopy((u8*)(&ch),USB_SERIAL_ENDP_TXADDR,1);
+  _SetEPTxCount(USB_SERIAL_ENDP_TX,1);
+  _SetEPTxValid(USB_SERIAL_ENDP_TX);
+
+}
+
+uint8_t usb_serialGetRecvLen() {
+  uint8_t count_out =_GetEPRxCount(USB_SERIAL_ENDP_RX); 
+  return count_out;
+}
+
+void usb_copyRecvBuffer(unsigned char* dest, uint8_t len) {
+  ASSERT(len < USB_SERIAL_BUF_SIZE);
+  usb_PMAToUserBufferCopy((u8*)(dest),USB_SERIAL_ENDP_RXADDR,len);
+  _SetEPRxValid(USB_SERIAL_ENDP_RX);
+}
+