X-Git-Url: https://git.cryptolib.org/?p=arm-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fuart_lowlevel.c;h=2261ebbf2c8572ff4c9774463c9848fb67a2bd16;hp=6c8583ef64d31dbbf9da21c2f781f22e12c843ec;hb=5e75eafde9b0269aa78395bbeb3e79ff36a1f082;hpb=f4853b26a54089e6796fcf115f739f1e9ea7ceb7

diff --git a/test_src/uart_lowlevel.c b/test_src/uart_lowlevel.c
index 6c8583e..2261ebb 100644
--- a/test_src/uart_lowlevel.c
+++ b/test_src/uart_lowlevel.c
@@ -1,6 +1,6 @@
 /* uart_lowlevel.c */
 /*
-    This file is part of the ARM-Crypto-Lib.
+    This file is part of the AVR-Crypto-Lib.
     Copyright (C) 2010 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
@@ -18,23 +18,28 @@
 */
 
 #include <stdint.h>
-#include "sysclock.h"
 #include "hw_regs.h"
 #include "hw_uart_regs.h"
 #include "uart_defines.h"
+#include "sysclock.h"
 
 void calc_baud_values(uint32_t baudrate, uint16_t* intdivider, uint8_t* fracdivider, uint8_t* highspeed){
 	uint32_t tmp;
 	uint32_t uart_freq;
+	if(baudrate==0){
+		return;
+	}
 	uart_freq = sysclk_get_freq();
-	*highspeed = (baudrate*16>uart_freq)?1:0;
-	tmp = (uint64_t)uart_freq*128/((*highspeed?8:16)*baudrate);
+	*highspeed = ((baudrate*16L)>uart_freq)?1:0;
+//	tmp = (((uint64_t)UART_FREQ)*128LL)/(((*highspeed)?8L:16L)*baudrate);
+	tmp = uart_freq<<((*highspeed)?(7-3):(7-4));
+	tmp /= baudrate;
 	tmp++;
 	tmp>>=1;
 	*fracdivider = (uint8_t)(tmp&0x3f);
-	*intdivider = tmp>>6;
+	*intdivider = (uint16_t)(tmp>>6);
 }
-
+//*/
 static const
 uint32_t uart_base[] = { UART0_BASE, UART1_BASE, UART2_BASE };
 
@@ -109,13 +114,16 @@ uint8_t uart_init(uint8_t uartno, uint32_t baudrate, uint8_t databits, uint8_t p
 	HW_REG(gpio_base[uart_tx_gpio[uartno]]+GPIO_DIR_OFFSET) |= _BV(uart_tx_pin[uartno]);
 
 	/* disable uart */
-	HW_REG(uart_base[uartno]+UARTCTL_OFFSET) &= ~_BV(UARTEN);
+	HW_REG(uart_base[uartno]+UARTCTL_OFFSET) &= ~_BV(UART_UARTEN);
 	/* set baudrate parameters */
 	uint8_t highspeed;
-	calc_baud_values(baudrate,
-			         (uint16_t*)&HW_REG(uart_base[uartno]+UARTIBRD_OFFSET),
-			         (uint8_t*)&HW_REG(uart_base[uartno]+UARTFBRD_OFFSET),
-			         &highspeed);
+	uint16_t ibrd;
+	uint8_t fbrd;
+	calc_baud_values(baudrate, &ibrd, &fbrd, &highspeed);
+	tmp=HW_REG(uart_base[uartno]+UARTLCRH_OFFSET);
+	HW16_REG(uart_base[uartno]+UARTIBRD_OFFSET) = ibrd;
+    HW8_REG(uart_base[uartno]+UARTFBRD_OFFSET) = fbrd;
+    HW_REG(uart_base[uartno]+UARTLCRH_OFFSET) = tmp;
 	/* wait until uart is no longer busy */
 	while(HW_REG(uart_base[uartno]+UARTFR_OFFSET)&_BV(UART_BUSY))
 		;
@@ -139,7 +147,7 @@ uint8_t uart_init(uint8_t uartno, uint32_t baudrate, uint8_t databits, uint8_t p
 	}
 	HW_REG(uart_base[uartno]+UARTFR_OFFSET) = 0;
 	HW_REG(uart_base[uartno]+UARTCTL_OFFSET) |= _BV(UART_RXE) | _BV(UART_TXE);
-	HW_REG(uart_base[uartno]+UARTCTL_OFFSET) |= _BV(UARTEN);
+	HW_REG(uart_base[uartno]+UARTCTL_OFFSET) |= _BV(UART_UARTEN);
 
 	return UART_ERROR_OK;
 }