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

[PUSB] Renamed PUSBListNode to PluggableUSBModule

This commit is contained in:
Cristian Maglie 2015-10-12 12:14:07 +02:00
parent f720c8cacf
commit 2e755384f5
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cores/arduino/PluggableUSB.cpp
View File

@ -28,7 +28,7 @@ extern uint8_t _initEndpoints[];
int PluggableUSB_::getInterface(uint8_t* interfaceCount) int PluggableUSB_::getInterface(uint8_t* interfaceCount)
{ {
int sent = 0; int sent = 0;
PUSBListNode* node; PluggableUSBModule* node;
for (node = rootNode; node; node = node->next) { for (node = rootNode; node; node = node->next) {
int res = node->getInterface(interfaceCount); int res = node->getInterface(interfaceCount);
if (res < 0) if (res < 0)
@ -40,7 +40,7 @@ int PluggableUSB_::getInterface(uint8_t* interfaceCount)
int PluggableUSB_::getDescriptor(USBSetup& setup) int PluggableUSB_::getDescriptor(USBSetup& setup)
{ {
PUSBListNode* node; PluggableUSBModule* node;
for (node = rootNode; node; node = node->next) { for (node = rootNode; node; node = node->next) {
int ret = node->getDescriptor(setup); int ret = node->getDescriptor(setup);
// ret!=0 -> request has been processed // ret!=0 -> request has been processed
@ -52,7 +52,7 @@ int PluggableUSB_::getDescriptor(USBSetup& setup)
bool PluggableUSB_::setup(USBSetup& setup) bool PluggableUSB_::setup(USBSetup& setup)
{ {
PUSBListNode* node; PluggableUSBModule* node;
for (node = rootNode; node; node = node->next) { for (node = rootNode; node; node = node->next) {
if (node->setup(setup)) { if (node->setup(setup)) {
return true; return true;
@ -61,7 +61,7 @@ bool PluggableUSB_::setup(USBSetup& setup)
return false; return false;
} }
bool PluggableUSB_::plug(PUSBListNode *node) bool PluggableUSB_::plug(PluggableUSBModule *node)
{ {
if ((lastEp + node->numEndpoints) > USB_ENDPOINTS) { if ((lastEp + node->numEndpoints) > USB_ENDPOINTS) {
return false; return false;
@ -70,7 +70,7 @@ bool PluggableUSB_::plug(PUSBListNode *node)
if (!rootNode) { if (!rootNode) {
rootNode = node; rootNode = node;
} else { } else {
PUSBListNode *current = rootNode; PluggableUSBModule *current = rootNode;
while (current->next) { while (current->next) {
current = current->next; current = current->next;
} }

10
cores/arduino/PluggableUSB.h
View File

@ -25,9 +25,9 @@
#if defined(USBCON) #if defined(USBCON)
class PUSBListNode { class PluggableUSBModule {
public: public:
PUSBListNode(uint8_t numEps, uint8_t numIfs, uint8_t *epType) : PluggableUSBModule(uint8_t numEps, uint8_t numIfs, uint8_t *epType) :
numEndpoints(numEps), numInterfaces(numIfs), endpointType(epType) numEndpoints(numEps), numInterfaces(numIfs), endpointType(epType)
{ } { }
@ -43,7 +43,7 @@ protected:
const uint8_t numInterfaces; const uint8_t numInterfaces;
const uint8_t *endpointType; const uint8_t *endpointType;
PUSBListNode *next = NULL; PluggableUSBModule *next = NULL;
friend class PluggableUSB_; friend class PluggableUSB_;
}; };
@ -51,7 +51,7 @@ protected:
class PluggableUSB_ { class PluggableUSB_ {
public: public:
PluggableUSB_(); PluggableUSB_();
bool plug(PUSBListNode *node); bool plug(PluggableUSBModule *node);
int getInterface(uint8_t* interfaceCount); int getInterface(uint8_t* interfaceCount);
int getDescriptor(USBSetup& setup); int getDescriptor(USBSetup& setup);
bool setup(USBSetup& setup); bool setup(USBSetup& setup);
@ -59,7 +59,7 @@ public:
private: private:
uint8_t lastIf; uint8_t lastIf;
uint8_t lastEp; uint8_t lastEp;
PUSBListNode* rootNode; PluggableUSBModule* rootNode;
}; };
// Replacement for global singleton. // Replacement for global singleton.

2
libraries/HID/HID.cpp
View File

@ -128,7 +128,7 @@ bool HID_::setup(USBSetup& setup)
return false; return false;
} }
HID_::HID_(void) : PUSBListNode(1, 1, epType), HID_::HID_(void) : PluggableUSBModule(1, 1, epType),
rootNode(NULL), descriptorSize(0), rootNode(NULL), descriptorSize(0),
protocol(1), idle(1) protocol(1), idle(1)
{ {

4
libraries/HID/HID.h
View File

@ -83,7 +83,7 @@ public:
const uint16_t length; const uint16_t length;
}; };
class HID_ : public PUSBListNode class HID_ : public PluggableUSBModule
{ {
public: public:
HID_(void); HID_(void);
@ -92,7 +92,7 @@ public:
void AppendDescriptor(HIDDescriptorListNode* node); void AppendDescriptor(HIDDescriptorListNode* node);
protected: protected:
// Implementation of the PUSBListNode // Implementation of the PluggableUSBModule
int getInterface(uint8_t* interfaceCount); int getInterface(uint8_t* interfaceCount);
int getDescriptor(USBSetup& setup); int getDescriptor(USBSetup& setup);
bool setup(USBSetup& setup); bool setup(USBSetup& setup);