projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial support for ATmega328P (Arduino Duemilanove).
[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 d8e146372352c158242b41499194990788a63342..4cdaf94e8bcab4da6641ef2fc3b1f5d4a7ac4fe3 100644
(file)
--- a/
bertos/cpu/avr/drv/kdebug_avr.c
+++ b/
bertos/cpu/avr/drv/kdebug_avr.c
@@
-39,7
+39,7
@@
* \author Francesco Sacchi <batt@develer.com>
*/
* \author Francesco Sacchi <batt@develer.com>
*/
-#include
"hw/hw_cpu.h" /* for CLOCK
_FREQ */
+#include
<hw/hw_cpufreq.h> /* for CPU
_FREQ */
#include "hw/hw_ser.h" /* Required for bus macros overrides */
#include "cfg/cfg_debug.h"
#include "hw/hw_ser.h" /* Required for bus macros overrides */
#include "cfg/cfg_debug.h"
@@
-73,7
+73,7
@@
#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_ATMEGA1281 || CPU_AVR_ATMEGA168
+ #if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 || CPU_AVR_ATMEGA1281 || CPU_AVR_ATMEGA168
|| CPU_AVR_ATMEGA328P
#define UCR UCSR0B
#define UDR UDR0
#define USR UCSR0A
#define UCR UCSR0B
#define UDR UDR0
#define USR UCSR0A
@@
-171,7
+171,7
@@
#define KDBG_RESTORE_IRQ(old) do { IRQ_RESTORE((old)); } while(0)
typedef cpu_flags_t kdbg_irqsave_t;
#define KDBG_RESTORE_IRQ(old) do { IRQ_RESTORE((old)); } while(0)
typedef cpu_flags_t kdbg_irqsave_t;
- #define KDBG_DELAY (((C
LOCK
_FREQ + CONFIG_KDEBUG_BAUDRATE / 2) / CONFIG_KDEBUG_BAUDRATE) + 7) / 14
+ #define KDBG_DELAY (((C
PU
_FREQ + CONFIG_KDEBUG_BAUDRATE / 2) / CONFIG_KDEBUG_BAUDRATE) + 7) / 14
static void _kdebug_bitbang_delay(void)
{
static void _kdebug_bitbang_delay(void)
{
@@
-230,7
+230,7
@@
INLINE void kdbg_hw_init(void)
SER_BITBANG_INIT;
#else /* CONFIG_KDEBUG_PORT != 666 */
/* Compute the baud rate */
SER_BITBANG_INIT;
#else /* CONFIG_KDEBUG_PORT != 666 */
/* Compute the baud rate */
- uint16_t period = DIV_ROUND(C
LOCK
_FREQ / 16UL, CONFIG_KDEBUG_BAUDRATE) - 1;
+ uint16_t period = DIV_ROUND(C
PU
_FREQ / 16UL, CONFIG_KDEBUG_BAUDRATE) - 1;
#if (CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 || CPU_AVR_ATMEGA1281)
#if CONFIG_KDEBUG_PORT == 0
#if (CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 || CPU_AVR_ATMEGA1281)
#if CONFIG_KDEBUG_PORT == 0
@@
-245,7
+245,7
@@
INLINE void kdbg_hw_init(void)
#error CONFIG_KDEBUG_PORT must be either 0 or 1
#endif
#error CONFIG_KDEBUG_PORT must be either 0 or 1
#endif
- #elif CPU_AVR_ATMEGA168
+ #elif CPU_AVR_ATMEGA168
|| CPU_AVR_ATMEGA328P
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;