new global_logger, used in AVR_LOG(), default is stdout/stderr

[simavr] / simavr / sim / avr_uart.c

diff --git a/simavr/sim/avr_uart.c b/simavr/sim/avr_uart.c
index 9fc5611..149d8b9 100644 (file)
--- a/simavr/sim/avr_uart.c
+++ b/simavr/sim/avr_uart.c
@@ -34,6 +34,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include "avr_uart.h"
 #include "sim_hex.h"
 
@@ -136,11 +137,11 @@ static void avr_uart_baud_write(struct avr_t * avr, avr_io_addr_t addr, uint8_t
        int sb = 1 + avr_regbit_get(avr, p->usbs);
        int word_size = 1 /* start */ + db /* data bits */ + 1 /* parity */ + sb /* stops */;
 
-       printf("UART-%c configured to %04x = %d bps (x%d), %d data %d stop\n",
+       AVR_LOG(avr, LOG_TRACE, "UART: %c configured to %04x = %d bps (x%d), %d data %d stop\n",
                        p->name, val, baud, avr_regbit_get(avr, p->u2x)?2:1, db, sb);
        // TODO: Use the divider value and calculate the straight number of cycles
        p->usec_per_byte = 1000000 / (baud / word_size);
-       printf("Roughtly %d usec per bytes\n", (int)p->usec_per_byte);
+       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)
@@ -156,17 +157,18 @@ static void avr_uart_write(struct avr_t * avr, avr_io_addr_t addr, uint8_t v, vo
                                p->usec_per_byte, avr_uart_txc_raise, p); // should be uart speed dependent
 
                if (p->flags & AVR_UART_FLAG_STDIO) {
-                       static char buf[128];
-                       static int l = 0;
-                       buf[l++] = v < ' ' ? '.' : v;
-                       buf[l] = 0;
-                       if (v == '\n' || l == 127) {
-                               l = 0;
-                               printf( FONT_GREEN "%s\n" FONT_DEFAULT, buf);
+                       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 "outputing" a byte
+               // 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);
        }
@@ -190,9 +192,8 @@ static void avr_uart_write(struct avr_t * avr, avr_io_addr_t addr, uint8_t v, vo
                //uint8_t udre = avr_regbit_get(avr, p->udrc.raised);
                uint8_t txc = avr_regbit_get(avr, p->txc.raised);
 
-               // no need to write this value in here, only the
-               // interrupt flags need clearing!
-               // avr_core_watch_write(avr, addr, v);
+                // required for u2x (double uart transmission speed)
+               avr_core_watch_write(avr, addr, v);
 
                //avr_clear_interrupt_if(avr, &p->udrc, udre);
                avr_clear_interrupt_if(avr, &p->txc, txc);
@@ -204,7 +205,7 @@ static void avr_uart_irq_input(struct avr_irq_t * irq, uint32_t value, void * pa
        avr_uart_t * p = (avr_uart_t *)param;
        avr_t * avr = p->io.avr;
 
-       // check to see fi receiver is enabled
+       // check to see if receiver is enabled
        if (!avr_regbit_get(avr, p->rxen))
                return;
 
@@ -230,7 +231,10 @@ void avr_uart_reset(struct avr_io_t *io)
        avr_cycle_timer_cancel(avr, avr_uart_txc_raise, p);
        uart_fifo_reset(&p->input);
 
-       // DEBUG allow printf without fidding with enabling the uart
+        avr_regbit_set(avr, p->ucsz);
+        avr_regbit_clear(avr, p->ucsz2);
+
+       // DEBUG allow printf without fiddling with enabling the uart
        avr_regbit_set(avr, p->txen);
        p->usec_per_byte = 100;
 }