diff options
| author | Martino Facchin <m.facchin@arduino.cc> | 2015-06-08 12:31:24 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@arduino.cc> | 2015-07-16 13:12:14 +0200 |
| commit | b38d7f07f0ee8e5e9bdc912966dcee4ae3a8b3e7 (patch) | |
| tree | e41b3d7525bf0a43fa3ed814a8c8b40ab7f64fca | |
| parent | 353ef39c23c7c9561fc5357d460c2d9cb3c4f320 (diff) | |
implement PUSB modules as linked list
| -rw-r--r-- | cores/arduino/PluggableUSB.cpp | 39 | ||||
| -rw-r--r-- | cores/arduino/PluggableUSB.h | 2 |
2 files changed, 34 insertions, 7 deletions
diff --git a/cores/arduino/PluggableUSB.cpp b/cores/arduino/PluggableUSB.cpp index b5e94ee..15195b0 100644 --- a/cores/arduino/PluggableUSB.cpp +++ b/cores/arduino/PluggableUSB.cpp @@ -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++; diff --git a/cores/arduino/PluggableUSB.h b/cores/arduino/PluggableUSB.h index 877a9b0..e066d37 100644 --- a/cores/arduino/PluggableUSB.h +++ b/cores/arduino/PluggableUSB.h @@ -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 |