Task switching con salvataggio perfetto stato di interrupt (SR)

[bertos.git] / drv / kdebug.c

diff --git a/drv/kdebug.c b/drv/kdebug.c
index 72445cf95eed70bed43022f930566133f1f43ca6..943148b3d7013978b6ec865428b968c8426426b2 100755 (executable)
--- a/drv/kdebug.c
+++ b/drv/kdebug.c
@@ -16,6 +16,12 @@
 
 /*
  * $Log$
+ * Revision 1.7  2004/07/30 14:15:53  rasky
+ * Nuovo supporto unificato per detect della CPU
+ *
+ * Revision 1.6  2004/07/18 21:49:28  bernie
+ * Add ATmega8 support.
+ *
  * Revision 1.5  2004/06/27 15:20:26  aleph
  * Change UNUSED() macro to accept two arguments: type and name;
  * Add macro GNUC_PREREQ to detect GCC version during build;
@@ -46,7 +52,7 @@
        #define KDBG_WRITE_CHAR(c)     putchar((c))
        #define KDBG_MASK_IRQ(old)     do {/*nop*/} while(0)
        #define KDBG_RESTORE_IRQ()     do {/*nop*/} while(0)
-#elif defined(__I196__)
+#elif CPU_I196
        #include "Util196.h"
        #define KDBG_WAIT_READY()      do {} while (!(SP_STAT & (SPSF_TX_EMPTY | SPSF_TX_INT)))
        #define KDBG_WRITE_CHAR(c)     do { SBUF = (c); } while(0)
@@ -56,13 +62,16 @@
                        INT_MASK1 &= ~INT1F_TI; \
                } while(0)
        #define KDBG_RESTORE_IRQ(old)  do { INT_MASK1 |= (old); }
-#elif defined(__AVR__)
+#elif CPU_AVR
        #include <avr/io.h>
        #if CONFIG_KDEBUG_PORT == 0
-               #ifndef __AVR_ATmega103__
+               #if defined(__AVR_ATmega64__)
                        #define UCR UCSR0B
                        #define UDR UDR0
                        #define USR UCSR0A
+               #elif defined(__AVR_ATmega8__)
+                       #define UCR UCSRB
+                       #define USR UCSRA
                #endif
                #define KDBG_WAIT_READY()     do { loop_until_bit_is_set(USR, UDRE); } while(0)
                #define KDBG_WRITE_CHAR(c)    do { UCR |= BV(TXEN); UDR = (c); } while(0)
@@ -76,7 +85,7 @@
        #else
                #error CONFIG_KDEBUG_PORT should be either 0 or 1
        #endif
-#elif defined(__MWERKS__) && (defined(__m56800E__) || defined(__m56800__))
+#elif defined(__MWERKS__) && CPU_DSP56K
        /* Debugging go through the JTAG interface. The MSL library already
           implements the console I/O correctly. */
        #include <stdio.h>
@@ -91,7 +100,7 @@
 
 void kdbg_init(void)
 {
-#if defined(__I196__)
+#if CPU_I196
 
        /* Set serial port for 19200bps 8N1 */
        INT_MASK1 &= ~(INT1F_TI | INT1F_RI);
@@ -101,36 +110,31 @@ void kdbg_init(void)
        BAUD_RATE = 0x33;
        BAUD_RATE = 0x80;
 
-#elif defined(__AVR__)
+#elif CPU_AVR
 
        /* Compute the baud rate */
        uint16_t period = (((CLOCK_FREQ / 16UL) + (CONFIG_KDEBUG_BAUDRATE / 2)) / CONFIG_KDEBUG_BAUDRATE) - 1;
 
-       #ifdef __AVR_ATmega64__
+       #if defined(__AVR_ATmega64__)
                #if CONFIG_KDEBUG_PORT == 0
-
-                       /* Set the baud rate */
                        UBRR0H = (uint8_t)(period>>8);
                        UBRR0L = (uint8_t)period;
-
                #elif CONFIG_KDEBUG_PORT == 1
-
                        UBRR1H = (uint8_t)(period>>8);
                        UBRR1L = (uint8_t)period;
-
                #else
-                       #error CONFIG_KDEBUG_PORT should be either 0 or 1
+                       #error CONFIG_KDEBUG_PORT must be either 0 or 1
                #endif
-       #elif defined (__AVR_ATmega103__)
-
-               /* Set the baud rate */
+       #elif defined(__AVR_ATmega8__)
+               UBRRH = (uint8_t)(period>>8);
+               UBRRL = (uint8_t)period;
+       #elif defined(__AVR_ATmega103__)
                UBRR = (uint8_t)period;
-
        #else
                #error Unknown arch
        #endif
 
-#endif /* !__I196__ && !__AVR__ */
+#endif /* !CPU_I196 && !CPU_AVR */
 
        kputs("\n\n*** DBG START ***\n");
 }