1 files changed, 7 insertions, 33 deletions

diff --git a/app/prototypes.h b/app/prototypes.h
index 2e78350..c3e7426 100644
--- a/app/prototypes.h
+++ b/app/prototypes.h
@@ -13,12 +13,13 @@ extern int usb_is_suspended;
 extern int usb_running;
 extern void usb_tick(void);
 extern int usb_wakeup_host(void);
+extern int class_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len, int (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req));
 extern void usb_set_config(usbd_device *usbd_dev, uint16_t wValue);
+extern uint8_t usbd_control_buffer[128];
 extern void usb_init(void);
 extern void usb_run(void);
 /* led.c */
 extern void led_init(void);
-extern void led_blink(void);
 extern void led_tick(void);
 /* ticker.c */
 extern volatile uint32_t ticks;
@@ -29,35 +30,8 @@ extern int timed_out(uint32_t then, unsigned int ms);
 extern void ticker_init(void);
 /* i2c.c */
 /* lcd.c */
-/* adc.c */
-extern int host_has_power;
-extern void adc_tick(void);
-extern void adc_init(void);
-/* state.c */
-extern uint32_t up_time;
-extern uint32_t down_time;
-extern uint32_t usb_up_time;
-extern uint32_t usb_down_time;
-extern int locked;
-extern void state_show(void);
-extern void state_tick(void);
-extern void state_init(void);
-/* key.c */
-extern int have_key;
-extern void key_wipe(void);
-extern void key_set(char *in, size_t len);
-extern void key_send(void);
-extern void key_init(void);
-/* keyboard.c */
-extern const struct usb_endpoint_descriptor keyboard_endpoint;
-extern const struct usb_interface_descriptor keyboard_iface;
-extern void keyboard_get_descriptor(uint8_t **buf, uint16_t *len);
-extern void keyboard_keypress(int m, int k);
-/* crypto.c */
-extern int crypto_control(uint8_t request, uint16_t value, uint16_t index, void *buf, size_t len);
-extern int vendor_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len, int (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req));
-extern void crypto_tick(void);
-extern void crypto_poll(void);
-/* map.c */
-extern void send_ascii(unsigned char a);
-extern void send_str(const char *c);
+/* cdc.c */
+extern const struct usb_interface_descriptor comm_iface[];
+extern const struct usb_interface_descriptor data_iface[];
+extern int cdcacm_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len, int (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req));
+extern void cdcacm_data_rx_cb(usbd_device *usbd_dev, uint8_t ep);