4 files changed, 29 insertions, 0 deletions
diff --git a/libmaple/include/libmaple/exti.h b/libmaple/include/libmaple/exti.h
index 3800b4a..1d201ac 100644
--- a/libmaple/include/libmaple/exti.h
+++ b/libmaple/include/libmaple/exti.h
@@ -115,6 +115,11 @@ void exti_attach_interrupt(exti_num num,
                            exti_cfg port,
                            voidFuncPtr handler,
                            exti_trigger_mode mode);
+void exti_attach_callback(exti_num num,
+                          exti_cfg port,
+                          voidArgumentFuncPtr handler,
+                          void *arg,
+                          exti_trigger_mode mode);
 void exti_detach_interrupt(exti_num num);
 
 /**
diff --git a/libmaple/include/libmaple/libmaple_types.h b/libmaple/include/libmaple/libmaple_types.h
index 9e1fbb3..60dd2ff 100644
--- a/libmaple/include/libmaple/libmaple_types.h
+++ b/libmaple/include/libmaple/libmaple_types.h
@@ -48,6 +48,7 @@ typedef int int32;
 typedef long long int64;
 
 typedef void (*voidFuncPtr)(void);
+typedef void (*voidArgumentFuncPtr)(void *);
 
 #define __io volatile
 #define __attr_flash __attribute__((section (".USER_FLASH")))
diff --git a/libmaple/include/libmaple/usb.h b/libmaple/include/libmaple/usb.h
index 2be5971..ea24030 100644
--- a/libmaple/include/libmaple/usb.h
+++ b/libmaple/include/libmaple/usb.h
@@ -151,6 +151,7 @@ typedef struct usblib_dev {
     void (**ep_int_in)(void);
     void (**ep_int_out)(void);
     usb_dev_state state;
+    usb_dev_state prevState;
     rcc_clk_id clk_id;
 } usblib_dev;
 
diff --git a/libmaple/include/libmaple/usb_cdcacm.h b/libmaple/include/libmaple/usb_cdcacm.h
index 8b3c1fe..5fe832c 100644
--- a/libmaple/include/libmaple/usb_cdcacm.h
+++ b/libmaple/include/libmaple/usb_cdcacm.h
@@ -72,6 +72,27 @@ extern "C" {
 #define USB_INTERFACE_SUBCLASS_CDC_ACM    0x02
 #define USB_INTERFACE_CLASS_DIC           0x0A
 
+/*
+ * Endpoint configuration
+ */
+
+#define USB_CDCACM_CTRL_ENDP            0
+#define USB_CDCACM_CTRL_RX_ADDR         0x40
+#define USB_CDCACM_CTRL_TX_ADDR         0x80
+#define USB_CDCACM_CTRL_EPSIZE          0x40
+
+#define USB_CDCACM_TX_ENDP              1
+#define USB_CDCACM_TX_ADDR              0xC0
+#define USB_CDCACM_TX_EPSIZE            0x40
+
+#define USB_CDCACM_MANAGEMENT_ENDP      2
+#define USB_CDCACM_MANAGEMENT_ADDR      0x100
+#define USB_CDCACM_MANAGEMENT_EPSIZE    0x40
+
+#define USB_CDCACM_RX_ENDP              3
+#define USB_CDCACM_RX_ADDR              0x110
+#define USB_CDCACM_RX_EPSIZE            0x40
+
 #ifndef __cplusplus
 #define USB_CDCACM_DECLARE_DEV_DESC(vid, pid)                           \
   {                                                                     \
@@ -106,6 +127,7 @@ uint32 usb_cdcacm_peek(uint8* buf, uint32 len);
 
 uint32 usb_cdcacm_data_available(void); /* in RX buffer */
 uint16 usb_cdcacm_get_pending(void);
+uint8 usb_cdcacm_is_transmitting(void);
 
 uint8 usb_cdcacm_get_dtr(void);
 uint8 usb_cdcacm_get_rts(void);