diff options
author | Cristian Maglie <c.maglie@arduino.cc> | 2015-10-07 13:21:21 +0200 |
---|---|---|
committer | Cristian Maglie <c.maglie@arduino.cc> | 2015-10-07 13:21:21 +0200 |
commit | 663c55706b5b79109dfe17d440cba4de95cbdc25 (patch) | |
tree | 8f26b79d28e84969a6534c61cda2d33b967258ed | |
parent | eb084e235d8b5b50d2a5b2f926bde6aea75e92d9 (diff) |
[PUSB] renamed some parameters
-rw-r--r-- | cores/arduino/PluggableUSB.cpp | 8 | ||||
-rw-r--r-- | cores/arduino/PluggableUSB.h | 10 | ||||
-rw-r--r-- | libraries/HID/HID.cpp | 4 | ||||
-rw-r--r-- | libraries/HID/HID.h | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/cores/arduino/PluggableUSB.cpp b/cores/arduino/PluggableUSB.cpp index 7125775..95d4079 100644 --- a/cores/arduino/PluggableUSB.cpp +++ b/cores/arduino/PluggableUSB.cpp @@ -25,12 +25,12 @@ extern uint8_t _initEndpoints[]; -int PluggableUSB_::getInterface(uint8_t* interfaceNum) +int PluggableUSB_::getInterface(uint8_t* interfaceCount) { int sent = 0; PUSBListNode* node; for (node = rootNode; node; node = node->next) { - int res = node->getInterface(interfaceNum); + int res = node->getInterface(interfaceCount); if (res < 0) return -1; sent += res; @@ -50,11 +50,11 @@ int PluggableUSB_::getDescriptor(int8_t type) return 0; } -bool PluggableUSB_::setup(USBSetup& setup, uint8_t j) +bool PluggableUSB_::setup(USBSetup& setup, uint8_t interfaceNum) { PUSBListNode* node; for (node = rootNode; node; node = node->next) { - if (node->setup(setup, j)) { + if (node->setup(setup, interfaceNum)) { return true; } } diff --git a/cores/arduino/PluggableUSB.h b/cores/arduino/PluggableUSB.h index 40a898e..433e23e 100644 --- a/cores/arduino/PluggableUSB.h +++ b/cores/arduino/PluggableUSB.h @@ -35,8 +35,8 @@ public: inline int8_t endpoint() const { return pluggedEndpoint; } protected: - virtual bool setup(USBSetup& setup, uint8_t i) = 0; - virtual int getInterface(uint8_t* interfaceNum) = 0; + virtual bool setup(USBSetup& setup, uint8_t interfaceNum) = 0; + virtual int getInterface(uint8_t* interfaceCount) = 0; virtual int getDescriptor(int8_t t) = 0; uint8_t pluggedInterface; @@ -55,9 +55,9 @@ class PluggableUSB_ { public: PluggableUSB_(); bool plug(PUSBListNode *node); - int getInterface(uint8_t* interfaceNum); - int getDescriptor(int8_t t); - bool setup(USBSetup& setup, uint8_t i); + int getInterface(uint8_t* interfaceCount); + int getDescriptor(int8_t type); + bool setup(USBSetup& setup, uint8_t interfaceNum); private: uint8_t lastIf; diff --git a/libraries/HID/HID.cpp b/libraries/HID/HID.cpp index ff8e67b..b6b9cea 100644 --- a/libraries/HID/HID.cpp +++ b/libraries/HID/HID.cpp @@ -27,9 +27,9 @@ HID_& HID() return obj; } -int HID_::getInterface(uint8_t* interfaceNum) +int HID_::getInterface(uint8_t* interfaceCount) { - *interfaceNum += 1; // uses 1 + *interfaceCount += 1; // uses 1 HIDDescriptor hidInterface = { D_INTERFACE(interface(), 1, 3, 0, 0), D_HIDREPORT(descriptorSize), diff --git a/libraries/HID/HID.h b/libraries/HID/HID.h index a7f5c68..e54e45e 100644 --- a/libraries/HID/HID.h +++ b/libraries/HID/HID.h @@ -79,7 +79,7 @@ public: protected: // Implementation of the PUSBListNode - int getInterface(uint8_t* interfaceNum); + int getInterface(uint8_t* interfaceCount); int getDescriptor(int8_t type); bool setup(USBSetup& setup, uint8_t interfaceNum); |