Rename two class

NicoHood · obra · commit af973f525c4e · 2023-12-14T14:44:55.000-08:00
arduino/Arduino#3960
diff --git a/plugins/KeyboardioHID/src/MultiReport/AbsoluteMouse.cpp b/plugins/KeyboardioHID/src/MultiReport/AbsoluteMouse.cpp
@@ -65,7 +65,7 @@ static const uint8_t _hidMultiReportDescriptorAbsoluteMouse[] PROGMEM = {
 
 AbsoluteMouse_::AbsoluteMouse_(void) 
 {
-	static HIDDescriptorListNode node(_hidMultiReportDescriptorAbsoluteMouse, sizeof(_hidMultiReportDescriptorAbsoluteMouse));
+	static HIDSubDescriptor node(_hidMultiReportDescriptorAbsoluteMouse, sizeof(_hidMultiReportDescriptorAbsoluteMouse));
 	HID().AppendDescriptor(&node);
 }
 
diff --git a/plugins/KeyboardioHID/src/MultiReport/Consumer.cpp b/plugins/KeyboardioHID/src/MultiReport/Consumer.cpp
@@ -43,7 +43,7 @@ static const uint8_t _hidMultiReportDescriptorConsumer[] PROGMEM = {
 
 Consumer_::Consumer_(void) 
 {
-	static HIDDescriptorListNode node(_hidMultiReportDescriptorConsumer, sizeof(_hidMultiReportDescriptorConsumer));
+	static HIDSubDescriptor node(_hidMultiReportDescriptorConsumer, sizeof(_hidMultiReportDescriptorConsumer));
 	HID().AppendDescriptor(&node);
 }
 
diff --git a/plugins/KeyboardioHID/src/MultiReport/Gamepad.cpp b/plugins/KeyboardioHID/src/MultiReport/Gamepad.cpp
@@ -74,7 +74,7 @@ static const uint8_t _hidMultiReportDescriptorGamepad[] PROGMEM = {
 
 Gamepad_::Gamepad_(void) 
 {
-	static HIDDescriptorListNode node(_hidMultiReportDescriptorGamepad, sizeof(_hidMultiReportDescriptorGamepad));
+	static HIDSubDescriptor node(_hidMultiReportDescriptorGamepad, sizeof(_hidMultiReportDescriptorGamepad));
 	HID().AppendDescriptor(&node);
 }
 
diff --git a/plugins/KeyboardioHID/src/MultiReport/ImprovedKeyboard.cpp b/plugins/KeyboardioHID/src/MultiReport/ImprovedKeyboard.cpp
@@ -61,7 +61,7 @@ static const uint8_t _hidMultiReportDescriptorKeyboard[] PROGMEM = {
 
 Keyboard_::Keyboard_(void) 
 {
-	static HIDDescriptorListNode node(_hidMultiReportDescriptorKeyboard, sizeof(_hidMultiReportDescriptorKeyboard));
+	static HIDSubDescriptor node(_hidMultiReportDescriptorKeyboard, sizeof(_hidMultiReportDescriptorKeyboard));
 	HID().AppendDescriptor(&node);
 }
 
diff --git a/plugins/KeyboardioHID/src/MultiReport/ImprovedMouse.cpp b/plugins/KeyboardioHID/src/MultiReport/ImprovedMouse.cpp
@@ -59,7 +59,7 @@ static const uint8_t _hidMultiReportDescriptorMouse[] PROGMEM = {
 
 Mouse_::Mouse_(void) 
 {
-	static HIDDescriptorListNode node(_hidMultiReportDescriptorMouse, sizeof(_hidMultiReportDescriptorMouse));
+	static HIDSubDescriptor node(_hidMultiReportDescriptorMouse, sizeof(_hidMultiReportDescriptorMouse));
 	HID().AppendDescriptor(&node);
 }
 
diff --git a/plugins/KeyboardioHID/src/MultiReport/NKROKeyboard.cpp b/plugins/KeyboardioHID/src/MultiReport/NKROKeyboard.cpp
@@ -66,7 +66,7 @@ static const uint8_t _hidMultiReportDescriptorNKROKeyboard[] PROGMEM = {
 
 NKROKeyboard_::NKROKeyboard_(void) 
 {
-	static HIDDescriptorListNode node(_hidMultiReportDescriptorNKROKeyboard, sizeof(_hidMultiReportDescriptorNKROKeyboard));
+	static HIDSubDescriptor node(_hidMultiReportDescriptorNKROKeyboard, sizeof(_hidMultiReportDescriptorNKROKeyboard));
 	HID().AppendDescriptor(&node);
 }
 
diff --git a/plugins/KeyboardioHID/src/MultiReport/System.cpp b/plugins/KeyboardioHID/src/MultiReport/System.cpp
@@ -44,7 +44,7 @@ static const uint8_t _hidMultiReportDescriptorSystem[] PROGMEM = {
 
 System_::System_(void) 
 {
-	static HIDDescriptorListNode node(_hidMultiReportDescriptorSystem, sizeof(_hidMultiReportDescriptorSystem));
+	static HIDSubDescriptor node(_hidMultiReportDescriptorSystem, sizeof(_hidMultiReportDescriptorSystem));
 	HID().AppendDescriptor(&node);
 }
 
diff --git a/plugins/KeyboardioHID/src/SingleReport/BootKeyboard.cpp b/plugins/KeyboardioHID/src/SingleReport/BootKeyboard.cpp
@@ -70,7 +70,7 @@ static const uint8_t _hidReportDescriptorKeyboard[] PROGMEM = {
     0xc0                            /* END_COLLECTION */
 };
 
-BootKeyboard_::BootKeyboard_(void) : PUSBListNode(1, 1, epType), protocol(1), idle(1), leds(0)
+BootKeyboard_::BootKeyboard_(void) : PluggableUSBModule(1, 1, epType), protocol(1), idle(1), leds(0)
 {
 	epType[0] = EP_TYPE_INTERRUPT_IN;
 	PluggableUSB().plug(this);
diff --git a/plugins/KeyboardioHID/src/SingleReport/BootKeyboard.h b/plugins/KeyboardioHID/src/SingleReport/BootKeyboard.h
@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "../HID-APIs/KeyboardAPI.h"
 
 
-class BootKeyboard_ : public PUSBListNode, public KeyboardAPI
+class BootKeyboard_ : public PluggableUSBModule, public KeyboardAPI
 {
 public:
     BootKeyboard_(void);
diff --git a/plugins/KeyboardioHID/src/SingleReport/BootMouse.cpp b/plugins/KeyboardioHID/src/SingleReport/BootMouse.cpp
@@ -54,7 +54,7 @@ static const uint8_t _hidReportDescriptorMouse[] PROGMEM = {
     0xc0                            /* END_COLLECTION */
 };
 
-BootMouse_::BootMouse_(void) : PUSBListNode(1, 1, epType), protocol(1), idle(1)
+BootMouse_::BootMouse_(void) : PluggableUSBModule(1, 1, epType), protocol(1), idle(1)
 {
 	epType[0] = EP_TYPE_INTERRUPT_IN;
 	PluggableUSB().plug(this);
diff --git a/plugins/KeyboardioHID/src/SingleReport/BootMouse.h b/plugins/KeyboardioHID/src/SingleReport/BootMouse.h
@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "../HID-APIs/MouseAPI.h"
 
 
-class BootMouse_ : public PUSBListNode, public MouseAPI
+class BootMouse_ : public PluggableUSBModule, public MouseAPI
 {
 public:
     BootMouse_(void);
diff --git a/plugins/KeyboardioHID/src/SingleReport/RawHID.cpp b/plugins/KeyboardioHID/src/SingleReport/RawHID.cpp
@@ -47,7 +47,7 @@ static const uint8_t  _hidReportDescriptorRawHID[] PROGMEM = {
     0xC0                         /* end collection */ 
 };
 
-RawHID_::RawHID_(void) : PUSBListNode(1, 1, epType), protocol(1), idle(1), dataLength(0)
+RawHID_::RawHID_(void) : PluggableUSBModule(1, 1, epType), protocol(1), idle(1), dataLength(0)
 {
 	epType[0] = EP_TYPE_INTERRUPT_IN;
 	PluggableUSB().plug(this);
diff --git a/plugins/KeyboardioHID/src/SingleReport/RawHID.h b/plugins/KeyboardioHID/src/SingleReport/RawHID.h
@@ -66,7 +66,7 @@ typedef union{
 	uint8_t buff[RAWHID_RX_SIZE];
 } HID_RawKeyboardRXReport_Data_t;
 
-class RawHID_ : public PUSBListNode, public Stream
+class RawHID_ : public PluggableUSBModule, public Stream
 {
 public:
 	RawHID_(void);
diff --git a/plugins/KeyboardioHID/src/SingleReport/SingleGamepad.cpp b/plugins/KeyboardioHID/src/SingleReport/SingleGamepad.cpp
@@ -70,7 +70,7 @@ static const uint8_t _hidReportDescriptorGamepad[] PROGMEM = {
 	0xc0								/* END_COLLECTION */
 };
 
-SingleGamepad_::SingleGamepad_(void) : PUSBListNode(1, 1, epType), protocol(1), idle(1)
+SingleGamepad_::SingleGamepad_(void) : PluggableUSBModule(1, 1, epType), protocol(1), idle(1)
 {
 	epType[0] = EP_TYPE_INTERRUPT_IN;
 	PluggableUSB().plug(this);
diff --git a/plugins/KeyboardioHID/src/SingleReport/SingleGamepad.h b/plugins/KeyboardioHID/src/SingleReport/SingleGamepad.h
@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "../HID-APIs/GamepadAPI.h"
 
 
-class SingleGamepad_ : public PUSBListNode, public GamepadAPI
+class SingleGamepad_ : public PluggableUSBModule, public GamepadAPI
 {
 public:
     SingleGamepad_(void);
diff --git a/plugins/KeyboardioHID/src/SingleReport/SingleNKROKeyboard.cpp b/plugins/KeyboardioHID/src/SingleReport/SingleNKROKeyboard.cpp
@@ -75,7 +75,7 @@ static const uint8_t _hidReportDescriptorNKRO[] PROGMEM = {
 	0xC0						     /*   End Collection */
 };
 
-SingleNKROKeyboard_::SingleNKROKeyboard_(void) : PUSBListNode(1, 1, epType), protocol(1), idle(1), leds(0)
+SingleNKROKeyboard_::SingleNKROKeyboard_(void) : PluggableUSBModule(1, 1, epType), protocol(1), idle(1), leds(0)
 {
 	epType[0] = EP_TYPE_INTERRUPT_IN;
 	PluggableUSB().plug(this);
diff --git a/plugins/KeyboardioHID/src/SingleReport/SingleNKROKeyboard.h b/plugins/KeyboardioHID/src/SingleReport/SingleNKROKeyboard.h
@@ -31,7 +31,7 @@ THE SOFTWARE.
 #include "../HID-APIs/NKROKeyboardAPI.h"
 
 
-class SingleNKROKeyboard_ : public PUSBListNode, public NKROKeyboardAPI
+class SingleNKROKeyboard_ : public PluggableUSBModule, public NKROKeyboardAPI
 {
 public:
     SingleNKROKeyboard_(void);

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ static const uint8_t _hidMultiReportDescriptorAbsoluteMouse[] PROGMEM = {`
`65`	`65`
`66`	`66`	`AbsoluteMouse_::AbsoluteMouse_(void)`
`67`	`67`	`{`
`68`		`- static HIDDescriptorListNode node(_hidMultiReportDescriptorAbsoluteMouse, sizeof(_hidMultiReportDescriptorAbsoluteMouse));`
	`68`	`+ static HIDSubDescriptor node(_hidMultiReportDescriptorAbsoluteMouse, sizeof(_hidMultiReportDescriptorAbsoluteMouse));`
`69`	`69`	`HID().AppendDescriptor(&node);`
`70`	`70`	`}`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ static const uint8_t _hidMultiReportDescriptorConsumer[] PROGMEM = {`
`43`	`43`
`44`	`44`	`Consumer_::Consumer_(void)`
`45`	`45`	`{`
`46`		`- static HIDDescriptorListNode node(_hidMultiReportDescriptorConsumer, sizeof(_hidMultiReportDescriptorConsumer));`
	`46`	`+ static HIDSubDescriptor node(_hidMultiReportDescriptorConsumer, sizeof(_hidMultiReportDescriptorConsumer));`
`47`	`47`	`HID().AppendDescriptor(&node);`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ static const uint8_t _hidMultiReportDescriptorGamepad[] PROGMEM = {`
`74`	`74`
`75`	`75`	`Gamepad_::Gamepad_(void)`
`76`	`76`	`{`
`77`		`- static HIDDescriptorListNode node(_hidMultiReportDescriptorGamepad, sizeof(_hidMultiReportDescriptorGamepad));`
	`77`	`+ static HIDSubDescriptor node(_hidMultiReportDescriptorGamepad, sizeof(_hidMultiReportDescriptorGamepad));`
`78`	`78`	`HID().AppendDescriptor(&node);`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ static const uint8_t _hidMultiReportDescriptorKeyboard[] PROGMEM = {`
`61`	`61`
`62`	`62`	`Keyboard_::Keyboard_(void)`
`63`	`63`	`{`
`64`		`- static HIDDescriptorListNode node(_hidMultiReportDescriptorKeyboard, sizeof(_hidMultiReportDescriptorKeyboard));`
	`64`	`+ static HIDSubDescriptor node(_hidMultiReportDescriptorKeyboard, sizeof(_hidMultiReportDescriptorKeyboard));`
`65`	`65`	`HID().AppendDescriptor(&node);`
`66`	`66`	`}`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ static const uint8_t _hidMultiReportDescriptorMouse[] PROGMEM = {`
`59`	`59`
`60`	`60`	`Mouse_::Mouse_(void)`
`61`	`61`	`{`
`62`		`- static HIDDescriptorListNode node(_hidMultiReportDescriptorMouse, sizeof(_hidMultiReportDescriptorMouse));`
	`62`	`+ static HIDSubDescriptor node(_hidMultiReportDescriptorMouse, sizeof(_hidMultiReportDescriptorMouse));`
`63`	`63`	`HID().AppendDescriptor(&node);`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ static const uint8_t _hidMultiReportDescriptorNKROKeyboard[] PROGMEM = {`
`66`	`66`
`67`	`67`	`NKROKeyboard_::NKROKeyboard_(void)`
`68`	`68`	`{`
`69`		`- static HIDDescriptorListNode node(_hidMultiReportDescriptorNKROKeyboard, sizeof(_hidMultiReportDescriptorNKROKeyboard));`
	`69`	`+ static HIDSubDescriptor node(_hidMultiReportDescriptorNKROKeyboard, sizeof(_hidMultiReportDescriptorNKROKeyboard));`
`70`	`70`	`HID().AppendDescriptor(&node);`
`71`	`71`	`}`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ static const uint8_t _hidMultiReportDescriptorSystem[] PROGMEM = {`
`44`	`44`
`45`	`45`	`System_::System_(void)`
`46`	`46`	`{`
`47`		`- static HIDDescriptorListNode node(_hidMultiReportDescriptorSystem, sizeof(_hidMultiReportDescriptorSystem));`
	`47`	`+ static HIDSubDescriptor node(_hidMultiReportDescriptorSystem, sizeof(_hidMultiReportDescriptorSystem));`
`48`	`48`	`HID().AppendDescriptor(&node);`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ static const uint8_t _hidReportDescriptorKeyboard[] PROGMEM = {`
`70`	`70`	`0xc0 /* END_COLLECTION */`
`71`	`71`	`};`
`72`	`72`
`73`		`-BootKeyboard_::BootKeyboard_(void) : PUSBListNode(1, 1, epType), protocol(1), idle(1), leds(0)`
	`73`	`+BootKeyboard_::BootKeyboard_(void) : PluggableUSBModule(1, 1, epType), protocol(1), idle(1), leds(0)`
`74`	`74`	`{`
`75`	`75`	`epType[0] = EP_TYPE_INTERRUPT_IN;`
`76`	`76`	`PluggableUSB().plug(this);`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ THE SOFTWARE.`
`31`	`31`	`#include "../HID-APIs/KeyboardAPI.h"`
`32`	`32`
`33`	`33`
`34`		`-class BootKeyboard_ : public PUSBListNode, public KeyboardAPI`
	`34`	`+class BootKeyboard_ : public PluggableUSBModule, public KeyboardAPI`
`35`	`35`	`{`
`36`	`36`	`public:`
`37`	`37`	`BootKeyboard_(void);`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ static const uint8_t _hidReportDescriptorMouse[] PROGMEM = {`
`54`	`54`	`0xc0 /* END_COLLECTION */`
`55`	`55`	`};`
`56`	`56`
`57`		`-BootMouse_::BootMouse_(void) : PUSBListNode(1, 1, epType), protocol(1), idle(1)`
	`57`	`+BootMouse_::BootMouse_(void) : PluggableUSBModule(1, 1, epType), protocol(1), idle(1)`
`58`	`58`	`{`
`59`	`59`	`epType[0] = EP_TYPE_INTERRUPT_IN;`
`60`	`60`	`PluggableUSB().plug(this);`