X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2Fao_arch_funcs.h;h=d2cc11201a7e7c550d36985d9ef0df871d61764e;hb=ac2003b9556595db12e1fc671ef6226c56b777ad;hp=8f4f6cd4ce9e70658a64a352ab81b7a3ca015df2;hpb=341157c7415fcf879696c9d8167722a0c5ff264c;p=fw%2Faltos

diff --git a/src/stm/ao_arch_funcs.h b/src/stm/ao_arch_funcs.h
index 8f4f6cd4..d2cc1120 100644
--- a/src/stm/ao_arch_funcs.h
+++ b/src/stm/ao_arch_funcs.h
@@ -182,8 +182,8 @@ ao_spi_try_get_mask(struct stm_gpio *reg, uint16_t mask, uint8_t bus, uint32_t s
 		ao_spi_put(bus);		\
 	} while (0)
 
-#define ao_spi_get_bit(reg,bit,bus,speed) ao_spi_get_mask(reg,(1<<bit),bus,speed)
-#define ao_spi_put_bit(reg,bit,bus) ao_spi_put_mask(reg,(1<<bit),bus)
+#define ao_spi_get_bit(reg,bit,bus,speed) ao_spi_get_mask(reg,1<<(bit),bus,speed)
+#define ao_spi_put_bit(reg,bit,bus) ao_spi_put_mask(reg,1<<(bit),bus)
 
 #define ao_enable_port(port) do {					\
 		if ((port) == &stm_gpioa)				\
@@ -239,7 +239,7 @@ ao_spi_try_get_mask(struct stm_gpio *reg, uint16_t mask, uint8_t bus, uint32_t s
 #define AO_OUTPUT_PUSH_PULL	STM_OTYPER_PUSH_PULL
 #define AO_OUTPUT_OPEN_DRAIN	STM_OTYPER_OPEN_DRAIN
 
-#define ao_gpio_set_output_mode(port,bit,mode) \
+#define ao_gpio_set_output_mode(port,pin,mode) \
 	stm_otyper_set(port, pin, mode)
 
 #define ao_gpio_set_mode(port,bit,mode) do {				\
@@ -562,8 +562,8 @@ ao_validate_cur_stack(void)
 
 	asm("mrs %0,psp" : "=&r" (psp));
 	if (ao_cur_task &&
-	    psp <= ao_cur_task->stack &&
-	    psp >= ao_cur_task->stack - 256)
+	    (psp <= ao_cur_task->stack8 ||
+	     psp >= ao_cur_task->stack8 + AO_STACK_SIZE))
 		ao_panic(AO_PANIC_STACK);
 }
 #endif