From: bsekisser <squirmyworms@embarqmail.com>
Date: Mon, 3 Mar 2014 17:00:21 +0000 (-0500)
Subject: uart: refactor uart udr write operation outside generic uart write.
X-Git-Tag: v1.2~23^2
X-Git-Url: https://git.htl-mechatronik.at/public/?a=commitdiff_plain;h=b0d3d5ec3136d4742f1ac15a214f046e79705c84;p=sx%2Fsimavr.git

uart: refactor uart udr write operation outside generic uart write.

	modified:   simavr/sim/avr_uart.c
---

diff --git a/simavr/sim/avr_uart.c b/simavr/sim/avr_uart.c
index 9eff694..0fff236 100644
--- a/simavr/sim/avr_uart.c
+++ b/simavr/sim/avr_uart.c
@@ -144,34 +144,39 @@ static void avr_uart_baud_write(struct avr_t * avr, avr_io_addr_t addr, uint8_t
 	AVR_LOG(avr, LOG_TRACE, "UART: Roughly %d usec per bytes\n", (int)p->usec_per_byte);
 }
 
-static void avr_uart_write(struct avr_t * avr, avr_io_addr_t addr, uint8_t v, void * param)
+static void avr_uart_udr_write(struct avr_t * avr, avr_io_addr_t addr, uint8_t v, void * param)
 {
 	avr_uart_t * p = (avr_uart_t *)param;
 
-	if (addr == p->r_udr) {
-		avr_core_watch_write(avr, addr, v);
+	avr_core_watch_write(avr, addr, v);
 
-		if ( p->udrc.vector)
-			avr_regbit_clear(avr, p->udrc.raised);
-		avr_cycle_timer_register_usec(avr,
-				p->usec_per_byte, avr_uart_txc_raise, p); // should be uart speed dependent
-
-		if (p->flags & AVR_UART_FLAG_STDIO) {
-			const int maxsize = 256;
-			if (!p->stdio_out)
-				p->stdio_out = malloc(maxsize);
-			p->stdio_out[p->stdio_len++] = v < ' ' ? '.' : v;
-			p->stdio_out[p->stdio_len] = 0;
-			if (v == '\n' || p->stdio_len == maxsize) {
-				p->stdio_len = 0;
-				AVR_LOG(avr, LOG_TRACE, FONT_GREEN "%s\n" FONT_DEFAULT, p->stdio_out);
-			}
+	if ( p->udrc.vector)
+		avr_regbit_clear(avr, p->udrc.raised);
+	avr_cycle_timer_register_usec(avr,
+			p->usec_per_byte, avr_uart_txc_raise, p); // should be uart speed dependent
+
+	if (p->flags & AVR_UART_FLAG_STDIO) {
+		const int maxsize = 256;
+		if (!p->stdio_out)
+			p->stdio_out = malloc(maxsize);
+		p->stdio_out[p->stdio_len++] = v < ' ' ? '.' : v;
+		p->stdio_out[p->stdio_len] = 0;
+		if (v == '\n' || p->stdio_len == maxsize) {
+			p->stdio_len = 0;
+			AVR_LOG(avr, LOG_TRACE, FONT_GREEN "%s\n" FONT_DEFAULT, p->stdio_out);
 		}
-		TRACE(printf("UDR%c(%02x) = %02x\n", p->name, addr, v);)
-		// tell other modules we are "outputting" a byte
-		if (avr_regbit_get(avr, p->txen))
-			avr_raise_irq(p->io.irq + UART_IRQ_OUTPUT, v);
 	}
+	TRACE(printf("UDR%c(%02x) = %02x\n", p->name, addr, v);)
+	// tell other modules we are "outputting" a byte
+	if (avr_regbit_get(avr, p->txen))
+		avr_raise_irq(p->io.irq + UART_IRQ_OUTPUT, v);
+}
+
+
+static void avr_uart_write(struct avr_t * avr, avr_io_addr_t addr, uint8_t v, void * param)
+{
+	avr_uart_t * p = (avr_uart_t *)param;
+
 	if (p->udrc.vector && addr == p->udrc.enable.reg) {
 		/*
 		 * If enabling the UDRC interrupt, raise it immediately if FIFO is empty
@@ -294,7 +299,7 @@ void avr_uart_init(avr_t * avr, avr_uart_t * p)
 	// Only call callbacks when the value change...
 	p->io.irq[UART_IRQ_OUT_XOFF].flags |= IRQ_FLAG_FILTERED;
 
-	avr_register_io_write(avr, p->r_udr, avr_uart_write, p);
+	avr_register_io_write(avr, p->r_udr, avr_uart_udr_write, p);
 	avr_register_io_read(avr, p->r_udr, avr_uart_read, p);
 	// monitor code that reads the rxc flag, and delay it a bit
 	avr_register_io_read(avr, p->rxc.raised.reg, avr_uart_rxc_read, p);