UARTConnect enumeration working!

[kiibohd-controller.git] / Output / pjrcUSB / arm / usb_mem.c

diff --git a/Output/pjrcUSB/arm/usb_mem.c b/Output/pjrcUSB/arm/usb_mem.c
index 9793e5692ad2685086384904280539f6ec5b0abb..a26b18414474eb30f456583fc9b4e13fd98718e1 100644 (file)
--- a/Output/pjrcUSB/arm/usb_mem.c
+++ b/Output/pjrcUSB/arm/usb_mem.c
@@ -1,6 +1,7 @@
 /* Teensyduino Core Library
  * http://www.pjrc.com/teensy/
  * Copyright (c) 2013 PJRC.COM, LLC.
+ * Modifications by Jacob Alexander (2013-2014)
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -10,10 +11,10 @@
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
  *
- * 1. The above copyright notice and this permission notice shall be 
+ * 1. The above copyright notice and this permission notice shall be
  * included in all copies or substantial portions of the Software.
  *
- * 2. If the Software is incorporated into a build system that allows 
+ * 2. If the Software is incorporated into a build system that allows
  * selection among a list of target devices, then similar target
  * devices manufactured by PJRC.COM must be included in the list of
  * target devices and selectable in the same manner.
@@ -28,71 +29,78 @@
  * SOFTWARE.
  */
 
+// ----- Includes -----
+
+// Project Includes
 #include <Lib/OutputLib.h>
+
+// Local Includes
 #include "usb_dev.h"
 #include "usb_mem.h"
 
-#define NUM_BUF 30
+
+
+// ----- Variables -----
 
 __attribute__ ((section(".usbbuffers"), used))
-//static unsigned char usb_buffer_memory[NUM_BUF * sizeof(usb_packet_t)];
-unsigned char usb_buffer_memory[NUM_BUF * sizeof(usb_packet_t)];
+unsigned char usb_buffer_memory[ NUM_USB_BUFFERS * sizeof(usb_packet_t) ];
 
 static uint32_t usb_buffer_available = 0xFFFFFFFF;
 
+
+
+// ----- Externs -----
+
+extern void usb_rx_memory( usb_packet_t *packet );
+
+// for the receive endpoints to request memory
+extern uint8_t usb_rx_memory_needed;
+
+
+
+// ----- Functions -----
+
 // use bitmask and CLZ instruction to implement fast free list
 // http://www.archivum.info/gnu.gcc.help/2006-08/00148/Re-GCC-Inline-Assembly.html
 // http://gcc.gnu.org/ml/gcc/2012-06/msg00015.html
 // __builtin_clz()
 
-usb_packet_t * usb_malloc(void)
+usb_packet_t *usb_malloc()
 {
        unsigned int n, avail;
        uint8_t *p;
 
        __disable_irq();
        avail = usb_buffer_available;
-       n = __builtin_clz(avail); // clz = count leading zeros
-       if (n >= NUM_BUF) {
+       n = __builtin_clz( avail ); // clz = count leading zeros
+       if ( n >= NUM_USB_BUFFERS )
+       {
                __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");
+       p = usb_buffer_memory + ( n * sizeof(usb_packet_t) );
        *(uint32_t *)p = 0;
        *(uint32_t *)(p + 4) = 0;
        return (usb_packet_t *)p;
 }
 
-// for the receive endpoints to request memory
-extern uint8_t usb_rx_memory_needed;
-extern void usb_rx_memory(usb_packet_t *packet);
 
-void usb_free(usb_packet_t *p)
+void usb_free( usb_packet_t *p )
 {
        unsigned int n, mask;
 
-       //serial_print("free:");
-       n = ((uint8_t *)p - usb_buffer_memory) / sizeof(usb_packet_t);
-       if (n >= NUM_BUF) return;
-       //serial_phex(n);
-       //serial_print("\n");
+       n = ( (uint8_t *)p - usb_buffer_memory ) / sizeof(usb_packet_t);
+       if ( n >= NUM_USB_BUFFERS )
+               return;
 
        // 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);
+       if ( usb_rx_memory_needed && usb_configuration )
+       {
+               usb_rx_memory( p );
                return;
        }
 
@@ -100,9 +108,5 @@ void usb_free(usb_packet_t *p)
        __disable_irq();
        usb_buffer_available |= mask;
        __enable_irq();
-
-       //serial_print("free:");
-       //serial_phex32((int)p);
-       //serial_print("\n");
 }