Commit eaf7756

authored

Merge pull request #713 from skulblakka/fix/staticUsbLineInfo

USB CDC: Line Info Per Instance

2 parents 84c09b3 + d0ae34d commit eaf7756Copy full SHA for eaf7756

File tree

+16

-16

lines changed

+16

-16

lines changed

Lines changed: 0 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,22 +42,6 @@ extern USBDevice_SAMD21G18x usbd;`
`42`	`42`
`43`	`43`	`extern USBDeviceClass USBDevice;`
`44`	`44`
`45`		`-typedef struct {`
`46`		`- uint32_t dwDTERate;`
`47`		`- uint8_t bCharFormat;`
`48`		`- uint8_t bParityType;`
`49`		`- uint8_t bDataBits;`
`50`		`- uint8_t lineState;`
`51`		`-} LineInfo;`
`52`		`-`
`53`		`-static volatile LineInfo _usbLineInfo = {`
`54`		`- 115200, // dWDTERate`
`55`		`- 0x00, // bCharFormat`
`56`		`- 0x00, // bParityType`
`57`		`- 0x08, // bDataBits`
`58`		`- 0x00 // lineState`
`59`		`-};`
`60`		`-`
`61`	`45`	`static volatile int32_t breakValue = -1;`
`62`	`46`
`63`	`47`	`// CDC`

Lines changed: 8 additions & 0 deletions

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,14 @@ friend USBDeviceClass;`
`176`	`176`	`bool stalled;`
`177`	`177`	`unsigned int epType[3];`
`178`	`178`
	`179`	`+ volatile LineInfo _usbLineInfo = {`
	`180`	`+ 115200, // dWDTERate`
	`181`	`+ 0x00, // bCharFormat`
	`182`	`+ 0x00, // bParityType`
	`183`	`+ 0x08, // bDataBits`
	`184`	`+ 0x00 // lineState`
	`185`	`+ };`
	`186`	`+`
`179`	`187`	`};`
`180`	`188`	`extern Serial_ SerialUSB;`
`181`	`189`

Comments

(0)