noisymime
/
Arduino_STM32
mirror of https://github.com/noisymime/Arduino_STM32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated with commits that had been applied to Leaflabs:libmaple since the original copy of the repo was taken (by BobC) in Nov 2014

This commit is contained in:
rogerclarkmelbourne 2015-05-31 18:06:19 +10:00
parent 58df3f36b4
commit 912098d5b8
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
STM32F1/cores/maple/usb_serial.cpp
View File

@ -72,9 +72,17 @@ void USBSerial::begin(void) {
//Roger Clark. Two new begin functions has been added so that normal Arduino Sketches that use Serial.begin(xxx) will compile. //Roger Clark. Two new begin functions has been added so that normal Arduino Sketches that use Serial.begin(xxx) will compile.
void USBSerial::begin(unsigned long ignoreBaud) void USBSerial::begin(unsigned long ignoreBaud)
{ {
volatile unsigned long removeCompilerWarningsIgnoreBaud=ignoreBaud;
ignoreBaud=removeCompilerWarningsIgnoreBaud;
} }
void USBSerial::begin(unsigned long ignoreBaud, uint8_t ignore) void USBSerial::begin(unsigned long ignoreBaud, uint8_t ignore)
{ {
volatile unsigned long removeCompilerWarningsIgnoreBaud=ignoreBaud;
volatile uint8_t removeCompilerWarningsIgnore=ignore;
ignoreBaud=removeCompilerWarningsIgnoreBaud;
ignore=removeCompilerWarningsIgnore;
} }
void USBSerial::end(void) { void USBSerial::end(void) {

3
STM32F1/system/libmaple/dma_private.h
View File

@ -38,10 +38,11 @@
* in the series support files, which need dma_irq_handler().) */ * in the series support files, which need dma_irq_handler().) */
#ifdef DMA_GET_HANDLER #ifdef DMA_GET_HANDLER
static __always_inline void dma_irq_handler(dma_dev *dev, dma_tube tube) { static __always_inline void dma_irq_handler(dma_dev *dev, dma_tube tube) {
dma_clear_isr_bits(dev, tube); /* in case handler doesn't */
void (*handler)(void) = DMA_GET_HANDLER(dev, tube); void (*handler)(void) = DMA_GET_HANDLER(dev, tube);
if (handler) { if (handler) {
handler(); handler();
dma_clear_isr_bits(dev, tube); /* in case handler doesn't */
} }
} }
#endif #endif

17
STM32F1/system/libmaple/usart_private.h
View File

@ -38,14 +38,21 @@
#include <libmaple/usart.h> #include <libmaple/usart.h>
static __always_inline void usart_irq(ring_buffer *rb, usart_reg_map *regs) { static __always_inline void usart_irq(ring_buffer *rb, usart_reg_map *regs) {
/* We can get RXNE and ORE interrupts here. Only RXNE signifies
* availability of a byte in DR.
*
* See table 198 (sec 27.4, p809) in STM document RM0008 rev 15.
* We enable RXNEIE. */
if (regs->SR & USART_SR_RXNE) {
#ifdef USART_SAFE_INSERT #ifdef USART_SAFE_INSERT
/* If the buffer is full and the user defines USART_SAFE_INSERT, /* If the buffer is full and the user defines USART_SAFE_INSERT,
* ignore new bytes. */ * ignore new bytes. */
rb_safe_insert(rb, (uint8)regs->DR); rb_safe_insert(rb, (uint8)regs->DR);
#else #else
/* By default, push bytes around in the ring buffer. */ /* By default, push bytes around in the ring buffer. */
rb_push_insert(rb, (uint8)regs->DR); rb_push_insert(rb, (uint8)regs->DR);
#endif #endif
}
} }
uint32 _usart_clock_freq(usart_dev *dev); uint32 _usart_clock_freq(usart_dev *dev);