X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fkdebug.c;h=e631eabb4d09683f123e321d79ac84d51719d9a6;hb=8e90a9cdc1bf5a30c92edcc218e9cc16327d7d21;hp=5f5dc44ecd43c11dfd433febdd8a9051c88a9207;hpb=96f0ef786b54356c56cc3d4e4f0838df2505cfcc;p=bertos.git

diff --git a/drv/kdebug.c b/drv/kdebug.c
index 5f5dc44e..e631eabb 100755
--- a/drv/kdebug.c
+++ b/drv/kdebug.c
@@ -16,6 +16,17 @@
 
 /*
  * $Log$
+ * 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;
+ * Some spacing cleanups and typo fix
+ *
+ * Revision 1.4  2004/06/06 18:09:51  bernie
+ * Import DSP56800 changes; Print broken wall bricks in hex.
+ *
  * Revision 1.3  2004/06/03 11:27:09  bernie
  * Add dual-license information.
  *
@@ -51,10 +62,13 @@
 #elif defined(__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)
@@ -68,6 +82,14 @@
 	#else
 		#error CONFIG_KDEBUG_PORT should be either 0 or 1
 	#endif
+#elif defined(__MWERKS__) && (defined(__m56800E__) || defined(__m56800__))
+	/* Debugging go through the JTAG interface. The MSL library already
+	   implements the console I/O correctly. */
+	#include <stdio.h>
+	#define KDBG_WAIT_READY()
+	#define KDBG_WRITE_CHAR(c)        do { char ch=c; fwrite(&ch,1,1,stdout); } while (0)
+	#define KDBG_MASK_IRQ(old)
+	#define KDBG_RESTORE_IRQ(old)
 #else
 	#error Unknown architecture
 #endif
@@ -90,26 +112,21 @@ void kdbg_init(void)
 	/* 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
@@ -123,7 +140,7 @@ void kdbg_init(void)
 /*!
  * Output one character to the debug console
  */
-static void kputchar(char c, UNUSED(void *unused))
+static void kputchar(char c, UNUSED(void *, unused))
 {
 	/* Poll while serial buffer is still busy */
 	KDBG_WAIT_READY();
@@ -206,7 +223,7 @@ int __check_wall(long *wall, int size, const char *name, const char *file, int l
 	{
 		if (wall[i] != WALL_VALUE)
 		{
-			kprintf("%s:%d: Wall broken: %s[%d] (0x%p) = %ld\n",
+			kprintf("%s:%d: Wall broken: %s[%d] (0x%p) = 0x%lx\n",
 				file, line, name, i, wall + i, wall[i]);
 			fail = 1;
 		}