aboutsummaryrefslogtreecommitdiffstats
path: root/core/usb/usb.h
diff options
context:
space:
mode:
authorAJM <poslathian@poslathian.(none)>2010-04-22 23:27:09 -0400
committerbnewbold <bnewbold@robocracy.org>2010-05-20 22:09:15 -0400
commita86ec7c81d7ad2037e900899a0b32c5592cae7c0 (patch)
tree391e3abb0ce95ec6901399bdce628aadf8a0c339 /core/usb/usb.h
parenta082defb795cc4495139c8b05de4fd48bd66dacd (diff)
downloadlibrambutan-a86ec7c81d7ad2037e900899a0b32c5592cae7c0.tar.gz
librambutan-a86ec7c81d7ad2037e900899a0b32c5592cae7c0.zip
c++ ified all of the usb_core files, added the auto-reset feature to the virtual com port, got the descriptors in functional although not pretty order that can be fixed using the attribute packing
Diffstat (limited to 'core/usb/usb.h')
-rw-r--r--core/usb/usb.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/core/usb/usb.h b/core/usb/usb.h
index b2bf23c..087ca72 100644
--- a/core/usb/usb.h
+++ b/core/usb/usb.h
@@ -3,9 +3,9 @@
#ifndef __USB_H_
#define __USB_H_
-#include "usb_config.h"
-#include "usb_callbacks.h"
+
#include "usb_lib.h"
+#include "libmaple.h"
#ifdef __cplusplus
extern "C" {
@@ -33,6 +33,8 @@ typedef enum
CONFIGURED
} DEVICE_STATE;
+ extern volatile uint32 bDeviceState;
+
void setupUSB(void);
void usbSuspend(void);
void usbResumeInit(void);
@@ -47,7 +49,10 @@ typedef enum
/* overloaded ISR routine, this is the main usb ISR */
void usb_lpIRQHandler(void);
+ void usbSendHello(void);
+
#ifdef __cplusplus
} // extern "C"
#endif
+
#endif //_USB_H