Commitf4ba11f

committed

Move USB APIs out of arduino namespace

1 parent8f2672e commitf4ba11fCopy full SHA for f4ba11f

File tree

-7

lines changed

-7

lines changed

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,6 @@`
`26`	`26`
`27`	`27`	`namespacearduino {`
`28`	`28`
`29`		`-// core need to define`
`30`		`-void*epBuffer(unsignedint n);// -> returns a poointer to the Nth element of the EP buffer structure`
`31`		`-`
`32`	`29`	`classPluggableUSBModule {`
`33`	`30`	`public:`
`34`	`31`	`PluggableUSBModule(uint8_t numEps,uint8_t numIfs,unsignedint *epType) :`
`@@ -68,12 +65,14 @@ class PluggableUSB_ {`
`68`	`65`	`PluggableUSBModule* rootNode;`
`69`	`66`	`uint8_t totalEP;`
`70`	`67`	`};`
	`68`	`+}`
	`69`	`+`
	`70`	`+// core need to define`
	`71`	`+void*epBuffer(unsignedint n);// -> returns a pointer to the Nth element of the EP buffer structure`
`71`	`72`
`72`	`73`	`// Replacement for global singleton.`
`73`	`74`	`// This function prevents static-initialization-order-fiasco`
`74`	`75`	`// https://isocpp.org/wiki/faq/ctors#static-init-order-on-first-use`
`75`		`-PluggableUSB_&PluggableUSB();`
`76`		`-`
`77`		`-}`
	`76`	`+arduino::PluggableUSB_&PluggableUSB();`
`78`	`77`
`79`	`78`	`#endif`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,10 @@ typedef struct __attribute__((packed))`
`44`	`44`	`uint16_t wLength;`
`45`	`45`	`} USBSetup;`
`46`	`46`
	`47`	`+}`
	`48`	`+`
`47`	`49`	`//================================================================================`
	`50`	`+// USB APIs (C scope)`
`48`	`51`	`//================================================================================`
`49`	`52`
`50`	`53`	`intUSB_SendControl(uint8_t flags,constvoid* d,int len);`
`@@ -58,5 +61,4 @@ int USB_Recv(uint8_t ep, void* data, int len);// non-blocking`
`58`	`61`	`intUSB_Recv(uint8_t ep);// non-blocking`
`59`	`62`	`voidUSB_Flush(uint8_t ep);`
`60`	`63`
`61`		`-}`
`62`	`64`	`#endif`

Comments

(0)