noisymime
/
ArduinoCore-avr
mirror of https://github.com/noisymime/ArduinoCore-avr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

implement PUSB modules as linked list

This commit is contained in:
Martino Facchin 2015-06-08 12:31:24 +02:00 committed by Cristian Maglie
parent 353ef39c23
commit b38d7f07f0
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
cores/arduino/PluggableUSB.cpp
View File

@ -28,16 +28,27 @@
static u8 lastIf = CDC_ACM_INTERFACE + CDC_INTERFACE_COUNT;
static u8 lastEp = CDC_FIRST_ENDPOINT + CDC_ENPOINT_COUNT;
class PUSBListNode {
public:
PUSBListNode *next = NULL;
PUSBCallbacks cb;
};
extern u8 _initEndpoints[];
PUSBCallbacks cbs[MAX_MODULES];
u8 modules_count = 0;
//PUSBCallbacks cbs[MAX_MODULES];
static u8 modules_count = 0;
static PUSBListNode* rootNode = NULL;
static PUSBListNode* lastNode = NULL;
int8_t PUSB_GetInterface(u8* interfaceNum)
{
int8_t ret = 0;
PUSBListNode* node = rootNode;
for (u8 i=0; i<modules_count; i++) {
ret = cbs[i].getInterface(interfaceNum);
ret = node->cb.getInterface(interfaceNum);
node = node->next;
}
return ret;
}
@ -45,8 +56,10 @@ int8_t PUSB_GetInterface(u8* interfaceNum)
int8_t PUSB_GetDescriptor(int8_t t)
{
int8_t ret = 0;
PUSBListNode* node = rootNode;
for (u8 i=0; i<modules_count && ret == 0; i++) {
ret = cbs[i].getDescriptor(t);
ret = node->cb.getDescriptor(t);
node = node->next;
}
return ret;
}
@ -54,8 +67,10 @@ int8_t PUSB_GetDescriptor(int8_t t)
bool PUSB_Setup(Setup& setup, u8 j)
{
bool ret = false;
PUSBListNode* node = rootNode;
for (u8 i=0; i<modules_count && ret == false; i++) {
ret = cbs[i].setup(setup, j);
ret = node->cb.setup(setup, j);
node = node->next;
}
return ret;
}
@ -65,7 +80,19 @@ int8_t PUSB_AddFunction(PUSBCallbacks *cb, u8* interface)
if (modules_count >= MAX_MODULES) {
return 0;
}
cbs[modules_count] = *cb;
PUSBListNode *node = new PUSBListNode;
node->cb.setup = cb->setup;
node->cb.getInterface = cb->getInterface;
node->cb.getDescriptor = cb->getDescriptor;
if (modules_count == 0) {
rootNode = node;
lastNode = node;
} else {
lastNode->next = node;
}
*interface = lastIf;
lastIf++;

2
cores/arduino/PluggableUSB.h
View File

@ -31,7 +31,7 @@ typedef struct
int8_t (*getInterface)(u8* interfaceNum);
int8_t (*getDescriptor)(int8_t t);
int8_t numEndpoints;
u8 endpointType[6];
u8 endpointType[];
} PUSBCallbacks;
typedef struct