altos/stmf0: Remove packet counters from non-debug build

[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 a67fc868f63db8e5c557a33ef0fa1e1f23686e3b..0f395123760e8e7b5df4542e06ba3e9088f07dfc 100644 (file)
--- a/src/stmf0/ao_usb_stm.c
+++ b/src/stmf0/ao_usb_stm.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -83,7 +84,9 @@ static uint8_t        ao_usb_ep0_out_len;
 /* Buffer description tables */
 static union stm_usb_bdt       *ao_usb_bdt;
 /* USB address of end of allocated storage */
+#if AO_USB_DIRECTIO
 static uint16_t        ao_usb_sram_addr;
+#endif
 
 /* Pointer to ep0 tx/rx buffers in USB memory */
 static uint16_t        *ao_usb_ep0_tx_buffer;
@@ -182,7 +185,7 @@ static inline uint32_t set_toggle(uint32_t  current_value,
 
 static inline uint16_t *ao_usb_packet_buffer_addr(uint16_t sram_addr)
 {
-       return (uint16_t *) (stm_usb_sram + sram_addr);
+       return (uint16_t *) (void *) (stm_usb_sram + sram_addr);
 }
 
 static inline uint16_t ao_usb_packet_buffer_offset(uint16_t *addr)
@@ -362,39 +365,43 @@ ao_usb_init_ep(uint8_t ep, uint32_t addr, uint32_t type, uint32_t stat_rx, uint3
 static void
 ao_usb_alloc_buffers(void)
 {
-       ao_usb_sram_addr = 0;
+       uint16_t sram_addr = 0;
 
        ao_usb_bdt = (void *) stm_usb_sram;
-       ao_usb_sram_addr += 8 * STM_USB_BDT_SIZE;
+       sram_addr += 8 * STM_USB_BDT_SIZE;
 
-       ao_usb_ep0_tx_buffer = ao_usb_packet_buffer_addr(ao_usb_sram_addr);
-       ao_usb_sram_addr += AO_USB_CONTROL_SIZE;
+       ao_usb_ep0_tx_buffer = ao_usb_packet_buffer_addr(sram_addr);
+       sram_addr += AO_USB_CONTROL_SIZE;
 
-       ao_usb_ep0_rx_buffer = ao_usb_packet_buffer_addr(ao_usb_sram_addr);
-       ao_usb_sram_addr += AO_USB_CONTROL_SIZE;
+       ao_usb_ep0_rx_buffer = ao_usb_packet_buffer_addr(sram_addr);
+       sram_addr += AO_USB_CONTROL_SIZE;
 
 
 #if AO_USB_HAS_INT
-       ao_usb_int_tx_offset = ao_usb_sram_addr;
-       ao_usb_sram_addr += AO_USB_INT_SIZE;
+       ao_usb_int_tx_offset = sram_addr;
+       sram_addr += AO_USB_INT_SIZE;
 #endif
 
 #if AO_USB_HAS_OUT
-       ao_usb_out_rx_buffer = ao_usb_packet_buffer_addr(ao_usb_sram_addr);
-       ao_usb_out_rx_offset = ao_usb_sram_addr;
-       ao_usb_sram_addr += AO_USB_OUT_SIZE;
+       ao_usb_out_rx_buffer = ao_usb_packet_buffer_addr(sram_addr);
+       ao_usb_out_rx_offset = sram_addr;
+       sram_addr += AO_USB_OUT_SIZE;
 #endif
 
 #if AO_USB_HAS_IN
-       ao_usb_in_tx_buffer = ao_usb_packet_buffer_addr(ao_usb_sram_addr);
-       ao_usb_in_tx_offset = ao_usb_sram_addr;
-       ao_usb_sram_addr += AO_USB_IN_SIZE;
+       ao_usb_in_tx_buffer = ao_usb_packet_buffer_addr(sram_addr);
+       ao_usb_in_tx_offset = sram_addr;
+       sram_addr += AO_USB_IN_SIZE;
 #endif
 
 #if AO_USB_HAS_IN2
-       ao_usb_in2_tx_buffer = ao_usb_packet_buffer_addr(ao_usb_sram_addr);
-       ao_usb_in2_tx_offset = ao_usb_sram_addr;
-       ao_usb_sram_addr += AO_USB_IN_SIZE;
+       ao_usb_in2_tx_buffer = ao_usb_packet_buffer_addr(sram_addr);
+       ao_usb_in2_tx_offset = sram_addr;
+       sram_addr += AO_USB_IN_SIZE;
+#endif
+
+#if AO_USB_DIRECTIO
+       ao_usb_sram_addr = sram_addr;
 #endif
 }
 
@@ -524,11 +531,13 @@ ao_usb_set_configuration(void)
 #endif
 }
 
+#if USB_STATUS
 static uint16_t        control_count;
 static uint16_t int_count;
 static uint16_t        in_count;
 static uint16_t        out_count;
 static uint16_t        reset_count;
+#endif
 
 /* The USB memory must be accessed in 16-bit units
  */
@@ -648,7 +657,7 @@ ao_usb_ep0_in_start(uint16_t max)
        ao_usb_ep0_flush();
 }
 
-static struct ao_usb_line_coding ao_usb_line_coding = {115200, 0, 0, 8};
+struct ao_usb_line_coding ao_usb_line_coding = {115200, 0, 0, 8};
 
 #if AO_USB_DEVICE_ID_SERIAL
 static uint8_t ao_usb_serial[2 + 48];
@@ -683,7 +692,7 @@ ao_usb_serial_init(void)
 /* Walk through the list of descriptors and find a match
  */
 static void
-ao_usb_get_descriptor(uint16_t value)
+ao_usb_get_descriptor(uint16_t value, uint16_t length)
 {
        const uint8_t           *descriptor;
        uint8_t         type = value >> 8;
@@ -704,6 +713,8 @@ ao_usb_get_descriptor(uint16_t value)
                                len = sizeof (ao_usb_serial);
                        }
 #endif
+                       if (len > length)
+                               len = length;
                        ao_usb_ep0_in_set(descriptor, len);
                        break;
                }
@@ -748,7 +759,7 @@ ao_usb_ep0_setup(void)
                                break;
                        case AO_USB_REQ_GET_DESCRIPTOR:
                                debug ("get descriptor %d\n", ao_usb_setup.value);
-                               ao_usb_get_descriptor(ao_usb_setup.value);
+                               ao_usb_get_descriptor(ao_usb_setup.value, ao_usb_setup.length);
                                break;
                        case AO_USB_REQ_GET_CONFIGURATION:
                                debug ("get configuration %d\n", ao_usb_configuration);
@@ -886,7 +897,9 @@ stm_usb_isr(void)
 
                switch (ep) {
                case 0:
+#if USB_STATUS
                        ++control_count;
+#endif
                        if (ao_usb_epr_ctr_rx(epr)) {
                                if (ao_usb_epr_setup(epr))
                                        ao_usb_ep0_receive |= AO_USB_EP0_GOT_SETUP;
@@ -898,7 +911,9 @@ stm_usb_isr(void)
                        ao_usb_ep0_handle(ao_usb_ep0_receive);
                        break;
                case AO_USB_OUT_EPR:
+#if USB_STATUS
                        ++out_count;
+#endif
                        if (ao_usb_epr_ctr_rx(epr)) {
                                _rx_dbg1("RX ISR", epr);
                                ao_usb_out_avail = 1;
@@ -908,7 +923,9 @@ stm_usb_isr(void)
                        }
                        break;
                case AO_USB_IN_EPR:
+#if USB_STATUS
                        ++in_count;
+#endif
                        _tx_dbg1("TX ISR", epr);
                        if (ao_usb_epr_ctr_tx(epr)) {
                                ao_usb_in_pending = 0;
@@ -926,7 +943,9 @@ stm_usb_isr(void)
                        break;
 #endif
                case AO_USB_INT_EPR:
+#if USB_STATUS
                        ++int_count;
+#endif
                        if (ao_usb_epr_ctr_tx(epr))
                                _ao_usb_set_stat_tx(AO_USB_INT_EPR, STM_USB_EPR_STAT_TX_NAK);
                        break;
@@ -935,7 +954,9 @@ stm_usb_isr(void)
        }
 
        if (istr & (1 << STM_USB_ISTR_RESET)) {
+#if USB_STATUS
                ++reset_count;
+#endif
                debug ("\treset\n");
                ao_usb_set_ep0();
        }
@@ -1183,14 +1204,6 @@ ao_usb_alloc(void)
        return buffer;
 }
 
-void
-ao_usb_free(uint16_t *addr)
-{
-       uint16_t        offset = ao_usb_packet_buffer_offset(addr);
-       if (offset < ao_usb_sram_addr)
-               ao_usb_sram_addr = offset;
-}
-
 void
 ao_usb_write(uint16_t *buffer, uint16_t len)
 {