Fix compiler warnings in USBCore.cpp

NicoHood · cmaglie · commit 228fa375688d · 2015-09-28T16:30:39.000+02:00
diff --git a/hardware/arduino/avr/cores/arduino/USBCore.cpp b/hardware/arduino/avr/cores/arduino/USBCore.cpp
@@ -372,8 +372,8 @@ bool ClassInterfaceRequest(USBSetup& setup)
 	return false;
 }
 
-int _cmark;
-int _cend;
+static int _cmark;
+static int _cend;
 void InitControl(int end)
 {
 	SetEP(0);
@@ -438,7 +438,7 @@ int USB_RecvControl(void* d, int len)
 	return len;
 }
 
-int SendInterfaces()
+static u8 SendInterfaces()
 {
 	u8 interfaces = 0;
 
@@ -459,7 +459,7 @@ bool SendConfiguration(int maxlen)
 {
 	//	Count and measure interfaces
 	InitControl(0);	
-	int interfaces = SendInterfaces();
+	u8 interfaces = SendInterfaces();
 	ConfigDescriptor config = D_CONFIG(_cmark + sizeof(ConfigDescriptor),interfaces);
 
 	//	Now send them
@@ -469,7 +469,7 @@ bool SendConfiguration(int maxlen)
 	return true;
 }
 
-u8 _cdcComposite = 0;
+static u8 _cdcComposite = 0;
 
 static
 bool SendDescriptor(USBSetup& setup)

Original file line number	Diff line number	Diff line change
`@@ -372,8 +372,8 @@ bool ClassInterfaceRequest(USBSetup& setup)`
`372`	`372`	`return false;`
`373`	`373`	`}`
`374`	`374`
`375`		`-int _cmark;`
`376`		`-int _cend;`
	`375`	`+static int _cmark;`
	`376`	`+static int _cend;`
`377`	`377`	`void InitControl(int end)`
`378`	`378`	`{`
`379`	`379`	`SetEP(0);`
`@@ -438,7 +438,7 @@ int USB_RecvControl(void* d, int len)`
`438`	`438`	`return len;`
`439`	`439`	`}`
`440`	`440`
`441`		`-int SendInterfaces()`
	`441`	`+static u8 SendInterfaces()`
`442`	`442`	`{`
`443`	`443`	`u8 interfaces = 0;`
`444`	`444`
`@@ -459,7 +459,7 @@ bool SendConfiguration(int maxlen)`
`459`	`459`	`{`
`460`	`460`	`// Count and measure interfaces`
`461`	`461`	`InitControl(0);`
`462`		`- int interfaces = SendInterfaces();`
	`462`	`+ u8 interfaces = SendInterfaces();`
`463`	`463`	`ConfigDescriptor config = D_CONFIG(_cmark + sizeof(ConfigDescriptor),interfaces);`
`464`	`464`
`465`	`465`	`// Now send them`
`@@ -469,7 +469,7 @@ bool SendConfiguration(int maxlen)`
`469`	`469`	`return true;`
`470`	`470`	`}`
`471`	`471`
`472`		`-u8 _cdcComposite = 0;`
	`472`	`+static u8 _cdcComposite = 0;`
`473`	`473`
`474`	`474`	`static`
`475`	`475`	`bool SendDescriptor(USBSetup& setup)`