projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comply cpu names definition to real name.
[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 886b7d6d69f4a81f53d658ad05dedae1d4e5aa18..11d983d0cba55a1d1ab89c1c20209e22be21fbae 100644
(file)
--- a/
bertos/cpu/avr/drv/kdebug_avr.c
+++ b/
bertos/cpu/avr/drv/kdebug_avr.c
@@
-63,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
@@
-73,13
+73,18
@@
#define KDBG_UART0_BUS_TX do {} while (0)
#endif
#define KDBG_UART0_BUS_TX do {} while (0)
#endif
- #if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 || CPU_AVR_ATMEGA168
+ #if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 || CPU_AVR_ATMEGA1
281 || CPU_AVR_ATMEGA1
68
#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
@@
-227,7
+232,7
@@
INLINE void kdbg_hw_init(void)
/* Compute the baud rate */
uint16_t period = DIV_ROUND(CLOCK_FREQ / 16UL, CONFIG_KDEBUG_BAUDRATE) - 1;
/* Compute the baud rate */
uint16_t period = DIV_ROUND(CLOCK_FREQ / 16UL, CONFIG_KDEBUG_BAUDRATE) - 1;
- #if (CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128)
+ #if (CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128
|| CPU_AVR_ATMEGA1281
)
#if CONFIG_KDEBUG_PORT == 0
UBRR0H = (uint8_t)(period>>8);
UBRR0L = (uint8_t)period;
#if CONFIG_KDEBUG_PORT == 0
UBRR0H = (uint8_t)(period>>8);
UBRR0L = (uint8_t)period;
@@
-244,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;