Fix up all the newly imported Teensy code
Change-Id: Id051083a16336617add1d5f16fc7b7d78a30a5fe
diff --git a/motors/usb/usb_mem.c b/motors/usb/usb_mem.c
index 41b4596..e21e5a9 100644
--- a/motors/usb/usb_mem.c
+++ b/motors/usb/usb_mem.c
@@ -28,12 +28,12 @@
* SOFTWARE.
*/
-#include "usb_dev.h"
+#include "motors/usb/usb_dev.h"
#if F_CPU >= 20000000 && defined(NUM_ENDPOINTS)
-#include "kinetis.h"
+#include "motors/core/kinetis.h"
//#include "HardwareSerial.h"
-#include "usb_mem.h"
+#include "motors/usb/usb_mem.h"
__attribute__ ((section(".usbbuffers"), used))
unsigned char usb_buffer_memory[NUM_USB_BUFFERS * sizeof(usb_packet_t)];
@@ -57,16 +57,11 @@
__enable_irq();
return NULL;
}
- //serial_print("malloc:");
- //serial_phex(n);
- //serial_print("\n");
usb_buffer_available = avail & ~(0x80000000 >> n);
__enable_irq();
p = usb_buffer_memory + (n * sizeof(usb_packet_t));
- //serial_print("malloc:");
- //serial_phex32((int)p);
- //serial_print("\n");
+
*(uint32_t *)p = 0;
*(uint32_t *)(p + 4) = 0;
return (usb_packet_t *)p;
@@ -74,24 +69,18 @@
// for the receive endpoints to request memory
extern uint8_t usb_rx_memory_needed;
-extern void usb_rx_memory(usb_packet_t *packet);
+extern void usb_rx_memory(const usb_packet_t *packet);
-void usb_free(usb_packet_t *p)
+void usb_free(const usb_packet_t *p)
{
unsigned int n, mask;
- //serial_print("free:");
- n = ((uint8_t *)p - usb_buffer_memory) / sizeof(usb_packet_t);
+ n = ((const uint8_t *)p - usb_buffer_memory) / sizeof(usb_packet_t);
if (n >= NUM_USB_BUFFERS) return;
- //serial_phex(n);
- //serial_print("\n");
// if any endpoints are starving for memory to receive
// packets, give this memory to them immediately!
if (usb_rx_memory_needed && usb_configuration) {
- //serial_print("give to rx:");
- //serial_phex32((int)p);
- //serial_print("\n");
usb_rx_memory(p);
return;
}
@@ -100,10 +89,6 @@
__disable_irq();
usb_buffer_available |= mask;
__enable_irq();
-
- //serial_print("free:");
- //serial_phex32((int)p);
- //serial_print("\n");
}
#endif // F_CPU >= 20 MHz && defined(NUM_ENDPOINTS)