eryn/kiibohd-controller
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Finished USB for Teensy 3.1 (Now 3.1 compatible!)

Browse source
This commit is contained in:
Jacob Alexander 2014-02-02 21:12:20 -08:00
parent 3fa9c16c04
commit 8263589e7e
7 changed files with 73 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Output/pjrcUSB/arm/usb_mem.c
View file

@ -32,11 +32,8 @@
#include "usb_dev.h"
#include "usb_mem.h"
#define NUM_BUF 30
__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;
@ -53,7 +50,7 @@ usb_packet_t * usb_malloc(void)
__disable_irq();
avail = usb_buffer_available;
n = __builtin_clz(avail); // clz = count leading zeros
if (n >= NUM_BUF) {
if (n >= NUM_USB_BUFFERS) {
__enable_irq();
return NULL;
}
@ -82,7 +79,7 @@ void usb_free(usb_packet_t *p)
//serial_print("free:");
n = ((uint8_t *)p - usb_buffer_memory) / sizeof(usb_packet_t);
if (n >= NUM_BUF) return;
if (n >= NUM_USB_BUFFERS) return;
//serial_phex(n);
//serial_print("\n");