Apply fix, provided by @slammer, for issue with USB Serial on GCC 4.9

rogerclarkmelbourne · rogerclarkmelbourne · commit 8c1e061efcf8 · 2016-04-19T19:42:07.000+10:00
diff --git a/STM32F1/system/libmaple/usb/stm32f1/usb_reg_map.h b/STM32F1/system/libmaple/usb/stm32f1/usb_reg_map.h
@@ -439,7 +439,7 @@ static inline uint16 usb_get_ep_tx_addr(uint8 ep) {
 }
 
 static inline void usb_set_ep_tx_addr(uint8 ep, uint16 addr) {
-    uint32 *tx_addr = usb_ep_tx_addr_ptr(ep);
+    volatile uint32 *tx_addr = usb_ep_tx_addr_ptr(ep);
     *tx_addr = addr & ~0x1;
 }
 
@@ -454,7 +454,7 @@ static inline uint16 usb_get_ep_rx_addr(uint8 ep) {
 }
 
 static inline void usb_set_ep_rx_addr(uint8 ep, uint16 addr) {
-    uint32 *rx_addr = usb_ep_rx_addr_ptr(ep);
+    volatile uint32 *rx_addr = usb_ep_rx_addr_ptr(ep);
     *rx_addr = addr & ~0x1;
 }
 
@@ -471,7 +471,7 @@ static inline uint16 usb_get_ep_tx_count(uint8 ep) {
 }
 
 static inline void usb_set_ep_tx_count(uint8 ep, uint16 count) {
-    uint32 *txc = usb_ep_tx_count_ptr(ep);
+    volatile uint32 *txc = usb_ep_tx_count_ptr(ep);
     *txc = count;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ static inline uint16 usb_get_ep_tx_addr(uint8 ep) {`
`439`	`439`	`}`
`440`	`440`
`441`	`441`	`static inline void usb_set_ep_tx_addr(uint8 ep, uint16 addr) {`
`442`		`- uint32 *tx_addr = usb_ep_tx_addr_ptr(ep);`
	`442`	`+ volatile uint32 *tx_addr = usb_ep_tx_addr_ptr(ep);`
`443`	`443`	`*tx_addr = addr & ~0x1;`
`444`	`444`	`}`
`445`	`445`
`@@ -454,7 +454,7 @@ static inline uint16 usb_get_ep_rx_addr(uint8 ep) {`
`454`	`454`	`}`
`455`	`455`
`456`	`456`	`static inline void usb_set_ep_rx_addr(uint8 ep, uint16 addr) {`
`457`		`- uint32 *rx_addr = usb_ep_rx_addr_ptr(ep);`
	`457`	`+ volatile uint32 *rx_addr = usb_ep_rx_addr_ptr(ep);`
`458`	`458`	`*rx_addr = addr & ~0x1;`
`459`	`459`	`}`
`460`	`460`
`@@ -471,7 +471,7 @@ static inline uint16 usb_get_ep_tx_count(uint8 ep) {`
`471`	`471`	`}`
`472`	`472`
`473`	`473`	`static inline void usb_set_ep_tx_count(uint8 ep, uint16 count) {`
`474`		`- uint32 *txc = usb_ep_tx_count_ptr(ep);`
	`474`	`+ volatile uint32 *txc = usb_ep_tx_count_ptr(ep);`
`475`	`475`	`*txc = count;`
`476`	`476`	`}`
`477`	`477`