X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstmf0%2Fstm32f0.h;h=968c1295cda4072e2c7cc0766dd8efeecadf07ca;hb=f16d1e3a2f074b96aae6b9053e8e9e03bd282741;hp=182cd9639df0af69ede15503542f88be7dec15bb;hpb=148f6e0a107d9e88509958700351794f2f971312;p=fw%2Faltos

diff --git a/src/stmf0/stm32f0.h b/src/stmf0/stm32f0.h
index 182cd963..968c1295 100644
--- a/src/stmf0/stm32f0.h
+++ b/src/stmf0/stm32f0.h
@@ -282,8 +282,8 @@ struct stm_rcc {
 
 extern struct stm_rcc stm_rcc;
 
-/* Nominal high speed internal oscillator frequency is 16MHz */
-#define STM_HSI_FREQ		16000000
+/* Nominal high speed internal oscillator frequency is 8MHz */
+#define STM_HSI_FREQ		8000000
 
 #define STM_RCC_CR_PLLRDY	(25)
 #define STM_RCC_CR_PLLON	(24)
@@ -1812,15 +1812,15 @@ extern struct stm_tim23 stm_tim2, stm_tim3;
 
 #define STM_TIM23_CCMR2_OC4CE	15
 #define STM_TIM23_CCMR2_OC4M	12
-#define  STM_TIM23_CCMR2_OCM_FROZEN			0
-#define  STM_TIM23_CCMR2_OCM_SET_HIGH_ON_MATCH	1
-#define  STM_TIM23_CCMR2_OCM_SET_LOW_ON_MATCH		2
-#define  STM_TIM23_CCMR2_OCM_TOGGLE			3
-#define  STM_TIM23_CCMR2_OCM_FORCE_LOW			4
-#define  STM_TIM23_CCMR2_OCM_FORCE_HIGH			5
-#define  STM_TIM23_CCMR2_OCM_PWM_MODE_1			6
-#define  STM_TIM23_CCMR2_OCM_PWM_MODE_2			7
-#define  STM_TIM23_CCMR2_OCM_MASK			7
+#define  STM_TIM23_CCMR2_OC4M_FROZEN			0
+#define  STM_TIM23_CCMR2_OC4M_SET_HIGH_ON_MATCH	1
+#define  STM_TIM23_CCMR2_OC4M_SET_LOW_ON_MATCH		2
+#define  STM_TIM23_CCMR2_OC4M_TOGGLE			3
+#define  STM_TIM23_CCMR2_OC4M_FORCE_LOW			4
+#define  STM_TIM23_CCMR2_OC4M_FORCE_HIGH		5
+#define  STM_TIM23_CCMR2_OC4M_PWM_MODE_1		6
+#define  STM_TIM23_CCMR2_OC4M_PWM_MODE_2		7
+#define  STM_TIM23_CCMR2_OC4M_MASK			7
 #define STM_TIM23_CCMR2_OC4PE	11
 #define STM_TIM23_CCMR2_OC4FE	10
 #define STM_TIM23_CCMR2_CC4S	8
@@ -1832,15 +1832,15 @@ extern struct stm_tim23 stm_tim2, stm_tim3;
 
 #define STM_TIM23_CCMR2_OC3CE	7
 #define STM_TIM23_CCMR2_OC3M	4
-#define  STM_TIM23_CCMR2_OCM_FROZEN			0
-#define  STM_TIM23_CCMR2_OCM_SET_HIGH_ON_MATCH		1
-#define  STM_TIM23_CCMR2_OCM_SET_LOW_ON_MATCH		2
-#define  STM_TIM23_CCMR2_OCM_TOGGLE			3
-#define  STM_TIM23_CCMR2_OCM_FORCE_LOW			4
-#define  STM_TIM23_CCMR2_OCM_FORCE_HIGH			5
+#define  STM_TIM23_CCMR2_OC3M_FROZEN			0
+#define  STM_TIM23_CCMR2_OC3M_SET_HIGH_ON_MATCH		1
+#define  STM_TIM23_CCMR2_OC3M_SET_LOW_ON_MATCH		2
+#define  STM_TIM23_CCMR2_OC3M_TOGGLE			3
+#define  STM_TIM23_CCMR2_OC3M_FORCE_LOW			4
+#define  STM_TIM23_CCMR2_OC3M_FORCE_HIGH		5
 #define  STM_TIM23_CCMR2_OC3M_PWM_MODE_1		6
-#define  STM_TIM23_CCMR2_OCM_PWM_MODE_2			7
-#define  STM_TIM23_CCMR2_OCM_MASK			7
+#define  STM_TIM23_CCMR2_OC3M_PWM_MODE_2		7
+#define  STM_TIM23_CCMR2_OC3M_MASK			7
 #define STM_TIM23_CCMR2_OC3PE	11
 #define STM_TIM23_CCMR2_OC3FE	2
 #define STM_TIM23_CCMR2_CC3S	0
@@ -1890,6 +1890,7 @@ extern struct stm_usb stm_usb;
 #define STM_USB_EPR_CTR_RX	15
 #define  STM_USB_EPR_CTR_RX_WRITE_INVARIANT		1
 #define STM_USB_EPR_DTOG_RX	14
+#define STM_USB_EPR_SW_BUF_TX	14
 #define STM_USB_EPR_DTOG_RX_WRITE_INVARIANT		0
 #define STM_USB_EPR_STAT_RX	12
 #define  STM_USB_EPR_STAT_RX_DISABLED			0
@@ -1906,11 +1907,14 @@ extern struct stm_usb stm_usb;
 #define  STM_USB_EPR_EP_TYPE_INTERRUPT			3
 #define  STM_USB_EPR_EP_TYPE_MASK			3
 #define STM_USB_EPR_EP_KIND	8
+#define  STM_USB_EPR_EP_KIND_SNGL_BUF			0	/* Bulk */
 #define  STM_USB_EPR_EP_KIND_DBL_BUF			1	/* Bulk */
+#define  STM_USB_EPR_EP_KIND_NO_STATUS_OUT		0	/* Control */
 #define  STM_USB_EPR_EP_KIND_STATUS_OUT			1	/* Control */
 #define STM_USB_EPR_CTR_TX	7
 #define  STM_USB_CTR_TX_WRITE_INVARIANT			1
 #define STM_USB_EPR_DTOG_TX	6
+#define STM_USB_EPR_SW_BUF_RX	6
 #define  STM_USB_EPR_DTOG_TX_WRITE_INVARIANT		0
 #define STM_USB_EPR_STAT_TX	4
 #define  STM_USB_EPR_STAT_TX_DISABLED			0
@@ -1996,7 +2000,12 @@ union stm_usb_bdt {
 
 #define STM_USB_BDT_SIZE	8
 
-extern uint8_t stm_usb_sram[];
+/* We'll use the first block of usb SRAM for the BDT */
+extern uint8_t stm_usb_sram[] __attribute__((aligned(4)));
+extern union stm_usb_bdt stm_usb_bdt[STM_USB_BDT_SIZE] __attribute__((aligned(4)));
+
+#define stm_usb_sram	((uint8_t *) 0x40006000)
+#define stm_usb_bdt	((union stm_usb_bdt *) 0x40006000)
 
 struct stm_exti {
 	vuint32_t	imr;