diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-09-05 21:01:35 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-09-05 21:01:35 -0600 |
| commit | 6af87e5cf98e644d2455faf6526a9f11880686f5 (patch) | |
| tree | d23017ea0a0fd693cbef18979c35cfca7ce1db69 /src/stmf0/ao_arch.h | |
| parent | 6ec9f2a78aa8c99d48006b14c936c59edd08addf (diff) | |
| parent | 168c39a37415b1bdc09aa00bbaaafb5d879ce8bd (diff) | |
Merge branch 'branch-1.6' into debian
Diffstat (limited to 'src/stmf0/ao_arch.h')
| -rw-r--r-- | src/stmf0/ao_arch.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/stmf0/ao_arch.h b/src/stmf0/ao_arch.h index 2597cadc..a36482b6 100644 --- a/src/stmf0/ao_arch.h +++ b/src/stmf0/ao_arch.h @@ -3,7 +3,8 @@ * * This program 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; version 2 of the License. + * 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 @@ -114,21 +115,14 @@ extern const uint32_t ao_radio_cal; #endif #define AO_HCLK (AO_SYSCLK / AO_AHB_PRESCALER) -#define AO_PCLK1 (AO_HCLK / AO_APB1_PRESCALER) -#define AO_PCLK2 (AO_HCLK / AO_APB2_PRESCALER) +#define AO_PCLK (AO_HCLK / AO_APB_PRESCALER) #define AO_SYSTICK (AO_HCLK) #define AO_PANIC_DELAY_SCALE (AO_SYSCLK / 12000000) -#if AO_APB1_PRESCALER == 1 -#define AO_TIM23467_CLK AO_PCLK1 +#if AO_APB_PRESCALER == 1 +#define AO_TIM_CLK AO_PCLK #else -#define AO_TIM23467_CLK (2 * AO_PCLK1) -#endif - -#if AO_APB2_PRESCALER == 1 -#define AO_TIM91011_CLK AO_PCLK2 -#else -#define AO_TIM91011_CLK (2 * AO_PCLK2) +#define AO_TIM_CLK (2 * AO_PCLK) #endif #define AO_STM_NVIC_HIGH_PRIORITY (0 << 6) |