X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstmf0%2Fao_arch_funcs.h;h=3db96be238c1c63586fbe75916fbf60fe9f29d7b;hb=426bacbbd6e0573b143e7c48d71db977e53181fc;hp=2f2f8f43f440b07e631ded508b6b66ca872bec39;hpb=02f03df6d089cafae99f8ce15dcbd87f6e78d749;p=fw%2Faltos

diff --git a/src/stmf0/ao_arch_funcs.h b/src/stmf0/ao_arch_funcs.h
index 2f2f8f43..3db96be2 100644
--- a/src/stmf0/ao_arch_funcs.h
+++ b/src/stmf0/ao_arch_funcs.h
@@ -120,31 +120,26 @@ ao_spi_try_get_mask(struct stm_gpio *reg, uint16_t mask, uint8_t bus, uint32_t s
 
 #define ao_enable_port(port) do {					\
 		if ((port) == &stm_gpioa)				\
-			stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOAEN); \
+			stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_IOPAEN); \
 		else if ((port) == &stm_gpiob)				\
-			stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOBEN); \
+			stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_IOPBEN); \
 		else if ((port) == &stm_gpioc)				\
-			stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOCEN); \
-		else if ((port) == &stm_gpiod)				\
-			stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIODEN); \
-		else if ((port) == &stm_gpioe)				\
-			stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOEEN); \
+			stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_IOPCEN); \
+		else if ((port) == &stm_gpiof)				\
+			stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_IOPFEN); \
 	} while (0)
 
 #define ao_disable_port(port) do {					\
 		if ((port) == &stm_gpioa)				\
-			stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_GPIOAEN); \
+			stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_IOPAEN); \
 		else if ((port) == &stm_gpiob)				\
-			stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_GPIOBEN); \
+			stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_IOPBEN); \
 		else if ((port) == &stm_gpioc)				\
-			stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_GPIOCEN); \
-		else if ((port) == &stm_gpiod)				\
-			stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_GPIODEN); \
-		else if ((port) == &stm_gpioe)				\
-			stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_GPIOEEN); \
+			stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_IOPCEN); \
+		else if ((port) == &stm_gpiof)				\
+			stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_IOPFEN); \
 	} while (0)
 
-
 #define ao_gpio_set(port, bit, pin, v) stm_gpio_set(port, bit, v)
 
 #define ao_gpio_get(port, bit, pin) stm_gpio_get(port, bit)
@@ -163,7 +158,7 @@ ao_spi_try_get_mask(struct stm_gpio *reg, uint16_t mask, uint8_t bus, uint32_t s
 		else							\
 			stm_pupdr_set(port, bit, STM_PUPDR_NONE);	\
 	} while (0)
-	
+
 #define ao_enable_input(port,bit,mode) do {				\
 		ao_enable_port(port);					\
 		stm_moder_set(port, bit, STM_MODER_INPUT);		\
@@ -389,10 +384,17 @@ static inline void ao_arch_start_scheduler(void) {
 		ao_arch_irqrestore(__mask);		\
 	} while (0)
 
+/* ao_usb_stm.c */
+
+#if AO_USB_DIRECTIO
+uint16_t *
+ao_usb_alloc(void);
+
 void
-ao_clock_enable_crs(void);
+ao_usb_free(uint16_t *buffer);
 
 void
-ao_clock_disable_crs(void);
+ao_usb_write(uint16_t *buffer, uint16_t len);
+#endif /* AO_USB_DIRECTIO */
 
 #endif /* _AO_ARCH_FUNCS_H_ */