deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #294 from malvira/pr-mc1322x-uart-buf-size-conf

Browse source 
mc1322x: make uart buffer sizes configurable from contiki-conf.h
This commit is contained in:
Mariano Alvira 2013-07-23 16:23:37 -07:00
parent 14a2483a48 6307f3ff95
commit 4108066f0a
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cpu/mc1322x/lib/include/uart.h
View file

@ -36,6 +36,7 @@
#ifndef UART_H #ifndef UART_H
#define UART_H #define UART_H
#include "contiki-conf.h"
#include <stdint.h> #include <stdint.h>
/* Timer registers are all 16-bit wide with 16-bit access only */ /* Timer registers are all 16-bit wide with 16-bit access only */
@ -162,7 +163,12 @@ void uart_flowctl(volatile struct UART_struct * uart, uint8_t on);
* possible to eliminate that overhead by filling directly from a chain * possible to eliminate that overhead by filling directly from a chain
* of data buffer pointers, but printf's would be not so easy. * of data buffer pointers, but printf's would be not so easy.
*/ */
#ifndef UART1_CONF_TX_BUFFERSIZE
#define UART1_TX_BUFFERSIZE 1024 #define UART1_TX_BUFFERSIZE 1024
#else
#define UART1_TX_BUFFERSIZE UART1_CONF_TX_BUFFERSIZE
#endif
extern volatile uint32_t u1_tx_head, u1_tx_tail; extern volatile uint32_t u1_tx_head, u1_tx_tail;
void uart1_putc(char c); void uart1_putc(char c);
@ -173,7 +179,13 @@ void uart1_putc(char c);
* initiated at that FIFO level. * initiated at that FIFO level.
* Set to 32 for no flow control or RAM buffer. * Set to 32 for no flow control or RAM buffer.
*/ */
#ifndef UART1_CONF_RX_BUFFERSIZE
#define UART1_RX_BUFFERSIZE 128 #define UART1_RX_BUFFERSIZE 128
#else
#define UART1_RX_BUFFERSIZE UART1_CONF_RX_BUFFERSIZE
#endif
#if UART1_RX_BUFFERSIZE > 32 #if UART1_RX_BUFFERSIZE > 32
extern volatile uint32_t u1_rx_head, u1_rx_tail; extern volatile uint32_t u1_rx_head, u1_rx_tail;
#define uart1_can_get() ((u1_rx_head!=u1_rx_tail) || (*UART1_URXCON > 0)) #define uart1_can_get() ((u1_rx_head!=u1_rx_tail) || (*UART1_URXCON > 0))
@ -182,12 +194,20 @@ extern volatile uint32_t u1_rx_head, u1_rx_tail;
#endif #endif
uint8_t uart1_getc(void); uint8_t uart1_getc(void);
#ifndef UART2_CONF_TX_BUFFERSIZE
#define UART2_TX_BUFFERSIZE 1024 #define UART2_TX_BUFFERSIZE 1024
#else
#define UART2_TX_BUFFERSIZE UART1_CONF_TX_BUFFERSIZE
#endif
extern volatile uint32_t u2_tx_head, u2_tx_tail; extern volatile uint32_t u2_tx_head, u2_tx_tail;
void uart2_putc(char c); void uart2_putc(char c);
#ifndef UART2_CONF_RX_BUFFERSIZE
#define UART2_RX_BUFFERSIZE 128 #define UART2_RX_BUFFERSIZE 128
#else
#define UART2_RX_BUFFERSIZE UART1_CONF_RX_BUFFERSIZE
#endif
#if UART2_RX_BUFFERSIZE > 32 #if UART2_RX_BUFFERSIZE > 32
extern volatile uint32_t u2_rx_head, u2_rx_tail; extern volatile uint32_t u2_rx_head, u2_rx_tail;
#define uart2_can_get() ((u2_rx_head!=u2_rx_tail) || (*UART2_URXCON > 0)) #define uart2_can_get() ((u2_rx_head!=u2_rx_tail) || (*UART2_URXCON > 0))