X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fkdebug.c;h=dab377841d630edef6c4fcbc8ebc4b35aa22b916;hb=7ec832a1222f7efd9127d17c6ac979a4a3d4aebe;hp=04f6abc720ea3ad49a17be747517b4e2e32a6fed;hpb=258c7dc15d2c4815c0996fc98fdc0155d99adfea;p=bertos.git

diff --git a/drv/kdebug.c b/drv/kdebug.c
old mode 100755
new mode 100644
index 04f6abc7..dab37784
--- a/drv/kdebug.c
+++ b/drv/kdebug.c
@@ -1,9 +1,34 @@
 /**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2000, 2001, 2002 Bernardo Innocenti <bernie@codewiz.org>
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \brief General pourpose debug support for embedded systems (implementation).
@@ -15,6 +40,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.31  2007/06/07 14:25:30  batt
+ *#* Merge from project_ks
+ *#*
+ *#* Revision 1.30  2007/01/28 09:18:06  batt
+ *#* Merge from project_ks.
+ *#*
  *#* Revision 1.29  2006/11/23 13:19:39  batt
  *#* Add BitBanged serial debug console.
  *#*
@@ -50,7 +81,7 @@
  *#*/
 
 #include <cfg/debug.h>
-#include <cfg/cpu.h>
+#include <cpu/cpu.h>
 #include <cfg/macros.h> /* for BV() */
 #include <appconfig.h>
 #include <hw_cpu.h>     /* for CLOCK_FREQ */
@@ -60,6 +91,10 @@
 
 #ifdef _DEBUG
 
+#if CPU_HARVARD && !defined(_PROGMEM)
+	#error This module build correctly only in program memory!
+#endif
+
 #if defined(_EMUL)
 	#include <stdio.h>
 	#define KDBG_WAIT_READY()      do { /*nop*/ } while(0)
@@ -102,7 +137,7 @@
 		 */
 		#ifndef KDBG_UART0_BUS_INIT
 		#define KDBG_UART0_BUS_INIT  do { \
-				UCSR0B = BV(TXEN); \
+				UCSR0B = BV(TXEN0); \
 			} while (0)
 		#endif
 		#ifndef KDBG_UART0_BUS_RX
@@ -112,7 +147,7 @@
 		#define KDBG_UART0_BUS_TX    do {} while (0)
 		#endif
 
-		#if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128
+		#if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 || CPU_AVR_ATMEGA168
 			#define UCR UCSR0B
 			#define UDR UDR0
 			#define USR UCSR0A
@@ -123,8 +158,8 @@
 			#error Unknown CPU
 		#endif
 
-		#define KDBG_WAIT_READY()     do { loop_until_bit_is_set(USR, UDRE); } while(0)
-		#define KDBG_WAIT_TXDONE()    do { loop_until_bit_is_set(USR, TXC); } while(0)
+		#define KDBG_WAIT_READY()     do { loop_until_bit_is_set(USR, UDRE0); } while(0)
+		#define KDBG_WAIT_TXDONE()    do { loop_until_bit_is_set(USR, TXC0); } while(0)
 
 		/*
 		 * We must clear the TXC flag before sending a new character to allow
@@ -135,12 +170,12 @@
 		 * character is written to UDR.  On a 485 bus, the transceiver will be put
 		 * in RX mode while still transmitting the last char.
 		 */
-		#define KDBG_WRITE_CHAR(c)    do { USR |= BV(TXC); UDR = (c); } while(0)
+		#define KDBG_WRITE_CHAR(c)    do { USR |= BV(TXC0); UDR = (c); } while(0)
 
 		#define KDBG_MASK_IRQ(old)    do { \
 			(old) = UCR; \
-			UCR |= BV(TXEN); \
-			UCR &= ~(BV(TXCIE) | BV(UDRIE)); \
+			UCR |= BV(TXEN0); \
+			UCR &= ~(BV(TXCIE0) | BV(UDRIE0)); \
 			KDBG_UART0_BUS_TX; \
 		} while(0)
 
@@ -165,7 +200,7 @@
 		 */
 		#ifndef KDBG_UART1_BUS_INIT
 		#define KDBG_UART1_BUS_INIT  do { \
-				UCSR1B = BV(TXEN); \
+				UCSR1B = BV(TXEN1); \
 			} while (0)
 		#endif
 		#ifndef KDBG_UART1_BUS_RX
@@ -175,14 +210,14 @@
 		#define KDBG_UART1_BUS_TX    do {} while (0)
 		#endif
 
-		#define KDBG_WAIT_READY()     do { loop_until_bit_is_set(UCSR1A, UDRE); } while(0)
-		#define KDBG_WAIT_TXDONE()    do { loop_until_bit_is_set(UCSR1A, TXC); } while(0)
-		#define KDBG_WRITE_CHAR(c)    do { UCSR1A |= BV(TXC); UDR1 = (c); } while(0)
+		#define KDBG_WAIT_READY()     do { loop_until_bit_is_set(UCSR1A, UDRE1); } while(0)
+		#define KDBG_WAIT_TXDONE()    do { loop_until_bit_is_set(UCSR1A, TXC1); } while(0)
+		#define KDBG_WRITE_CHAR(c)    do { UCSR1A |= BV(TXC1); UDR1 = (c); } while(0)
 
 		#define KDBG_MASK_IRQ(old)    do { \
 			(old) = UCSR1B; \
-			UCSR1B |= BV(TXEN); \
-			UCSR1B &= ~(BV(TXCIE) | BV(UDRIE)); \
+			UCSR1B |= BV(TXEN1); \
+			UCSR1B &= ~(BV(TXCIE1) | BV(UDRIE1)); \
 			KDBG_UART1_BUS_TX; \
 		} while(0)
 
@@ -205,7 +240,7 @@
 		#define KDBG_RESTORE_IRQ(old)  do { IRQ_RESTORE((old)); } while(0)
 		typedef cpuflags_t kdbg_irqsave_t;
 
-		#define KDBG_DELAY (((CLOCK_FREQ + CONFIG_KDEBUG_BAUDRATE / 2) / CONFIG_KDEBUG_BAUDRATE) + 12) / 24
+		#define KDBG_DELAY (((CLOCK_FREQ + CONFIG_KDEBUG_BAUDRATE / 2) / CONFIG_KDEBUG_BAUDRATE) + 7) / 14
 
 		static void _kdebug_bitbang_delay(void)
 		{
@@ -218,11 +253,6 @@
 				NOP;
 				NOP;
 				NOP;
-				NOP;
-				NOP;
-				NOP;
-				NOP;
-				NOP;
 			}
 		}
 	#else
@@ -248,7 +278,7 @@
 	/**
 	 * Putchar for BITBANG serial debug console.
 	 * Sometimes, we can't permit to use a whole serial for debugging purpose.
-	 * Since debug console is in output only it is usefull to a single generic I/O pin for debug.
+	 * Since debug console is in output only it is usefull to use a single generic I/O pin for debug.
 	 * This is achieved by this simple function, that shift out the data like a UART, but
 	 * in software :)
 	 * The only requirement is that SER_BITBANG_* macros will be defined somewhere (usually hw_ser.h)
@@ -257,24 +287,25 @@
 	static void _kdebug_bitbang_putchar(char c)
 	{
 		int i;
+		uint16_t data = c;
 
-		/* Start bit */
-		SER_BITBANG_LOW;
-		_kdebug_bitbang_delay();
+		/* Add stop bit */
+		data |= 0x0100;
+
+		/* Add start bit*/
+		data <<= 1;
 
 		/* Shift out data */
-		for (i = 0; i < 8; i++)
+		uint16_t shift = 1;
+		for (i = 0; i < 10; i++)
 		{
-			if (c & BV(i))
+			if (data & shift)
 				SER_BITBANG_HIGH;
 			else
 				SER_BITBANG_LOW;
 			_kdebug_bitbang_delay();
+			shift <<= 1;
 		}
-
-		/* Stop bit */
-		SER_BITBANG_HIGH;
-		_kdebug_bitbang_delay();
 	}
 #endif
 
@@ -300,7 +331,7 @@ void kdbg_init(void)
 		/* Compute the baud rate */
 		uint16_t period = (((CLOCK_FREQ / 16UL) + (CONFIG_KDEBUG_BAUDRATE / 2)) / CONFIG_KDEBUG_BAUDRATE) - 1;
 
-		#if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128
+		#if (CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128)
 			#if CONFIG_KDEBUG_PORT == 0
 				UBRR0H = (uint8_t)(period>>8);
 				UBRR0L = (uint8_t)period;
@@ -312,6 +343,11 @@ void kdbg_init(void)
 			#else
 				#error CONFIG_KDEBUG_PORT must be either 0 or 1
 			#endif
+
+		#elif CPU_AVR_ATMEGA168
+			UBRR0H = (uint8_t)(period>>8);
+			UBRR0L = (uint8_t)period;
+			KDBG_UART0_BUS_INIT;
 		#elif CPU_AVR_ATMEGA8
 			UBRRH = (uint8_t)(period>>8);
 			UBRRL = (uint8_t)period;