File tree 1 file changed +11
-15
lines changed
1 file changed +11
-15
lines changed Original file line number Diff line number Diff line change 22
22
#include " USBCore.h"
23
23
#include " PluggableUSB.h"
24
24
25
- #if defined(USBCON)
26
- #ifdef PLUGGABLE_USB_ENABLED
25
+ #if defined(USBCON) && defined(PLUGGABLE_USB_ENABLED)
27
26
28
27
extern uint32_t EndPoints[];
29
28
@@ -54,15 +53,15 @@ int PluggableUSB_::getDescriptor(USBSetup& setup)
54
53
55
54
uint8_t PluggableUSB_::getShortName (char *iSerialNum)
56
55
{
57
- PluggableUSBModule* node;
58
- uint8_t size = 0 ;
59
- for (node = rootNode; node; node = node->next ) {
60
- uint8_t len = node->getShortName (iSerialNum);
61
- iSerialNum += len;
62
- size += len;
63
- }
64
- *iSerialNum = 0 ;
65
- return size;
56
+ PluggableUSBModule* node;
57
+ uint8_t size = 0 ;
58
+ for (node = rootNode; node; node = node->next ) {
59
+ uint8_t len = node->getShortName (iSerialNum);
60
+ iSerialNum += len;
61
+ size += len;
62
+ }
63
+ *iSerialNum = 0 ;
64
+ return size;
66
65
}
67
66
68
67
bool PluggableUSB_::setup (USBSetup& setup)
@@ -117,12 +116,9 @@ PluggableUSB_& PluggableUSB()
117
116
return obj;
118
117
}
119
118
120
- PluggableUSB_::PluggableUSB_ () : lastIf(0 ),
121
- lastEp(1 ),
122
- rootNode(NULL )
119
+ PluggableUSB_::PluggableUSB_ () : lastIf(0 ), lastEp(1 ), rootNode(NULL )
123
120
{
124
121
// Empty
125
122
}
126
123
127
- #endif
128
124
#endif
You can’t perform that action at this time.
0 commit comments