rename Setup typedef struct to USBSetup

facchinm · facchinm · commit b8fa4de885b6 · 2015-07-01T16:56:14.000+02:00
was really too common
diff --git a/hardware/arduino/avr/cores/arduino/CDC.cpp b/hardware/arduino/avr/cores/arduino/CDC.cpp
@@ -53,13 +53,13 @@ const CDCDescriptor _cdcInterface =
 	D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_IN ),USB_ENDPOINT_TYPE_BULK,0x40,0)
 };
 
-int WEAK CDC_GetInterface(u8* interfaceNum)
+int CDC_GetInterface(u8* interfaceNum)
 {
 	interfaceNum[0] += 2;	// uses 2
 	return USB_SendControl(TRANSFER_PGM,&_cdcInterface,sizeof(_cdcInterface));
 }
 
-bool WEAK CDC_Setup(Setup& setup)
+bool CDC_Setup(USBSetup& setup)
 {
 	u8 r = setup.bRequest;
 	u8 requestType = setup.bmRequestType;
diff --git a/hardware/arduino/avr/cores/arduino/PluggableUSB.cpp b/hardware/arduino/avr/cores/arduino/PluggableUSB.cpp
@@ -57,7 +57,7 @@ int PUSB_GetDescriptor(int8_t t)
 	return ret;
 }
 
-bool PUSB_Setup(Setup& setup, u8 j)
+bool PUSB_Setup(USBSetup& setup, u8 j)
 {
 	bool ret = false;
 	PUSBListNode* node = rootNode;
diff --git a/hardware/arduino/avr/cores/arduino/PluggableUSB.h b/hardware/arduino/avr/cores/arduino/PluggableUSB.h
@@ -27,7 +27,7 @@
 
 typedef struct
 {
-  bool (*setup)(Setup& setup, u8 i);
+  bool (*setup)(USBSetup& setup, u8 i);
   int (*getInterface)(u8* interfaceNum);
   int (*getDescriptor)(int8_t t);
   int8_t numEndpoints;
@@ -54,7 +54,7 @@ int PUSB_GetInterface(u8* interfaceNum);
 
 int PUSB_GetDescriptor(int8_t t);
 
-bool PUSB_Setup(Setup& setup, u8 i);
+bool PUSB_Setup(USBSetup& setup, u8 i);
 
 void PUSB_Begin();
 
diff --git a/hardware/arduino/avr/cores/arduino/USBAPI.h b/hardware/arduino/avr/cores/arduino/USBAPI.h
@@ -118,15 +118,15 @@ typedef struct
 	uint8_t wValueH;
 	uint16_t wIndex;
 	uint16_t wLength;
-} Setup;
+} USBSetup;
 
 //================================================================================
 //================================================================================
 //	MSC 'Driver'
 
 int		MSC_GetInterface(uint8_t* interfaceNum);
 int		MSC_GetDescriptor(int i);
-bool	MSC_Setup(Setup& setup);
+bool	MSC_Setup(USBSetup& setup);
 bool	MSC_Data(uint8_t rx,uint8_t tx);
 
 //================================================================================
@@ -135,7 +135,7 @@ bool	MSC_Data(uint8_t rx,uint8_t tx);
 
 int		CDC_GetInterface(uint8_t* interfaceNum);
 int		CDC_GetDescriptor(int i);
-bool	CDC_Setup(Setup& setup);
+bool	CDC_Setup(USBSetup& setup);
 
 //================================================================================
 //================================================================================
diff --git a/hardware/arduino/avr/cores/arduino/USBCore.cpp b/hardware/arduino/avr/cores/arduino/USBCore.cpp
@@ -352,7 +352,7 @@ void InitEndpoints()
 
 //	Handle CLASS_INTERFACE requests
 static
-bool ClassInterfaceRequest(Setup& setup)
+bool ClassInterfaceRequest(USBSetup& setup)
 {
 	u8 i = setup.wIndex;
 
@@ -465,7 +465,7 @@ bool SendConfiguration(int maxlen)
 u8 _cdcComposite = 0;
 
 static
-bool SendDescriptor(Setup& setup)
+bool SendDescriptor(USBSetup& setup)
 {
 	int ret;
 	u8 t = setup.wValueH;
@@ -517,7 +517,7 @@ ISR(USB_COM_vect)
 	if (!ReceivedSetupInt())
 		return;
 
-	Setup setup;
+	USBSetup setup;
 	Recv((u8*)&setup,8);
 	ClearSetupInt();
 
diff --git a/hardware/arduino/avr/libraries/HID/HID.cpp b/hardware/arduino/avr/libraries/HID/HID.cpp
@@ -72,7 +72,7 @@ void HID_SendReport(u8 id, const void* data, int len)
 	USB_Send(HID_TX | TRANSFER_RELEASE,data,len);
 }
 
-bool HID_Setup(Setup& setup, u8 i)
+bool HID_Setup(USBSetup& setup, u8 i)
 {
 	if (HID_INTERFACE != i) {
 		return false;

Original file line number	Diff line number	Diff line change
`@@ -53,13 +53,13 @@ const CDCDescriptor _cdcInterface =`
`53`	`53`	`D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_IN ),USB_ENDPOINT_TYPE_BULK,0x40,0)`
`54`	`54`	`};`
`55`	`55`
`56`		`-int WEAK CDC_GetInterface(u8* interfaceNum)`
	`56`	`+int CDC_GetInterface(u8* interfaceNum)`
`57`	`57`	`{`
`58`	`58`	`interfaceNum[0] += 2; // uses 2`
`59`	`59`	`return USB_SendControl(TRANSFER_PGM,&_cdcInterface,sizeof(_cdcInterface));`
`60`	`60`	`}`
`61`	`61`
`62`		`-bool WEAK CDC_Setup(Setup& setup)`
	`62`	`+bool CDC_Setup(USBSetup& setup)`
`63`	`63`	`{`
`64`	`64`	`u8 r = setup.bRequest;`
`65`	`65`	`u8 requestType = setup.bmRequestType;`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ int PUSB_GetDescriptor(int8_t t)`
`57`	`57`	`return ret;`
`58`	`58`	`}`
`59`	`59`
`60`		`-bool PUSB_Setup(Setup& setup, u8 j)`
	`60`	`+bool PUSB_Setup(USBSetup& setup, u8 j)`
`61`	`61`	`{`
`62`	`62`	`bool ret = false;`
`63`	`63`	`PUSBListNode* node = rootNode;`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ void HID_SendReport(u8 id, const void* data, int len)`
`72`	`72`	`USB_Send(HID_TX \| TRANSFER_RELEASE,data,len);`
`73`	`73`	`}`
`74`	`74`
`75`		`-bool HID_Setup(Setup& setup, u8 i)`
	`75`	`+bool HID_Setup(USBSetup& setup, u8 i)`
`76`	`76`	`{`
`77`	`77`	`if (HID_INTERFACE != i) {`
`78`	`78`	`return false;`