projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename CLOCK_FREQ macro to CPU_FREQ: now clock frequency has to be set in the makefile.
[bertos.git]
/
bertos
/
cpu
/
arm
/
drv
/
ser_at91.c
diff --git
a/bertos/cpu/arm/drv/ser_at91.c
b/bertos/cpu/arm/drv/ser_at91.c
index c3c897cd1ec7e4100c66c5781f7b8b8ab35fd035..fcbcafbdb6202b94b26e4ca6e48510092520880f 100644
(file)
--- a/
bertos/cpu/arm/drv/ser_at91.c
+++ b/
bertos/cpu/arm/drv/ser_at91.c
@@
-39,7
+39,7
@@
*/
#include "hw/hw_ser.h" /* Required for bus macros overrides */
*/
#include "hw/hw_ser.h" /* Required for bus macros overrides */
-#include
"hw/hw_cpu.h" /* CLOCK
_FREQ */
+#include
<hw/hw_cpufreq.h> /* CPU
_FREQ */
#include "cfg/cfg_ser.h"
#include <cfg/debug.h>
#include "cfg/cfg_ser.h"
#include <cfg/debug.h>
@@
-326,7
+326,7
@@
static void uart0_enabletxirq(struct SerialHardware *_hw)
static void uart0_setbaudrate(UNUSED_ARG(struct SerialHardware *, _hw), unsigned long rate)
{
/* Compute baud-rate period */
static void uart0_setbaudrate(UNUSED_ARG(struct SerialHardware *, _hw), unsigned long rate)
{
/* Compute baud-rate period */
- US0_BRGR = C
LOCK
_FREQ / (16 * rate);
+ US0_BRGR = C
PU
_FREQ / (16 * rate);
//DB(kprintf("uart0_setbaudrate(rate=%lu): period=%d\n", rate, period);)
}
//DB(kprintf("uart0_setbaudrate(rate=%lu): period=%d\n", rate, period);)
}
@@
-421,7
+421,7
@@
static void uart1_enabletxirq(struct SerialHardware *_hw)
static void uart1_setbaudrate(UNUSED_ARG(struct SerialHardware *, _hw), unsigned long rate)
{
/* Compute baud-rate period */
static void uart1_setbaudrate(UNUSED_ARG(struct SerialHardware *, _hw), unsigned long rate)
{
/* Compute baud-rate period */
- US1_BRGR = C
LOCK
_FREQ / (16 * rate);
+ US1_BRGR = C
PU
_FREQ / (16 * rate);
//DB(kprintf("uart0_setbaudrate(rate=%lu): period=%d\n", rate, period);)
}
//DB(kprintf("uart0_setbaudrate(rate=%lu): period=%d\n", rate, period);)
}
@@
-534,8
+534,8
@@
static void spi0_setbaudrate(UNUSED_ARG(struct SerialHardware *, _hw), unsigned
{
SPI0_CSR0 &= ~SPI_SCBR;
{
SPI0_CSR0 &= ~SPI_SCBR;
- ASSERT((uint8_t)DIV_ROUND(C
LOCK
_FREQ, rate));
- SPI0_CSR0 |= DIV_ROUND(C
LOCK
_FREQ, rate) << SPI_SCBR_SHIFT;
+ ASSERT((uint8_t)DIV_ROUND(C
PU
_FREQ, rate));
+ SPI0_CSR0 |= DIV_ROUND(C
PU
_FREQ, rate) << SPI_SCBR_SHIFT;
}
#if CPU_ARM_AT91SAM7X128 || CPU_ARM_AT91SAM7X256
}
#if CPU_ARM_AT91SAM7X128 || CPU_ARM_AT91SAM7X256
@@
-618,8
+618,8
@@
static void spi1_setbaudrate(UNUSED_ARG(struct SerialHardware *, _hw), unsigned
{
SPI1_CSR0 &= ~SPI_SCBR;
{
SPI1_CSR0 &= ~SPI_SCBR;
- ASSERT((uint8_t)DIV_ROUND(C
LOCK
_FREQ, rate));
- SPI1_CSR0 |= DIV_ROUND(C
LOCK
_FREQ, rate) << SPI_SCBR_SHIFT;
+ ASSERT((uint8_t)DIV_ROUND(C
PU
_FREQ, rate));
+ SPI1_CSR0 |= DIV_ROUND(C
PU
_FREQ, rate) << SPI_SCBR_SHIFT;
}
#endif
}
#endif