aboutsummaryrefslogtreecommitdiffstats
path: root/firmware/microblaze/lib/hal_uart.c
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-08-04 11:11:06 -0700
committerJosh Blum <josh@joshknows.com>2010-08-04 11:11:06 -0700
commitfe622fb28654e6a578395d7b688e7c1958d373be (patch)
treec4cad6eb4c77895ddbc7bf8b297f4c115e6c52f7 /firmware/microblaze/lib/hal_uart.c
parentee32fa2290f8b6abe83f1b8b33aff922f9d1e24c (diff)
parent4240d5a2a1b705fe8ed5c3a1d1deef24be00d444 (diff)
downloaduhd-fe622fb28654e6a578395d7b688e7c1958d373be.tar.gz
uhd-fe622fb28654e6a578395d7b688e7c1958d373be.tar.bz2
uhd-fe622fb28654e6a578395d7b688e7c1958d373be.zip
Merge branch 'fw_reorg'
Diffstat (limited to 'firmware/microblaze/lib/hal_uart.c')
-rw-r--r--firmware/microblaze/lib/hal_uart.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/firmware/microblaze/lib/hal_uart.c b/firmware/microblaze/lib/hal_uart.c
index 75b12b432..fe3b7515a 100644
--- a/firmware/microblaze/lib/hal_uart.c
+++ b/firmware/microblaze/lib/hal_uart.c
@@ -39,16 +39,25 @@ divisor_table[MAX_WB_DIV+1][NSPEEDS] = {
#define u uart_regs
+static char uart_mode = UART_MODE_ONLCR;
+
+void
+hal_uart_set_mode(int mode)
+{
+ uart_mode = mode;
+}
+
void
hal_uart_init(void)
{
+ hal_uart_set_mode(UART_MODE_ONLCR);
u->clkdiv = 217; // 230400 bps
}
void
hal_uart_putc(int ch)
{
- if (ch == '\n') // FIXME for now map \n -> \r\n
+ if (ch == '\n')// && (uart_mode == UART_MODE_ONLCR)) //map \n->\r\n if necessary
hal_uart_putc('\r');
while (u->txlevel == 0) // wait for fifo to have space
@@ -60,7 +69,7 @@ hal_uart_putc(int ch)
void
hal_uart_putc_nowait(int ch)
{
- if (ch == '\n') // FIXME for now map \n -> \r\n
+ if (ch == '\n')// && (uart_mode == UART_MODE_ONLCR)) //map \n->\r\n if necessary
hal_uart_putc('\r');
if(u->txlevel) // If fifo has space