Updated libopencm3 to current master. Made all examples compile again.

esden · esden · commit 976720c35593 · 2015-12-15T00:56:25.000+01:00
Be specifically careful with the usb examples. There is likely some
breakage to be expected, not sure I updated all the drivers to the
correct types for the respective chips.
diff --git a/examples/stm32/f1/other/usb_cdcacm/cdcacm.c b/examples/stm32/f1/other/usb_cdcacm/cdcacm.c
@@ -244,7 +244,7 @@ int main(void)
 
 	gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
 
-	usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
+	usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
 	usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);
 
 	gpio_set(GPIOA, GPIO15);
diff --git a/examples/stm32/f1/other/usb_hid/usbhid.c b/examples/stm32/f1/other/usb_hid/usbhid.c
@@ -285,7 +285,7 @@ int main(void)
 	AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;
 	gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
 
-	usbd_dev = usbd_init(&stm32f103_usb_driver, &dev_descr, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
+	usbd_dev = usbd_init(&stm32f107_usb_driver, &dev_descr, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
 	usbd_register_set_config_callback(usbd_dev, hid_set_config);
 
 	gpio_set(GPIOA, GPIO15);
diff --git a/examples/stm32/f1/stm32-h103/rtc/rtc.c b/examples/stm32/f1/stm32-h103/rtc/rtc.c
@@ -103,7 +103,7 @@ int main(void)
 	 * Otherwise enable it with the LSE as clock source and 0x7fff as
 	 * prescale value.
 	 */
-	rtc_auto_awake(LSE, 0x7fff);
+	rtc_auto_awake(RCC_LSE, 0x7fff);
 
 	/* Setup the RTC interrupt. */
 	nvic_setup();
diff --git a/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c b/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c
@@ -246,7 +246,7 @@ int main(void)
 	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
 		      GPIO_CNF_OUTPUT_PUSHPULL, GPIO11);
 
-	usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
+	usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
 	usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);
 
 	for (i = 0; i < 0x800000; i++)
diff --git a/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c b/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c
@@ -267,7 +267,7 @@ int main(void)
 		      GPIO_CNF_OUTPUT_PUSHPULL, GPIO11);
 	gpio_set(GPIOC, GPIO11);
 
-	usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4, usbd_control_buffer, sizeof(usbd_control_buffer));
+	usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4, usbd_control_buffer, sizeof(usbd_control_buffer));
 	usbd_register_set_config_callback(usbd_dev, usbdfu_set_config);
 
 	gpio_clear(GPIOC, GPIO11);
diff --git a/examples/stm32/f1/stm32-h103/usb_hid/usbhid.c b/examples/stm32/f1/stm32-h103/usb_hid/usbhid.c
@@ -286,7 +286,7 @@ int main(void)
 	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
 		      GPIO_CNF_OUTPUT_PUSHPULL, GPIO11);
 
-	usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
+	usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
 	usbd_register_set_config_callback(usbd_dev, hid_set_config);
 
 	for (i = 0; i < 0x80000; i++)
diff --git a/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c b/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c
@@ -268,7 +268,7 @@ int main(void)
 	AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;
 	gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
 
-	usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 4, usbd_control_buffer, sizeof(usbd_control_buffer));
+	usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4, usbd_control_buffer, sizeof(usbd_control_buffer));
 	usbd_register_set_config_callback(usbd_dev, usbdfu_set_config);
 
 	gpio_set(GPIOA, GPIO15);
diff --git a/examples/stm32/f1/stm32-maple/usb_cdcacm/cdcacm.c b/examples/stm32/f1/stm32-maple/usb_cdcacm/cdcacm.c
@@ -257,7 +257,7 @@ int main(void)
 	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
 		      GPIO_CNF_OUTPUT_PUSHPULL, GPIO5);
 
-	usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
+	usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer));
 	usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);
 
 	for (i = 0; i < 0x800000; i++)
diff --git a/examples/stm32/f1/stm32vl-discovery/rtc/rtc.c b/examples/stm32/f1/stm32vl-discovery/rtc/rtc.c
@@ -108,7 +108,7 @@ int main(void)
 	 * Otherwise enable it with the LSE as clock source and 0x7fff as
 	 * prescale value.
 	 */
-	rtc_auto_awake(LSE, 0x7fff);
+	rtc_auto_awake(RCC_LSE, 0x7fff);
 
 	/* The above mode will not reset the RTC when you press the RST button.
 	 * It will also continue to count while the MCU is held in reset. If
diff --git a/examples/stm32/f1/waveshare-open103r/usbserial/usbserial.c b/examples/stm32/f1/waveshare-open103r/usbserial/usbserial.c
@@ -251,7 +251,7 @@ int main(void)
 
   AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;
 
-  usbd_dev = usbd_init(&stm32f103_usb_driver,
+  usbd_dev = usbd_init(&stm32f107_usb_driver,
 		       &dev,
 		       &config,
 		       usb_strings,
diff --git a/examples/stm32/f3/stm32f3-discovery/adc/adc.c b/examples/stm32/f3/stm32f3-discovery/adc/adc.c
@@ -134,7 +134,7 @@ static void my_usart_print_int(uint32_t usart, int16_t value)
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_hsi(&hsi_8mhz[CLOCK_64MHZ]);
+	rcc_clock_setup_hsi(&rcc_hsi_8mhz[RCC_CLOCK_64MHZ]);
 }
 
 
diff --git a/examples/stm32/f3/stm32f3-discovery/button/button.c b/examples/stm32/f3/stm32f3-discovery/button/button.c
@@ -29,7 +29,7 @@ uint16_t exti_line_state;
 /* Set STM32 to 64 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_hsi(&hsi_8mhz[CLOCK_64MHZ]);
+	rcc_clock_setup_hsi(&rcc_hsi_8mhz[RCC_CLOCK_64MHZ]);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f3/stm32f3-discovery/fancyblink/fancyblink.c b/examples/stm32/f3/stm32f3-discovery/fancyblink/fancyblink.c
@@ -25,7 +25,7 @@
 /* Set STM32 to 64 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_hsi(&hsi_8mhz[CLOCK_64MHZ]);
+	rcc_clock_setup_hsi(&rcc_hsi_8mhz[RCC_CLOCK_64MHZ]);
 
 	/* Enable GPIOE clock. */
 	rcc_periph_clock_enable(RCC_GPIOE);
diff --git a/examples/stm32/f3/stm32f3-discovery/i2c/i2c.c b/examples/stm32/f3/stm32f3-discovery/i2c/i2c.c
@@ -127,7 +127,7 @@ static void my_usart_print_int(uint32_t usart, int32_t value)
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_hsi(&hsi_8mhz[CLOCK_64MHZ]);
+	rcc_clock_setup_hsi(&rcc_hsi_8mhz[RCC_CLOCK_64MHZ]);
 }
 
 #define I2C_ACC_ADDR 0x19
diff --git a/examples/stm32/f3/stm32f3-discovery/spi/spi.c b/examples/stm32/f3/stm32f3-discovery/spi/spi.c
@@ -138,7 +138,7 @@ static void my_usart_print_int(uint32_t usart, int32_t value)
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_hsi(&hsi_8mhz[CLOCK_64MHZ]);
+	rcc_clock_setup_hsi(&rcc_hsi_8mhz[RCC_CLOCK_64MHZ]);
 }
 
 #define GYR_RNW			(1 << 7) /* Write when zero */
diff --git a/examples/stm32/f3/stm32f3-discovery/usb_cdcacm/cdcacm.c b/examples/stm32/f3/stm32f3-discovery/usb_cdcacm/cdcacm.c
@@ -251,10 +251,10 @@ int main(void)
 
 	usbd_device *usbd_dev;
 
-	rcc_clock_setup_hsi(&hsi_8mhz[CLOCK_48MHZ]);
+	rcc_clock_setup_hsi(&rcc_hsi_8mhz[RCC_CLOCK_48MHZ]);
 	usb_setup();
 
-	usbd_dev = usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings,
+	usbd_dev = usbd_init(&st_usbfs_v1_usb_driver, &dev, &config, usb_strings,
 			3, usbd_control_buffer, sizeof(usbd_control_buffer));
 	usbd_register_set_config_callback(usbd_dev, cdcacm_set_config);
 
diff --git a/examples/stm32/f4/stm32f4-discovery/adc-dac-printf/adc-dac-printf.c b/examples/stm32/f4/stm32f4-discovery/adc-dac-printf/adc-dac-printf.c
@@ -36,7 +36,7 @@ int _write(int file, char *ptr, int len);
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
 	/* Enable GPIOD clock for LED & USARTs. */
 	rcc_periph_clock_enable(RCC_GPIOD);
 	rcc_periph_clock_enable(RCC_GPIOA);
diff --git a/examples/stm32/f4/stm32f4-discovery/button/button.c b/examples/stm32/f4/stm32f4-discovery/button/button.c
@@ -27,7 +27,7 @@ uint16_t exti_line_state;
 /* Set STM32 to 168 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f4/stm32f4-discovery/dac-dma/dac-dma.c b/examples/stm32/f4/stm32f4-discovery/dac-dma/dac-dma.c
@@ -33,7 +33,7 @@ uint8_t waveform[256];
 /*--------------------------------------------------------------------*/
 static void clock_setup(void)
 {
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
 }
 
 /*--------------------------------------------------------------------*/
diff --git a/examples/stm32/f4/stm32f4-discovery/fancyblink/fancyblink.c b/examples/stm32/f4/stm32f4-discovery/fancyblink/fancyblink.c
@@ -25,7 +25,7 @@
 /* Set STM32 to 168 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
 
 	/* Enable GPIOD clock. */
 	rcc_periph_clock_enable(RCC_GPIOD);
diff --git a/examples/stm32/f4/stm32f4-discovery/mandelbrot/mandel.c b/examples/stm32/f4/stm32f4-discovery/mandelbrot/mandel.c
@@ -26,7 +26,7 @@
 static void clock_setup(void)
 {
 	/* Enable high-speed clock at 120MHz */
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
 
 	/* Enable GPIOD clock for LED & USARTs. */
 	rcc_periph_clock_enable(RCC_GPIOD);
diff --git a/examples/stm32/f4/stm32f4-discovery/random/random.c b/examples/stm32/f4/stm32f4-discovery/random/random.c
@@ -25,7 +25,7 @@
 
 static void rcc_setup(void)
 {
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
 
 	/* Enable GPIOD clock for onboard leds. */
 	rcc_periph_clock_enable(RCC_GPIOD);
diff --git a/examples/stm32/f4/stm32f4-discovery/tick_blink/tick_blink.c b/examples/stm32/f4/stm32f4-discovery/tick_blink/tick_blink.c
@@ -59,7 +59,7 @@ static void systick_setup(void)
 /* Set STM32 to 168 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
 
 	/* Enable GPIOD clock. */
 	rcc_periph_clock_enable(RCC_GPIOD);
diff --git a/examples/stm32/f4/stm32f4-discovery/timer/timer.c b/examples/stm32/f4/stm32f4-discovery/timer/timer.c
@@ -56,7 +56,7 @@ int debug = 0;
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c b/examples/stm32/f4/stm32f4-discovery/usb_cdcacm/cdcacm.c
@@ -226,7 +226,7 @@ int main(void)
 {
 	usbd_device *usbd_dev;
 
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
 
 	rcc_periph_clock_enable(RCC_GPIOA);
 	rcc_periph_clock_enable(RCC_OTGFS);
diff --git a/examples/stm32/f4/stm32f4-discovery/usb_midi/usbmidi.c b/examples/stm32/f4/stm32f4-discovery/usb_midi/usbmidi.c
@@ -361,7 +361,7 @@ int main(void)
 {
 	usbd_device *usbd_dev;
 
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
 
 	rcc_periph_clock_enable(RCC_GPIOA);
 	rcc_periph_clock_enable(RCC_OTGFS);
diff --git a/examples/stm32/f4/stm32f4-discovery/usb_msc/msc.c b/examples/stm32/f4/stm32f4-discovery/usb_msc/msc.c
@@ -104,7 +104,7 @@ static uint8_t usbd_control_buffer[128];
 
 int main(void)
 {
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
 
 	rcc_periph_clock_enable(RCC_GPIOA);
 	rcc_periph_clock_enable(RCC_OTGFS);
diff --git a/examples/stm32/f4/stm32f429i-discovery/adc-dac-printf/adc-dac-printf.c b/examples/stm32/f4/stm32f429i-discovery/adc-dac-printf/adc-dac-printf.c
@@ -37,7 +37,7 @@ int _write(int file, char *ptr, int len);
 
 static void clock_setup(void)
 {
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
 	/* Enable GPIOD clock for LED & USARTs. */
 	rcc_periph_clock_enable(RCC_GPIOG);
 	rcc_periph_clock_enable(RCC_GPIOA);
diff --git a/examples/stm32/f4/stm32f429i-discovery/button/button.c b/examples/stm32/f4/stm32f429i-discovery/button/button.c
@@ -27,7 +27,7 @@ uint16_t exti_line_state;
 /* Set STM32 to 168 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
 }
 
 static void gpio_setup(void)
diff --git a/examples/stm32/f4/stm32f429i-discovery/dac-dma/dac-dma.c b/examples/stm32/f4/stm32f429i-discovery/dac-dma/dac-dma.c
@@ -34,7 +34,7 @@ uint8_t waveform[256];
 /*--------------------------------------------------------------------*/
 static void clock_setup(void)
 {
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
 }
 
 /*--------------------------------------------------------------------*/
diff --git a/examples/stm32/f4/stm32f429i-discovery/fancyblink/fancyblink.c b/examples/stm32/f4/stm32f429i-discovery/fancyblink/fancyblink.c
@@ -26,7 +26,7 @@
 /* Set STM32 to 168 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
 
 	/* Enable GPIOG clock. */
 	rcc_periph_clock_enable(RCC_GPIOG);
diff --git a/examples/stm32/f4/stm32f429i-discovery/lcd-dma/clock.c b/examples/stm32/f4/stm32f429i-discovery/lcd-dma/clock.c
@@ -63,7 +63,7 @@ uint32_t mtime(void)
 void clock_setup(void)
 {
 	/* Base board frequency, set to 168Mhz */
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
 
 	/* clock rate / 168000 to get 1mS interrupt rate */
 	systick_set_reload(168000);
diff --git a/examples/stm32/f4/stm32f429i-discovery/lcd-serial/clock.c b/examples/stm32/f4/stm32f429i-discovery/lcd-serial/clock.c
@@ -61,7 +61,7 @@ uint32_t mtime(void)
 void clock_setup(void)
 {
 	/* Base board frequency, set to 168Mhz */
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
 
 	/* clock rate / 168000 to get 1mS interrupt rate */
 	systick_set_reload(168000);
diff --git a/examples/stm32/f4/stm32f429i-discovery/mandelbrot-lcd/clock.c b/examples/stm32/f4/stm32f429i-discovery/mandelbrot-lcd/clock.c
@@ -32,7 +32,7 @@
 
 void clock_setup(void)
 {
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
 
 	/* set up the SysTick function (1mS interrupts) */
 	systick_set_clocksource(STK_CSR_CLKSOURCE_AHB);
diff --git a/examples/stm32/f4/stm32f429i-discovery/mandelbrot/mandel.c b/examples/stm32/f4/stm32f429i-discovery/mandelbrot/mandel.c
@@ -27,7 +27,7 @@
 static void clock_setup(void)
 {
 	/* Enable high-speed clock at 120MHz */
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
 
 	/* Enable GPIOG clock for LED & USARTs. */
 	rcc_periph_clock_enable(RCC_GPIOG);
diff --git a/examples/stm32/f4/stm32f429i-discovery/random/random.c b/examples/stm32/f4/stm32f429i-discovery/random/random.c
@@ -25,7 +25,7 @@
 
 static void rcc_setup(void)
 {
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
 
 	/* Enable GPIOG clock for onboard leds. */
 	rcc_periph_clock_enable(RCC_GPIOG);
diff --git a/examples/stm32/f4/stm32f429i-discovery/sdram/clock.c b/examples/stm32/f4/stm32f429i-discovery/sdram/clock.c
@@ -61,7 +61,7 @@ uint32_t mtime(void)
 void clock_setup(void)
 {
 	/* Base board frequency, set to 168Mhz */
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
 
 	/* clock rate / 168000 to get 1mS interrupt rate */
 	systick_set_reload(168000);
diff --git a/examples/stm32/f4/stm32f429i-discovery/spi/clock.c b/examples/stm32/f4/stm32f429i-discovery/spi/clock.c
@@ -61,7 +61,7 @@ uint32_t mtime(void)
 void clock_setup(void)
 {
 	/* Base board frequency, set to 168Mhz */
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
 
 	/* clock rate / 168000 to get 1mS interrupt rate */
 	systick_set_reload(168000);
diff --git a/examples/stm32/f4/stm32f429i-discovery/tick_blink/tick_blink.c b/examples/stm32/f4/stm32f429i-discovery/tick_blink/tick_blink.c
@@ -65,7 +65,7 @@ static void systick_setup(void)
 /* Set STM32 system clock to 168 MHz. */
 static void clock_setup(void)
 {
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
 
 	/* Enable GPIOG clock. */
 	rcc_periph_clock_enable(RCC_GPIOG);
diff --git a/examples/stm32/f4/stm32f429i-discovery/usart_console/clock.c b/examples/stm32/f4/stm32f429i-discovery/usart_console/clock.c
@@ -62,7 +62,7 @@ uint32_t mtime(void)
 void clock_setup(void)
 {
 	/* Base board frequency, set to 168Mhz */
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
 
 	/* clock rate / 168000 to get 1mS interrupt rate */
 	systick_set_reload(168000);
diff --git a/examples/stm32/f4/stm32f429i-discovery/usart_irq_console/clock.c b/examples/stm32/f4/stm32f429i-discovery/usart_irq_console/clock.c
@@ -61,7 +61,7 @@ uint32_t mtime(void)
 void clock_setup(void)
 {
 	/* Base board frequency, set to 168Mhz */
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_168MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]);
 
 	/* clock rate / 168000 to get 1mS interrupt rate */
 	systick_set_reload(168000);
diff --git a/examples/stm32/f4/stm32f429i-discovery/usb_cdcacm/cdcacm.c b/examples/stm32/f4/stm32f429i-discovery/usb_cdcacm/cdcacm.c
@@ -227,7 +227,7 @@ int main(void)
 {
 	usbd_device *usbd_dev;
 
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
 
 	rcc_periph_clock_enable(RCC_GPIOB);
 	rcc_periph_clock_enable(RCC_OTGHS);
diff --git a/examples/stm32/f4/stm32f429i-discovery/usb_midi/usbmidi.c b/examples/stm32/f4/stm32f429i-discovery/usb_midi/usbmidi.c
@@ -362,7 +362,7 @@ int main(void)
 {
 	usbd_device *usbd_dev;
 
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
 
 	rcc_periph_clock_enable(RCC_GPIOA);
 	rcc_periph_clock_enable(RCC_GPIOB);
diff --git a/examples/stm32/f4/stm32f429i-discovery/usb_msc/msc.c b/examples/stm32/f4/stm32f429i-discovery/usb_msc/msc.c
@@ -105,7 +105,7 @@ static uint8_t usbd_control_buffer[128];
 
 int main(void)
 {
-	rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
+	rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_120MHZ]);
 
 	rcc_periph_clock_enable(RCC_GPIOB);
 	rcc_periph_clock_enable(RCC_OTGHS);
diff --git a/examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/main.c b/examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/main.c
diff --git a/examples/stm32/l1/stm32l-discovery/button-irq-printf/main.c b/examples/stm32/l1/stm32l-discovery/button-irq-printf/main.c
diff --git a/examples/stm32/l1/stm32l-discovery/lcd-display/lcd-hello.c b/examples/stm32/l1/stm32l-discovery/lcd-display/lcd-hello.c
diff --git a/libopencm3 b/libopencm3
