move _initEndpoints from PROGMEM to RAM

facchinm · facchinm · commit 54d2db875200 · 2015-06-05T17:49:06.000+02:00
diff --git a/hardware/arduino/avr/cores/arduino/USBCore.cpp b/hardware/arduino/avr/cores/arduino/USBCore.cpp
@@ -313,8 +313,7 @@ int USB_Send(u8 ep, const void* d, int len)
 	return r;
 }
 
-extern const u8 _initEndpoints[] PROGMEM;
-const u8 _initEndpoints[] = 
+u8 _initEndpoints[] =
 {
 	0,
 	
@@ -344,11 +343,11 @@ void InitEP(u8 index, u8 type, u8 size)
 static
 void InitEndpoints()
 {
-	for (u8 i = 1; i < sizeof(_initEndpoints); i++)
+	for (u8 i = 1; i < sizeof(_initEndpoints) && _initEndpoints[i] != 0; i++)
 	{
 		UENUM = i;
 		UECONX = 1;
-		UECFG0X = pgm_read_byte(_initEndpoints+i);
+		UECFG0X = _initEndpoints[i];
 		UECFG1X = EP_DOUBLE_64;
 	}
 	UERST = 0x7E;	// And reset them

Original file line number	Diff line number	Diff line change
`@@ -313,8 +313,7 @@ int USB_Send(u8 ep, const void* d, int len)`
`313`	`313`	`return r;`
`314`	`314`	`}`
`315`	`315`
`316`		`-extern const u8 _initEndpoints[] PROGMEM;`
`317`		`-const u8 _initEndpoints[] =`
	`316`	`+u8 _initEndpoints[] =`
`318`	`317`	`{`
`319`	`318`	`0,`
`320`	`319`
`@@ -344,11 +343,11 @@ void InitEP(u8 index, u8 type, u8 size)`
`344`	`343`	`static`
`345`	`344`	`void InitEndpoints()`
`346`	`345`	`{`
`347`		`- for (u8 i = 1; i < sizeof(_initEndpoints); i++)`
	`346`	`+ for (u8 i = 1; i < sizeof(_initEndpoints) && _initEndpoints[i] != 0; i++)`
`348`	`347`	`{`
`349`	`348`	`UENUM = i;`
`350`	`349`	`UECONX = 1;`
`351`		`- UECFG0X = pgm_read_byte(_initEndpoints+i);`
	`350`	`+ UECFG0X = _initEndpoints[i];`
`352`	`351`	`UECFG1X = EP_DOUBLE_64;`
`353`	`352`	`}`
`354`	`353`	`UERST = 0x7E; // And reset them`