X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstmf0%2Fao_arch.h;h=db6324cbaf3c8b8032a753322f33af611fc38ab2;hb=670f214cf7d9b7186545e32a2880a8f51f71415c;hp=2597cadc735e8accb7285536d735386fa8069a76;hpb=3abc0fc5e4484d862709501133d35563aa0c25fa;p=fw%2Faltos

diff --git a/src/stmf0/ao_arch.h b/src/stmf0/ao_arch.h
index 2597cadc..db6324cb 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
@@ -58,16 +59,6 @@
 
 #define ao_arch_interrupt(n)	/* nothing */
 
-#undef putchar
-#undef getchar
-#define putchar(c)	ao_putchar(c)
-#define getchar		ao_getchar
-
-extern void putchar(char c);
-extern char getchar(void);
-extern void ao_avr_stdio_init(void);
-
-
 /*
  * ao_romconfig.c
  */
@@ -93,12 +84,17 @@ extern const uint32_t ao_radio_cal;
  * For the stm32f042, we want to use the USB-based HSI48 clock
  */
 
-#if AO_HSI48
+#ifndef AO_SYSCLK
+#if AO_HSI
+#define AO_SYSCLK	STM_HSI_FREQ
+#endif
 
+#if AO_HSI48
 #define AO_SYSCLK	48000000
-#define AO_HCLK		(AO_SYSCLK / AO_AHB_PRESCALER)
-
 #endif
+#endif
+
+#define AO_HCLK		(AO_SYSCLK / AO_AHB_PRESCALER)
 
 #if AO_HSE || AO_HSI
 
@@ -114,21 +110,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)
@@ -150,10 +139,17 @@ ao_adc_init();
 /* ADC maximum reported value */
 #define AO_ADC_MAX			4095
 
+#ifndef HAS_BOOT_LOADER
+#define HAS_BOOT_LOADER			1
+#endif
+
+#if HAS_BOOT_LOADER
 #define AO_BOOT_APPLICATION_BASE	((uint32_t *) 0x08001000)
+#ifndef AO_BOOT_APPLICATION_BOUND
 #define AO_BOOT_APPLICATION_BOUND	((uint32_t *) (0x08000000 + stm_flash_size()))
+#endif
 #define AO_BOOT_LOADER_BASE		((uint32_t *) 0x08000000)
-#define HAS_BOOT_LOADER			1
+#endif
 
 #endif /* _AO_ARCH_H_ */