Updated all rcc_clock_setups to use the new lookup tables.

The old "one function per config" system is depricated for quite a while
now...
This commit is contained in:
Piotr Esden-Tempski
2021-06-19 00:56:57 -07:00
parent 02f48ef616
commit e599e34073
73 changed files with 73 additions and 73 deletions

View File

@@ -227,7 +227,7 @@ void usb_lp_can_rx0_isr(void)
int main(void) int main(void)
{ {
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
gpio_setup(); gpio_setup();
can_setup(); can_setup();
systick_setup(); systick_setup();

View File

@@ -24,7 +24,7 @@
/* Set STM32 to 72 MHz. */ /* Set STM32 to 72 MHz. */
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
/* Enable GPIOB, GPIOC, and AFIO clocks. */ /* Enable GPIOB, GPIOC, and AFIO clocks. */
rcc_periph_clock_enable(RCC_GPIOB); rcc_periph_clock_enable(RCC_GPIOB);

View File

@@ -239,7 +239,7 @@ int main(void)
usbd_device *usbd_dev; usbd_device *usbd_dev;
rcc_clock_setup_in_hsi_out_48mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_48MHZ]);
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);
rcc_periph_clock_enable(RCC_OTGFS); rcc_periph_clock_enable(RCC_OTGFS);

View File

@@ -258,7 +258,7 @@ int main(void)
} }
} }
rcc_clock_setup_in_hsi_out_48mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_48MHZ]);
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);
rcc_periph_clock_enable(RCC_OTGFS); rcc_periph_clock_enable(RCC_OTGFS);

View File

@@ -323,7 +323,7 @@ int main(void)
{ {
int i; int i;
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);
rcc_periph_clock_enable(RCC_GPIOB); rcc_periph_clock_enable(RCC_GPIOB);

View File

@@ -120,7 +120,7 @@ int main(void)
uint8_t channel_array[16]; uint8_t channel_array[16];
uint16_t temperature = 0; uint16_t temperature = 0;
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
gpio_setup(); gpio_setup();
usart_setup(); usart_setup();
adc_setup(); adc_setup();

View File

@@ -140,7 +140,7 @@ int main(void)
uint8_t channel_array[16]; uint8_t channel_array[16];
uint16_t temperature = 0; uint16_t temperature = 0;
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
gpio_setup(); gpio_setup();
usart_setup(); usart_setup();
timer_setup(); timer_setup();

View File

@@ -152,7 +152,7 @@ int main(void)
{ {
uint8_t channel_array[16]; uint8_t channel_array[16];
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
gpio_setup(); gpio_setup();
usart_setup(); usart_setup();
timer_setup(); timer_setup();

View File

@@ -168,7 +168,7 @@ static void my_usart_print_int(uint32_t usart, int value)
int main(void) int main(void)
{ {
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
gpio_setup(); gpio_setup();
usart_setup(); usart_setup();
timer_setup(); timer_setup();

View File

@@ -116,7 +116,7 @@ int main(void)
uint8_t channel_array[16]; uint8_t channel_array[16];
uint16_t temperature = 0; uint16_t temperature = 0;
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
gpio_setup(); gpio_setup();
usart_setup(); usart_setup();
adc_setup(); adc_setup();

View File

@@ -227,7 +227,7 @@ void usb_lp_can_rx0_isr(void)
int main(void) int main(void)
{ {
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
gpio_setup(); gpio_setup();
can_setup(); can_setup();
systick_setup(); systick_setup();

View File

@@ -24,7 +24,7 @@
/* Set STM32 to 72 MHz. */ /* Set STM32 to 72 MHz. */
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
/* Enable GPIOA, GPIOB, GPIOC, and AFIO clocks. */ /* Enable GPIOA, GPIOB, GPIOC, and AFIO clocks. */
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);

View File

@@ -31,7 +31,7 @@ int _write(int file, char *ptr, int len);
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
/* Enable GPIOA, GPIOB, GPIOC clock. */ /* Enable GPIOA, GPIOB, GPIOC clock. */
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);

View File

@@ -51,7 +51,7 @@ int _write(int file, char *ptr, int len);
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
/* Enable GPIOA, GPIOB, GPIOC clock. */ /* Enable GPIOA, GPIOB, GPIOC clock. */
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);

View File

@@ -61,7 +61,7 @@ int _write(int file, char *ptr, int len);
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
/* Enable GPIOA, GPIOB, GPIOC clock. */ /* Enable GPIOA, GPIOB, GPIOC clock. */
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);

View File

@@ -23,7 +23,7 @@
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
/* Enable GPIOA, GPIOB, GPIOC clock. */ /* Enable GPIOA, GPIOB, GPIOC clock. */
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);

View File

@@ -25,7 +25,7 @@
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
/* Enable GPIOA, GPIOB, GPIOC clock. */ /* Enable GPIOA, GPIOB, GPIOC clock. */
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);

View File

@@ -24,7 +24,7 @@
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
/* Enable GPIOA clock (for LED GPIOs). */ /* Enable GPIOA clock (for LED GPIOs). */
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);

View File

@@ -117,7 +117,7 @@ uint8_t output_ring_buffer[BUFFER_SIZE];
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
/* Enable GPIOA clock (for LED GPIOs). */ /* Enable GPIOA clock (for LED GPIOs). */
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);

View File

@@ -29,7 +29,7 @@ int _write(int file, char *ptr, int len);
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE12_72MHZ]);
/* Enable GPIOA clock (for LED GPIOs). */ /* Enable GPIOA clock (for LED GPIOs). */
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);

View File

@@ -23,7 +23,7 @@
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
/* Enable GPIOC clock. */ /* Enable GPIOC clock. */
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);

View File

@@ -238,7 +238,7 @@ static const uint16_t gamma_table_3_0[] = {
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
/* Enable TIM1 clock. */ /* Enable TIM1 clock. */
rcc_periph_clock_enable(RCC_TIM1); rcc_periph_clock_enable(RCC_TIM1);

View File

@@ -195,7 +195,7 @@ void usb_lp_can_rx0_isr(void)
int main(void) int main(void)
{ {
rcc_clock_setup_in_hsi_out_64mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_64MHZ]);
gpio_setup(); gpio_setup();
can_setup(); can_setup();
systick_setup(); systick_setup();

View File

@@ -23,7 +23,7 @@
static void clock_setup(void) static void clock_setup(void)
{ {
/* Set STM32 to 64 MHz. */ /* Set STM32 to 64 MHz. */
rcc_clock_setup_in_hsi_out_64mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_64MHZ]);
/* Enable alternate function peripheral clock. */ /* Enable alternate function peripheral clock. */
rcc_periph_clock_enable(RCC_AFIO); rcc_periph_clock_enable(RCC_AFIO);

View File

@@ -59,7 +59,7 @@ void sys_tick_handler(void)
int main(void) int main(void)
{ {
rcc_clock_setup_in_hsi_out_64mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_64MHZ]);
gpio_setup(); gpio_setup();
temp32 = 0; temp32 = 0;

View File

@@ -23,7 +23,7 @@
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hsi_out_64mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_64MHZ]);
/* Enable clocks for GPIO port B (for GPIO_USART1_TX and LED) and USART1. */ /* Enable clocks for GPIO port B (for GPIO_USART1_TX and LED) and USART1. */
rcc_periph_clock_enable(RCC_GPIOB); rcc_periph_clock_enable(RCC_GPIOB);

View File

@@ -209,7 +209,7 @@ void usb_lp_can_rx0_isr(void)
int main(void) int main(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
gpio_setup(); gpio_setup();
can_setup(); can_setup();
systick_setup(); systick_setup();

View File

@@ -24,7 +24,7 @@
static void clock_setup(void) static void clock_setup(void)
{ {
/* Set STM32 to 72 MHz. */ /* Set STM32 to 72 MHz. */
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
/* Enable GPIOA clock. */ /* Enable GPIOA clock. */
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);

View File

@@ -238,7 +238,7 @@ static const uint16_t gamma_table_3_0[] = {
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
/* Enable TIM3 clock. */ /* Enable TIM3 clock. */
rcc_periph_clock_enable(RCC_TIM3); rcc_periph_clock_enable(RCC_TIM3);

View File

@@ -65,7 +65,7 @@ void sys_tick_handler(void)
int main(void) int main(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
gpio_setup(); gpio_setup();
gpio_clear(GPIOA, GPIO7); /* LED1 on */ gpio_clear(GPIOA, GPIO7); /* LED1 on */

View File

@@ -23,7 +23,7 @@
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
/* Enable GPIOA clock (for LED GPIOs). */ /* Enable GPIOA clock (for LED GPIOs). */
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);

View File

@@ -24,7 +24,7 @@
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
/* Enable GPIOA clock (for LED GPIOs). */ /* Enable GPIOA clock (for LED GPIOs). */
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);

View File

@@ -110,7 +110,7 @@ int main(void)
uint8_t channel_array[16]; uint8_t channel_array[16];
uint16_t temperature; uint16_t temperature;
rcc_clock_setup_in_hse_16mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE16_72MHZ]);
gpio_setup(); gpio_setup();
usart_setup(); usart_setup();
adc_setup(); adc_setup();

View File

@@ -74,7 +74,7 @@ int main(void)
char s1[20] = "Hello STM MEM2MEM\r\n"; char s1[20] = "Hello STM MEM2MEM\r\n";
char s2[20]; char s2[20];
rcc_clock_setup_in_hse_16mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE16_72MHZ]);
gpio_setup(); gpio_setup();
usart_setup(); usart_setup();

View File

@@ -79,7 +79,7 @@ static void spi_setup(void)
int main(void) int main(void)
{ {
rcc_clock_setup_in_hse_16mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE16_72MHZ]);
gpio_setup(); gpio_setup();
spi_setup(); spi_setup();

View File

@@ -107,7 +107,7 @@ int main(void)
int i = 0; int i = 0;
uint16_t temperature; uint16_t temperature;
rcc_clock_setup_in_hse_16mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE16_72MHZ]);
gpio_setup(); gpio_setup();
usart_setup(); usart_setup();
i2c_setup(); i2c_setup();

View File

@@ -50,7 +50,7 @@ void sys_tick_handler(void)
int main(void) int main(void)
{ {
rcc_clock_setup_in_hse_16mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE16_72MHZ]);
gpio_setup(); gpio_setup();
gpio_clear(GPIOB, GPIO7); /* LED1 on */ gpio_clear(GPIOB, GPIO7); /* LED1 on */

View File

@@ -50,7 +50,7 @@ void tim2_isr(void)
int main(void) int main(void)
{ {
rcc_clock_setup_in_hse_16mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE16_72MHZ]);
gpio_setup(); gpio_setup();
nvic_setup(); nvic_setup();

View File

@@ -234,7 +234,7 @@ int main(void)
{ {
usbd_device *usbd_dev; usbd_device *usbd_dev;
rcc_clock_setup_in_hsi_out_48mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_48MHZ]);
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);
rcc_periph_clock_enable(RCC_AFIO); rcc_periph_clock_enable(RCC_AFIO);

View File

@@ -258,7 +258,7 @@ int main(void)
} }
} }
rcc_clock_setup_in_hsi_out_48mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_48MHZ]);
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);
rcc_periph_clock_enable(RCC_AFIO); rcc_periph_clock_enable(RCC_AFIO);

View File

@@ -276,7 +276,7 @@ static void hid_set_config(usbd_device *dev, uint16_t wValue)
int main(void) int main(void)
{ {
rcc_clock_setup_in_hsi_out_48mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_48MHZ]);
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);
/* /*

View File

@@ -26,7 +26,7 @@
/* Set STM32 to 72 MHz. */ /* Set STM32 to 72 MHz. */
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
} }
static void gpio_setup(void) static void gpio_setup(void)

View File

@@ -28,7 +28,7 @@ uint16_t exti_line_state;
/* Set STM32 to 72 MHz. */ /* Set STM32 to 72 MHz. */
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
} }
static void gpio_setup(void) static void gpio_setup(void)

View File

@@ -31,7 +31,7 @@ uint16_t exti_direction = FALLING;
/* Set STM32 to 72 MHz. */ /* Set STM32 to 72 MHz. */
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
} }
static void gpio_setup(void) static void gpio_setup(void)

View File

@@ -23,7 +23,7 @@
/* Set STM32 to 72 MHz. */ /* Set STM32 to 72 MHz. */
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
/* Enable GPIOC clock. */ /* Enable GPIOC clock. */
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);

View File

@@ -65,7 +65,7 @@ struct color {
/* Set STM32 to 72 MHz. */ /* Set STM32 to 72 MHz. */
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
/* Enable GPIOB and GPIOC clock. */ /* Enable GPIOB and GPIOC clock. */
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);

View File

@@ -30,7 +30,7 @@ uint16_t exti_direction = FALLING;
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
} }
static void gpio_setup(void) static void gpio_setup(void)

View File

@@ -26,7 +26,7 @@
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
/* Enable GPIOC clock. */ /* Enable GPIOC clock. */
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);

View File

@@ -62,7 +62,7 @@ int frequency_sel = 0;
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
} }
static void gpio_setup(void) static void gpio_setup(void)

View File

@@ -27,7 +27,7 @@
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
/* Enable GPIOC clock. */ /* Enable GPIOC clock. */
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);

View File

@@ -23,7 +23,7 @@
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
/* Enable GPIOC clock. */ /* Enable GPIOC clock. */
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);

View File

@@ -24,7 +24,7 @@
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
/* Enable GPIOA clock (for LED GPIOs). */ /* Enable GPIOA clock (for LED GPIOs). */
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);

View File

@@ -117,7 +117,7 @@ int _write(int file, char *ptr, int len);
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
/* Enable GPIOA clock (for LED GPIOs). */ /* Enable GPIOA clock (for LED GPIOs). */
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);

View File

@@ -29,7 +29,7 @@ int _write(int file, char *ptr, int len);
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
/* Enable GPIOA clock (for LED GPIOs). */ /* Enable GPIOA clock (for LED GPIOs). */
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);

View File

@@ -237,7 +237,7 @@ int main(void)
usbd_device *usbd_dev; usbd_device *usbd_dev;
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);

View File

@@ -258,7 +258,7 @@ int main(void)
} }
} }
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);

View File

@@ -259,7 +259,7 @@ int main(void)
} }
} }
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);
rcc_periph_clock_enable(RCC_AFIO); rcc_periph_clock_enable(RCC_AFIO);

View File

@@ -24,7 +24,7 @@
/* Set STM32 to 72 MHz. */ /* Set STM32 to 72 MHz. */
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_25mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE25_72MHZ]);
/* Enable GPIOC clock. */ /* Enable GPIOC clock. */
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);

View File

@@ -80,7 +80,7 @@ int main(void)
static void init_system(void) static void init_system(void)
{ {
/* setup SYSCLK to work with 64Mhz HSI */ /* setup SYSCLK to work with 64Mhz HSI */
rcc_clock_setup_in_hsi_out_64mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_64MHZ]);
init_usart(); init_usart();
} }

View File

@@ -110,7 +110,7 @@ int main(void)
{ {
usbd_device *usbd_dev; usbd_device *usbd_dev;
rcc_clock_setup_in_hse_25mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE25_72MHZ]);
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);

View File

@@ -23,7 +23,7 @@
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
/* Enable GPIOA clock. */ /* Enable GPIOA clock. */
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);

View File

@@ -25,7 +25,7 @@
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
/* Enable GPIOA clock. */ /* Enable GPIOA clock. */
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);

View File

@@ -240,7 +240,7 @@ int main(void)
SCB_VTOR = (uint32_t) 0x08005000; SCB_VTOR = (uint32_t) 0x08005000;
rcc_clock_setup_in_hse_8mhz_out_72mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_72MHZ]);
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);

View File

@@ -37,7 +37,7 @@ int _write(int file, char *ptr, int len);
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hsi_out_24mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_24MHZ]);
/* Enable clocks for USART2 and DAC*/ /* Enable clocks for USART2 and DAC*/
rcc_periph_clock_enable(RCC_USART2); rcc_periph_clock_enable(RCC_USART2);
rcc_periph_clock_enable(RCC_DAC); rcc_periph_clock_enable(RCC_DAC);

View File

@@ -24,7 +24,7 @@
/* Set STM32 to 24 MHz. */ /* Set STM32 to 24 MHz. */
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_24mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_24MHZ]);
} }
static void gpio_setup(void) static void gpio_setup(void)

View File

@@ -25,7 +25,7 @@
/* Set STM32 to 24 MHz. */ /* Set STM32 to 24 MHz. */
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_24mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_24MHZ]);
/* Enable GPIOC clock. */ /* Enable GPIOC clock. */
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);

View File

@@ -27,7 +27,7 @@
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_24mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_24MHZ]);
/* Enable GPIOC clock. */ /* Enable GPIOC clock. */
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);

View File

@@ -30,7 +30,7 @@ int _write(int file, char *ptr, int len);
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_24mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_24MHZ]);
/* Enable GPIOA, GPIOB, GPIOC clock. */ /* Enable GPIOA, GPIOB, GPIOC clock. */
rcc_periph_clock_enable(RCC_GPIOA); rcc_periph_clock_enable(RCC_GPIOA);

View File

@@ -23,7 +23,7 @@
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_24mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_24MHZ]);
/* Enable GPIOC clock. */ /* Enable GPIOC clock. */
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);

View File

@@ -25,7 +25,7 @@
/* Set STM32 to 24 MHz. */ /* Set STM32 to 24 MHz. */
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_24mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_24MHZ]);
} }
static void gpio_setup(void) static void gpio_setup(void)

View File

@@ -26,7 +26,7 @@
/* Set STM32 to 24 MHz. */ /* Set STM32 to 24 MHz. */
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_24mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_24MHZ]);
/* Enable GPIOC clock. */ /* Enable GPIOC clock. */
rcc_periph_clock_enable(RCC_GPIOC); rcc_periph_clock_enable(RCC_GPIOC);

View File

@@ -47,7 +47,7 @@ bool led_blinking;
/* Set STM32 to 24 MHz. */ /* Set STM32 to 24 MHz. */
static void clock_setup(void) static void clock_setup(void)
{ {
rcc_clock_setup_in_hse_8mhz_out_24mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSE8_24MHZ]);
} }
static void led_setup(void) static void led_setup(void)

View File

@@ -245,7 +245,7 @@ int main(void)
{ {
usbd_device *usbd_dev; usbd_device *usbd_dev;
rcc_clock_setup_in_hsi_out_48mhz(); rcc_clock_setup_pll(&rcc_hse_configs[RCC_CLOCK_HSI_48MHZ]);
rcc_periph_clock_enable(RCC_AFIO); rcc_periph_clock_enable(RCC_AFIO);
AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON; AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON;