[for AJ] added new HardwareUsb implementation. hack.

5 files changed, 112 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 2de5847..bf6bed5 100644
--- a/Makefile
+++ b/Makefile
@@ -94,6 +94,7 @@ CSRC = libmaple/systick.c                \
 CPPSRC = wirish/wirish_math.cpp          \
 	 wirish/Print.cpp 		 \
 	 wirish/comm/HardwareSerial.cpp  \
+	 wirish/comm/HardwareUsb.cpp     \
 	 wirish/comm/HardwareSPI.cpp 	 \
 	 wirish/cxxabi-compat.cpp 	 \
    	 main.cpp
diff --git a/libmaple/usb/usb.h b/libmaple/usb/usb.h
index e76772e..ac8dc40 100644
--- a/libmaple/usb/usb.h
+++ b/libmaple/usb/usb.h
@@ -1,7 +1,7 @@
 /* insert license */
 
-#ifndef __USB_H_
-#define __USB_H_
+#ifndef __USB_H
+#define __USB_H
 
 
 #include "usb_lib.h"
diff --git a/wirish/WProgram.h b/wirish/WProgram.h
index 36a9e6d..889219e 100644
--- a/wirish/WProgram.h
+++ b/wirish/WProgram.h
@@ -24,6 +24,7 @@
 
 #include "wirish.h"
 #include "HardwareSerial.h"
+#include "HardwareUsb.h"
 #include "math.h"
 
 void setup();
diff --git a/wirish/comm/HardwareUsb.cpp b/wirish/comm/HardwareUsb.cpp
new file mode 100644
index 0000000..064bcc8
--- /dev/null
+++ b/wirish/comm/HardwareUsb.cpp
@@ -0,0 +1,60 @@
+/* *****************************************************************************
+ * The MIT License
+ *
+ * Copyright (c) 2010 Andrew Meyer.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ * ****************************************************************************/
+
+/**
+ * @brief Wiring like serial api to USB virtual COM
+ */
+
+#include "wirish.h"
+#include "HardwareUsb.h"
+#include "usb.h"
+
+HardwareUsb::HardwareUsb(void) {
+}
+
+uint8 HardwareUsb::read(void) {
+  uint8 outVal;
+  usbReceiveBytes(&outVal,1);
+  return outVal;
+}
+
+uint8 HardwareUsb::available(void) {
+  return usbBytesAvailable();
+}
+
+void HardwareUsb::flush(void) {
+  uint8 totalBytes = usbBytesAvailable();
+  uint8 recvBuf[totalBytes];
+  usbReceiveBytes(recvBuf,totalBytes);
+}
+
+void HardwareUsb::write(unsigned char ch) {
+  while (usbSendBytes(&ch, 1) == 0);
+}
+
+void HardwareUsb::begin(void) {
+  /* placeholder for usb<->uart linking */
+}
+
+HardwareUsb Usb;
diff --git a/wirish/comm/HardwareUsb.h b/wirish/comm/HardwareUsb.h
new file mode 100644
index 0000000..e2af2e2
--- /dev/null
+++ b/wirish/comm/HardwareUsb.h
@@ -0,0 +1,48 @@
+/* *****************************************************************************
+ * The MIT License
+ *
+ * Copyright (c) 2010 Andrew Meyer.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ * ****************************************************************************/
+
+/**
+ * @brief Wiring like serial api to USB virtual COM. Dummy implmentation wrapping printChar() around usb.h for now. Todo: something better. 
+ */
+
+#ifndef _HARDWAREUSB_H_
+#define _HARDWAREUSB_H_
+
+#include "Print.h"
+#include "usb.h"
+
+class HardwareUsb : public Print {
+ public:
+  HardwareUsb(void);
+  void begin();
+  uint8 available(void);
+  uint8 read(void);
+  void flush(void);
+  virtual void write(unsigned char);
+  using Print::write;
+};
+
+extern HardwareUsb Usb;
+
+#endif //_HARDWAREUSB_H/* *****************************************************************************