[PUSB] The latest fields are now set via constructor

2 files changed, 9 insertions, 9 deletions

diff --git a/cores/arduino/PluggableUSB.h b/cores/arduino/PluggableUSB.h
index c08bc99..0f776c0 100644
--- a/cores/arduino/PluggableUSB.h
+++ b/cores/arduino/PluggableUSB.h
@@ -27,10 +27,9 @@
 
 class PUSBListNode {
 public:
-  PUSBListNode() { }
-  int8_t numEndpoints;
-  int8_t numInterfaces;
-  uint8_t *endpointType;
+  PUSBListNode(int8_t numEps, int8_t numIfs, uint8_t *epType) :
+    numEndpoints(numEps), numInterfaces(numIfs), endpointType(epType)
+  { }
 
   inline uint8_t interface() const { return pluggedInterface; }
   inline int8_t endpoint()   const { return pluggedEndpoint; }
@@ -43,6 +42,10 @@ protected:
   uint8_t pluggedInterface;
   int8_t pluggedEndpoint;
 
+  const int8_t numEndpoints;
+  const int8_t numInterfaces;
+  const uint8_t *endpointType;
+
 public:
   PUSBListNode *next = NULL;
 
diff --git a/libraries/HID/HID.cpp b/libraries/HID/HID.cpp
index 5685957..d358f45 100644
--- a/libraries/HID/HID.cpp
+++ b/libraries/HID/HID.cpp
@@ -128,12 +128,9 @@ bool HID_::setup(USBSetup& setup, uint8_t i)
 	}
 }
 
-HID_::HID_(void)
+HID_::HID_(void) : PUSBListNode(1, 1, epType)
 {
-	numEndpoints = 1;
-	numInterfaces = 1;
-	endpointType = epType;
-
+	// XXX: Shall this be done in PUSBListNode(...) constructor?
 	PluggableUSB.plug(this);
 }