projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add another write test.
[bertos.git]
/
bertos
/
cpu
/
avr
/
drv
/
kdebug_avr.c
diff --git
a/bertos/cpu/avr/drv/kdebug_avr.c
b/bertos/cpu/avr/drv/kdebug_avr.c
index 35d0645d6867a61485ca708f3f5a3ce333a5fde1..53d91895560381dac1dcc48454d5f685b597370f 100644
(file)
--- a/
bertos/cpu/avr/drv/kdebug_avr.c
+++ b/
bertos/cpu/avr/drv/kdebug_avr.c
@@
-27,24
+27,26
@@
* the GNU General Public License.
*
* Copyright 2003, 2004, 2005, 2006, 2007 Develer S.r.l. (http://www.develer.com/)
* the GNU General Public License.
*
* Copyright 2003, 2004, 2005, 2006, 2007 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000, 2001, 2002 Bern
ardo
Innocenti <bernie@codewiz.org>
+ * Copyright 2000, 2001, 2002 Bern
ie
Innocenti <bernie@codewiz.org>
*
* -->
*
* \brief AVR debug support (implementation).
*
* \version $Id$
*
* -->
*
* \brief AVR debug support (implementation).
*
* \version $Id$
- * \author Bern
ardo Innocenti <bernie@develer.com
>
+ * \author Bern
ie Innocenti <bernie@codewiz.org
>
* \author Stefano Fedrigo <aleph@develer.com>
* \author Francesco Sacchi <batt@develer.com>
*/
* \author Stefano Fedrigo <aleph@develer.com>
* \author Francesco Sacchi <batt@develer.com>
*/
+#include "hw/hw_cpu.h" /* for CLOCK_FREQ */
+#include "hw/hw_ser.h" /* Required for bus macros overrides */
+
+#include "cfg/cfg_debug.h"
+#include <cfg/macros.h> /* for BV(), DIV_ROUND */
+
#include <cpu/types.h>
#include <cpu/attr.h>
#include <cpu/types.h>
#include <cpu/attr.h>
-#include <cfg/macros.h> /* for BV(), DIV_ROUND */
-#include <appconfig.h>
-#include <hw_cpu.h> /* for CLOCK_FREQ */
-#include <hw_ser.h> /* Required for bus macros overrides */
#include <avr/io.h>
#include <avr/io.h>
@@
-52,7
+54,7
@@
/*
* Support for special bus policies or external transceivers
/*
* Support for special bus policies or external transceivers
- * on UART0 (to be overridden in "hw_ser.h").
+ * on UART0 (to be overridden in "hw
/hw
_ser.h").
*
* HACK: if we don't set TXEN, kdbg disables the transmitter
* after each output statement until the serial driver
*
* HACK: if we don't set TXEN, kdbg disables the transmitter
* after each output statement until the serial driver
@@
-61,7
+63,7
@@
*/
#ifndef KDBG_UART0_BUS_INIT
#define KDBG_UART0_BUS_INIT do { \
*/
#ifndef KDBG_UART0_BUS_INIT
#define KDBG_UART0_BUS_INIT do { \
- UC
SR0B
= BV(TXEN0); \
+ UC
R
= BV(TXEN0); \
} while (0)
#endif
#ifndef KDBG_UART0_BUS_RX
} while (0)
#endif
#ifndef KDBG_UART0_BUS_RX
@@
-75,9
+77,14
@@
#define UCR UCSR0B
#define UDR UDR0
#define USR UCSR0A
#define UCR UCSR0B
#define UDR UDR0
#define USR UCSR0A
- #elif CPU_AVR_ATMEGA8
- #define UCR UCSRB
- #define USR UCSRA
+ #elif CPU_AVR_ATMEGA8 || CPU_AVR_ATMEGA32
+ #define UCR UCSRB
+ #define USR UCSRA
+ #define TXEN0 TXEN
+ #define UDRE0 UDRE
+ #define TXC0 TXC
+ #define TXCIE0 TXCIE
+ #define UDRIE0 UDRIE
#else
#error Unknown CPU
#endif
#else
#error Unknown CPU
#endif
@@
-115,7
+122,7
@@
/*
* Support for special bus policies or external transceivers
/*
* Support for special bus policies or external transceivers
- * on UART1 (to be overridden in "hw_ser.h").
+ * on UART1 (to be overridden in "hw
/hw
_ser.h").
*
* HACK: if we don't set TXEN, kdbg disables the transmitter
* after each output statement until the serial driver
*
* HACK: if we don't set TXEN, kdbg disables the transmitter
* after each output statement until the serial driver
@@
-157,12
+164,12
@@
* Special debug port for BitBanged Serial see below for details...
*/
#elif CONFIG_KDEBUG_PORT == 666
* Special debug port for BitBanged Serial see below for details...
*/
#elif CONFIG_KDEBUG_PORT == 666
- #include "hw_ser.h"
+ #include "hw
/hw
_ser.h"
#define KDBG_WAIT_READY() do { /*nop*/ } while(0)
#define KDBG_WRITE_CHAR(c) _kdebug_bitbang_putchar((c))
#define KDBG_MASK_IRQ(old) do { IRQ_SAVE_DISABLE((old)); } while(0)
#define KDBG_RESTORE_IRQ(old) do { IRQ_RESTORE((old)); } while(0)
#define KDBG_WAIT_READY() do { /*nop*/ } while(0)
#define KDBG_WRITE_CHAR(c) _kdebug_bitbang_putchar((c))
#define KDBG_MASK_IRQ(old) do { IRQ_SAVE_DISABLE((old)); } while(0)
#define KDBG_RESTORE_IRQ(old) do { IRQ_RESTORE((old)); } while(0)
- typedef cpuflags_t kdbg_irqsave_t;
+ typedef cpu
_
flags_t kdbg_irqsave_t;
#define KDBG_DELAY (((CLOCK_FREQ + CONFIG_KDEBUG_BAUDRATE / 2) / CONFIG_KDEBUG_BAUDRATE) + 7) / 14
#define KDBG_DELAY (((CLOCK_FREQ + CONFIG_KDEBUG_BAUDRATE / 2) / CONFIG_KDEBUG_BAUDRATE) + 7) / 14
@@
-242,9
+249,10
@@
INLINE void kdbg_hw_init(void)
UBRR0H = (uint8_t)(period>>8);
UBRR0L = (uint8_t)period;
KDBG_UART0_BUS_INIT;
UBRR0H = (uint8_t)(period>>8);
UBRR0L = (uint8_t)period;
KDBG_UART0_BUS_INIT;
- #elif CPU_AVR_ATMEGA8
+ #elif CPU_AVR_ATMEGA8
|| CPU_AVR_ATMEGA32
UBRRH = (uint8_t)(period>>8);
UBRRL = (uint8_t)period;
UBRRH = (uint8_t)(period>>8);
UBRRL = (uint8_t)period;
+ KDBG_UART0_BUS_INIT;
#elif CPU_AVR_ATMEGA103
UBRR = (uint8_t)period;
KDBG_UART0_BUS_INIT;
#elif CPU_AVR_ATMEGA103
UBRR = (uint8_t)period;
KDBG_UART0_BUS_INIT;
@@
-253,3
+261,4
@@
INLINE void kdbg_hw_init(void)
#endif
#endif /* CONFIG_KDEBUG_PORT == 666 */
}
#endif
#endif /* CONFIG_KDEBUG_PORT == 666 */
}
+