altos: Allow USB drivers to skip CDC-ACM -specific descriptors

[fw/altos] / src / stmf0 / ao_usb_stm.c

diff --git a/src/stmf0/ao_usb_stm.c b/src/stmf0/ao_usb_stm.c
index b8146c216f1a2b0538e964dd8bc24862895d984c..b0f4c516ab151754bff7a3c8437f3bbd250e56e1 100644 (file)
--- a/src/stmf0/ao_usb_stm.c
+++ b/src/stmf0/ao_usb_stm.c
@@ -18,8 +18,10 @@
 #include "ao.h"
 #include "ao_usb.h"
 #include "ao_product.h"
+#include "ao_power.h"
 
 #define USB_DEBUG      0
+#define USB_STATUS     0
 #define USB_DEBUG_DATA 0
 #define USB_ECHO       0
 
@@ -27,6 +29,10 @@
 #error "must define AO_PA11_PA12_RMP"
 #endif
 
+#ifndef AO_POWER_MANAGEMENT
+#define AO_POWER_MANAGEMENT    0
+#endif
+
 #ifndef USE_USB_STDIO
 #define USE_USB_STDIO  1
 #endif
@@ -129,10 +135,9 @@ static uint8_t     ao_usb_out_avail;
 uint8_t                ao_usb_running;
 static uint8_t ao_usb_configuration;
 
-#define AO_USB_EP0_GOT_RESET   1
-#define AO_USB_EP0_GOT_SETUP   2
-#define AO_USB_EP0_GOT_RX_DATA 4
-#define AO_USB_EP0_GOT_TX_ACK  8
+#define AO_USB_EP0_GOT_SETUP   1
+#define AO_USB_EP0_GOT_RX_DATA 2
+#define AO_USB_EP0_GOT_TX_ACK  4
 
 static uint8_t ao_usb_ep0_receive;
 static uint8_t ao_usb_address;
@@ -396,6 +401,7 @@ ao_usb_set_configuration(void)
 {
        debug ("ao_usb_set_configuration\n");
 
+#if AO_USB_HAS_INT
        /* Set up the INT end point */
        ao_usb_bdt[AO_USB_INT_EPR].single.addr_tx = ao_usb_int_tx_offset;
        ao_usb_bdt[AO_USB_INT_EPR].single.count_tx = 0;
@@ -405,7 +411,9 @@ ao_usb_set_configuration(void)
                       STM_USB_EPR_EP_TYPE_INTERRUPT,
                       STM_USB_EPR_STAT_RX_DISABLED,
                       STM_USB_EPR_STAT_TX_NAK);
+#endif
 
+#if AO_USB_HAS_OUT
        /* Set up the OUT end point */
        ao_usb_bdt[AO_USB_OUT_EPR].single.addr_rx = ao_usb_out_rx_offset;
        ao_usb_bdt[AO_USB_OUT_EPR].single.count_rx = ((1 << STM_USB_BDT_COUNT_RX_BL_SIZE) |
@@ -416,7 +424,9 @@ ao_usb_set_configuration(void)
                       STM_USB_EPR_EP_TYPE_BULK,
                       STM_USB_EPR_STAT_RX_VALID,
                       STM_USB_EPR_STAT_TX_DISABLED);
+#endif
 
+#if AO_USB_HAS_IN
        /* Set up the IN end point */
        ao_usb_bdt[AO_USB_IN_EPR].single.addr_tx = ao_usb_in_tx_offset;
        ao_usb_bdt[AO_USB_IN_EPR].single.count_tx = 0;
@@ -426,6 +436,7 @@ ao_usb_set_configuration(void)
                       STM_USB_EPR_EP_TYPE_BULK,
                       STM_USB_EPR_STAT_RX_DISABLED,
                       STM_USB_EPR_STAT_TX_NAK);
+#endif
 
        ao_usb_running = 1;
 #if AO_USB_DIRECTIO
@@ -686,11 +697,6 @@ static void
 ao_usb_ep0_handle(uint8_t receive)
 {
        ao_usb_ep0_receive = 0;
-       if (receive & AO_USB_EP0_GOT_RESET) {
-               debug ("\treset\n");
-               ao_usb_set_ep0();
-               return;
-       }
        if (receive & AO_USB_EP0_GOT_SETUP) {
                debug ("\tsetup\n");
                ao_usb_ep0_setup();
@@ -721,6 +727,25 @@ ao_usb_ep0_handle(uint8_t receive)
        }
 }
 
+#if AO_POWER_MANAGEMENT
+void
+ao_usb_suspend(void)
+{
+       stm_usb.cntr |= (1 << STM_USB_CNTR_FSUSP);
+       ao_power_suspend();
+       stm_usb.cntr |= (1 << STM_USB_CNTR_LP_MODE);
+       ao_clock_suspend();
+}
+
+void
+ao_usb_wakeup(void)
+{
+       ao_clock_resume();
+       stm_usb.cntr &= ~(1 << STM_USB_CNTR_FSUSP);
+       ao_power_resume();
+}
+#endif
+
 void
 stm_usb_isr(void)
 {
@@ -784,10 +809,19 @@ stm_usb_isr(void)
 
        if (istr & (1 << STM_USB_ISTR_RESET)) {
                ++reset_count;
-               ao_usb_ep0_receive |= AO_USB_EP0_GOT_RESET;
-               ao_usb_ep0_handle(ao_usb_ep0_receive);
+               debug ("\treset\n");
+               ao_usb_set_ep0();
        }
-
+#if AO_POWER_MANAGEMENT
+       if (istr & (1 << STM_USB_ISTR_SUSP)) {
+               debug ("\tsuspend\n");
+               ao_usb_suspend();
+       }
+       if (istr & (1 << STM_USB_ISTR_WKUP)) {
+               debug ("\twakeup\n");
+               ao_usb_wakeup();
+       }
+#endif
 }
 
 /* Queue the current IN buffer for transmission */
@@ -1050,8 +1084,8 @@ ao_usb_enable(void)
        stm_usb.cntr = ((1 << STM_USB_CNTR_CTRM) |
                        (0 << STM_USB_CNTR_PMAOVRM) |
                        (0 << STM_USB_CNTR_ERRM) |
-                       (0 << STM_USB_CNTR_WKUPM) |
-                       (0 << STM_USB_CNTR_SUSPM) |
+                       (AO_POWER_MANAGEMENT << STM_USB_CNTR_WKUPM) |
+                       (AO_POWER_MANAGEMENT << STM_USB_CNTR_SUSPM) |
                        (1 << STM_USB_CNTR_RESETM) |
                        (0 << STM_USB_CNTR_SOFM) |
                        (0 << STM_USB_CNTR_ESOFM) |
@@ -1086,7 +1120,7 @@ ao_usb_echo(void)
 }
 #endif
 
-#if USB_DEBUG
+#if USB_STATUS
 static void
 ao_usb_irq(void)
 {
@@ -1119,7 +1153,7 @@ ao_usb_init(void)
 #if USB_ECHO
        ao_add_task(&ao_usb_echo_task, ao_usb_echo, "usb echo");
 #endif
-#if USB_DEBUG
+#if USB_STATUS
        ao_cmd_register(&ao_usb_cmds[0]);
 #endif
 #if !USB_ECHO