X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstmf0%2Fao_arch.h;h=1450545a10c015d9d33fd2c75f95d5f68eb57f07;hb=cb756983a26595a5d2f317a6693f9a670665c86a;hp=83277259b011f9cc77de33761011e532eca8259e;hpb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;p=fw%2Faltos

diff --git a/src/stmf0/ao_arch.h b/src/stmf0/ao_arch.h
index 83277259..1450545a 100644
--- a/src/stmf0/ao_arch.h
+++ b/src/stmf0/ao_arch.h
@@ -32,59 +32,37 @@
 
 #define AO_LED_TYPE	uint16_t
 
-#ifndef AO_TICK_TYPE
-#define AO_TICK_TYPE	uint16_t
-#define AO_TICK_SIGNED	int16_t
-#endif
-
 #define AO_PORT_TYPE	uint16_t
 
 /* Various definitions to make GCC look more like SDCC */
 
 #define ao_arch_naked_declare	__attribute__((naked))
 #define ao_arch_naked_define
-#define __pdata
-#define __data
-#define __xdata
-#define __code const
-#define __reentrant
 #define __interrupt(n)
 #define __at(n)
 
-#define ao_arch_reboot() \
-	(stm_scb.aircr = ((STM_SCB_AIRCR_VECTKEY_KEY << STM_SCB_AIRCR_VECTKEY) | \
-			  (1 << STM_SCB_AIRCR_SYSRESETREQ)))
+static inline void ao_arch_reboot(void) {
+	stm_flash.cr = (1 << STM_FLASH_CR_OBL_LAUNCH);
+	stm_scb.aircr = ((STM_SCB_AIRCR_VECTKEY_KEY << STM_SCB_AIRCR_VECTKEY) |
+			 (1 << STM_SCB_AIRCR_SYSRESETREQ));
+}
 
 #define ao_arch_nop()		asm("nop")
 
 #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
  */
 
-#define AO_ROMCONFIG_VERSION	2
-
-#define AO_ROMCONFIG_SYMBOL(a) __attribute__((section(".romconfig"))) const
+#define AO_ROMCONFIG_SYMBOL __attribute__((section(".init.1"))) const
+#define AO_USBCONFIG_SYMBOL __attribute__((section(".init.2"))) const
 
 extern const uint16_t ao_romconfig_version;
 extern const uint16_t ao_romconfig_check;
 extern const uint16_t ao_serial_number;
 extern const uint32_t ao_radio_cal;
 
-#define ao_arch_task_members\
-	uint32_t *sp;			/* saved stack pointer */
-
 #define ao_arch_block_interrupts()	asm("cpsid i")
 #define ao_arch_release_interrupts()	asm("cpsie i")
 
@@ -94,12 +72,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
 
@@ -115,21 +98,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
-#else
-#define AO_TIM23467_CLK		(2 * AO_PCLK1)
-#endif
-
-#if AO_APB2_PRESCALER == 1
-#define AO_TIM91011_CLK		AO_PCLK2
+#if AO_APB_PRESCALER == 1
+#define AO_TIM_CLK		AO_PCLK
 #else
-#define AO_TIM91011_CLK		(2 * AO_PCLK2)
+#define AO_TIM_CLK		(2 * AO_PCLK)
 #endif
 
 #define AO_STM_NVIC_HIGH_PRIORITY	(0 << 6)
@@ -146,15 +122,22 @@ void ao_lcd_font_string(char *s);
 extern const uint32_t	ao_radio_cal;
 
 void
-ao_adc_init();
+ao_adc_init(void);
 
 /* 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_ */