diff options
| author | Karel Kočí <cynerd@email.cz> | 2016-03-20 19:07:05 +0100 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2016-03-20 19:07:05 +0100 |
| commit | e88e18295becfb18efc278d1fab7fbe0021cb2dd (patch) | |
| tree | 996f0db88529566b0c971827a3a76a0fcbbc9a81 | |
| parent | dba729ab1755345257724246a9df87aa7f32f25d (diff) | |
| download | avr-ioe-e88e18295becfb18efc278d1fab7fbe0021cb2dd.tar.gz avr-ioe-e88e18295becfb18efc278d1fab7fbe0021cb2dd.tar.bz2 avr-ioe-e88e18295becfb18efc278d1fab7fbe0021cb2dd.zip | |
Fix USART configuration
| -rw-r--r-- | include/usart.h | 4 | ||||
| -rw-r--r-- | src/usart.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/usart.h b/include/usart.h index a3f585a..76e423d 100644 --- a/include/usart.h +++ b/include/usart.h @@ -32,10 +32,10 @@ extern volatile int8_t _usart_busy; */ void usart_init_async(void); void usart_send(uint8_t data); -#ifdef _USART_OUTBUFFER +#ifdef CONFIG_USART_OUTPUT_BUFFER void usart_send_str(char *str); #endif -#ifdef _USART_INBUFFER +#ifdef CONFIG_USART_INPUT_BUFFER uint8_t usart_get(void); #endif static inline uint8_t usart_queryerror(void) { diff --git a/src/usart.c b/src/usart.c index 12528f9..3da91ef 100644 --- a/src/usart.c +++ b/src/usart.c @@ -61,7 +61,7 @@ inline void usart_send(uint8_t data) { } else { IOEBUFFER_PUT(_ioe_usart_outbuffer, CONFIG_USART_OUTBUFFER_SIZE, data, - CONFIGCONFIG_USART_OUTPUT_BUFFER_MODE); + CONFIG_USART_OUTBUFFER_MODE); } #else _usart_busy = 1; @@ -112,7 +112,7 @@ static int usartput(char c, FILE * f) { } #endif -#ifdef CONFIGCONFIG_USART_INPUT_BUFFER +#ifdef CONFIG_USART_INPUT_BUFFER static int usartget(FILE * f) { uint8_t v; while (!(v = usart_get())); @@ -143,7 +143,7 @@ SIGNAL(USART_RX_vect) { #ifdef CONFIG_USART_INPUT_BUFFER uint8_t val = UDR0; IOEBUFFER_PUT(_ioe_usart_inbuffer, CONFIG_USART_INBUFFER_SIZE, - val, CONFIGCONFIG_USART_INPUT_BUFFER_MODE); + val, CONFIG_USART_INBUFFER_MODE); #endif /* CONFIG_USART_INPUT_BUFFER */ if (usart_receive) usart_receive(UDR0); |