diff options
Diffstat (limited to 'libmaple/rcc.c')
| -rw-r--r-- | libmaple/rcc.c | 200 | 
1 files changed, 81 insertions, 119 deletions
| diff --git a/libmaple/rcc.c b/libmaple/rcc.c index e49382c..2841af3 100644 --- a/libmaple/rcc.c +++ b/libmaple/rcc.c @@ -23,115 +23,97 @@   *****************************************************************************/  /** - * @file rcc.c - * @brief Clock setup, peripheral enable and reset routines. + * @brief Implements pretty much only the basic clock setup on the + *        stm32, clock enable/disable and peripheral reset commands.   */  #include "libmaple.h"  #include "flash.h"  #include "rcc.h" -#include "bitband.h" -typedef enum clock_domain { +enum {      APB1,      APB2,      AHB -} clock_domain; +};  struct rcc_dev_info { -    const clock_domain clk_domain; +    const uint8 clk_domain;      const uint8 line_num;  };  /* device descriptor tables  */ -static const __attr_flash struct rcc_dev_info rcc_dev_table[] = { -    [RCC_SRAM]    = { .clk_domain = AHB,  .line_num = 2 }, -    [RCC_GPIOA]   = { .clk_domain = APB2, .line_num = 2 }, -    [RCC_GPIOB]   = { .clk_domain = APB2, .line_num = 3 }, -    [RCC_GPIOC]   = { .clk_domain = APB2, .line_num = 4 }, -    [RCC_GPIOD]   = { .clk_domain = APB2, .line_num = 5 }, -    [RCC_AFIO]    = { .clk_domain = APB2, .line_num = 0 }, -    [RCC_ADC1]    = { .clk_domain = APB2, .line_num = 9 }, -    [RCC_ADC2]    = { .clk_domain = APB2, .line_num = 10 }, -    [RCC_USART1]  = { .clk_domain = APB2, .line_num = 14 }, -    [RCC_USART2]  = { .clk_domain = APB1, .line_num = 17 }, -    [RCC_USART3]  = { .clk_domain = APB1, .line_num = 18 }, -    [RCC_TIMER1]  = { .clk_domain = APB2, .line_num = 11 }, -    [RCC_TIMER2]  = { .clk_domain = APB1, .line_num = 0 }, -    [RCC_TIMER3]  = { .clk_domain = APB1, .line_num = 1 }, -    [RCC_TIMER4]  = { .clk_domain = APB1, .line_num = 2 }, -    [RCC_SPI1]    = { .clk_domain = APB2, .line_num = 12 }, -    [RCC_SPI2]    = { .clk_domain = APB1, .line_num = 14 }, -    [RCC_DMA1]    = { .clk_domain = AHB,  .line_num = 0 }, -    [RCC_PWR]     = { .clk_domain = APB1, .line_num = 28 }, -    [RCC_BKP]     = { .clk_domain = APB1, .line_num = 27 }, -    [RCC_CAN]     = { .clk_domain = APB1, .line_num = 25 }, -    [RCC_USB]     = { .clk_domain = APB1, .line_num = 23 }, -    [RCC_I2C1]    = { .clk_domain = APB1, .line_num = 22 }, -    [RCC_I2C2]    = { .clk_domain = APB1, .line_num = 21 }, -    [RCC_CRC]     = { .clk_domain = AHB,  .line_num = 6 }, -    [RCC_WWDG]    = { .clk_domain = APB2, .line_num = 11 }, -    [RCC_FLITF]   = { .clk_domain = AHB,  .line_num = 4 }, -#if defined(STM32_HIGH_DENSITY) || defined(STM32_XL_DENSITY) -    [RCC_SDIO]    = { .clk_domain = AHB,  .line_num = 10 }, -    [RCC_FSMC]    = { .clk_domain = AHB,  .line_num = 8 }, -    [RCC_GPIOE]   = { .clk_domain = APB2, .line_num = 6 }, -    [RCC_GPIOF]   = { .clk_domain = APB2, .line_num = 7 }, -    [RCC_GPIOG]   = { .clk_domain = APB2, .line_num = 8 }, -    [RCC_ADC3]    = { .clk_domain = APB2, .line_num = 15 }, -    [RCC_UART4]   = { .clk_domain = APB1, .line_num = 19 }, -    [RCC_UART5]   = { .clk_domain = APB1, .line_num = 20 }, -    [RCC_TIMER5]  = { .clk_domain = APB1, .line_num = 3 }, -    [RCC_TIMER6]  = { .clk_domain = APB1, .line_num = 4 }, -    [RCC_TIMER7]  = { .clk_domain = APB1, .line_num = 5 }, -    [RCC_TIMER8]  = { .clk_domain = APB2, .line_num = 13 }, -    [RCC_DAC]     = { .clk_domain = APB1, .line_num = 29 }, -    [RCC_DMA2]    = { .clk_domain = AHB,  .line_num = 1 }, -    [RCC_SPI3]    = { .clk_domain = APB1, .line_num = 15 }, -#endif -#ifdef STM32_XL_DENSITY -    [RCC_TIMER9]  = { .clk_domain = APB2, .line_num = 19 }, -    [RCC_TIMER10] = { .clk_domain = APB2, .line_num = 20 }, -    [RCC_TIMER11] = { .clk_domain = APB2, .line_num = 21 }, -    [RCC_TIMER12] = { .clk_domain = APB1, .line_num = 6 }, -    [RCC_TIMER13] = { .clk_domain = APB1, .line_num = 7 }, -    [RCC_TIMER14] = { .clk_domain = APB1, .line_num = 8 }, -#endif +static const struct rcc_dev_info rcc_dev_table[] = { +    [RCC_GPIOA]  = { .clk_domain = APB2, .line_num = 2 }, +    [RCC_GPIOB]  = { .clk_domain = APB2, .line_num = 3 }, +    [RCC_GPIOC]  = { .clk_domain = APB2, .line_num = 4 }, +    [RCC_GPIOD]  = { .clk_domain = APB2, .line_num = 5 }, +    [RCC_GPIOE]  = { .clk_domain = APB2, .line_num = 6 }, // High-density only +    [RCC_GPIOF]  = { .clk_domain = APB2, .line_num = 7 }, // High-density only +    [RCC_GPIOG]  = { .clk_domain = APB2, .line_num = 8 }, // High-density only +    [RCC_AFIO]   = { .clk_domain = APB2, .line_num = 0 }, +    [RCC_ADC1]   = { .clk_domain = APB2, .line_num = 9 }, +    [RCC_ADC2]   = { .clk_domain = APB2, .line_num = 10 }, +    [RCC_ADC3]   = { .clk_domain = APB2, .line_num = 15 }, +    [RCC_USART1] = { .clk_domain = APB2, .line_num = 14 }, +    [RCC_USART2] = { .clk_domain = APB1, .line_num = 17 }, +    [RCC_USART3] = { .clk_domain = APB1, .line_num = 18 }, +    [RCC_UART4]  = { .clk_domain = APB1, .line_num = 19 }, // High-density only +    [RCC_UART5]  = { .clk_domain = APB1, .line_num = 20 }, // High-density only +    [RCC_TIMER1] = { .clk_domain = APB2, .line_num = 11 }, +    [RCC_TIMER2] = { .clk_domain = APB1, .line_num = 0 }, +    [RCC_TIMER3] = { .clk_domain = APB1, .line_num = 1 }, +    [RCC_TIMER4] = { .clk_domain = APB1, .line_num = 2 }, +    [RCC_TIMER5] = { .clk_domain = APB1, .line_num = 3 }, // High-density only +    [RCC_TIMER6] = { .clk_domain = APB1, .line_num = 4 }, // High-density only +    [RCC_TIMER7] = { .clk_domain = APB1, .line_num = 5 }, // High-density only +    [RCC_TIMER8] = { .clk_domain = APB2, .line_num = 13 }, // High-density only +    [RCC_SPI1]   = { .clk_domain = APB2, .line_num = 12 }, +    [RCC_SPI2]   = { .clk_domain = APB1, .line_num = 14 }, +    [RCC_FSMC]   = { .clk_domain = AHB,  .line_num = 8 }, // High-density only +    [RCC_DAC]    = { .clk_domain = APB1, .line_num = 29 }, // High-density only +    [RCC_DMA1]   = { .clk_domain = AHB,  .line_num = 0 }, +    [RCC_DMA2]   = { .clk_domain = AHB,  .line_num = 1 }, // High-density only +    [RCC_PWR]    = { .clk_domain = APB1, .line_num = 28}, +    [RCC_BKP]    = { .clk_domain = APB1, .line_num = 27}  };  /**   * @brief Initialize the clock control system. Initializes the system   *        clock source to use the PLL driven by an external oscillator   * @param sysclk_src system clock source, must be PLL - * @param pll_src pll clock source, must be RCC_CFGR_PLLSRC_HSE + * @param pll_src pll clock source, must be HSE   * @param pll_mul pll multiplier   */  void rcc_clk_init(uint32 sysclk_src, uint32 pll_src, uint32 pll_mul) { -    uint32 cfgr; -      /* Assume that we're going to clock the chip off the PLL, fed by       * the HSE */      ASSERT(sysclk_src == RCC_CLKSRC_PLL && -           pll_src    == RCC_CFGR_PLLSRC_HSE); +           pll_src    == RCC_PLLSRC_HSE); + +    uint32 cfgr = 0; +    uint32 cr = RCC_READ_CR(); -    RCC_BASE->CFGR = pll_src | pll_mul; +    cfgr =  (pll_src | pll_mul); +    RCC_WRITE_CFGR(cfgr); -    /* Turn on the HSE */ -    *bb_perip(&RCC_BASE->CR, RCC_CR_HSEON_BIT) = 1; -    while (!(*bb_perip(&RCC_BASE->CR, RCC_CR_HSERDY_BIT))) +    /* Turn on the HSE  */ +    cr |= RCC_CR_HSEON; +    RCC_WRITE_CR(cr); +    while (!(RCC_READ_CR() & RCC_CR_HSERDY))          ; -    /* Now the PLL */ -    *bb_perip(&RCC_BASE->CR, RCC_CR_PLLON_BIT) = 1; -    while (!(*bb_perip(&RCC_BASE->CR, RCC_CR_PLLRDY_BIT))) +    /* Now the PLL  */ +    cr |= RCC_CR_PLLON; +    RCC_WRITE_CR(cr); +    while (!(RCC_READ_CR() & RCC_CR_PLLRDY))          ;      /* Finally, let's switch over to the PLL  */ -    cfgr = RCC_BASE->CFGR;      cfgr &= ~RCC_CFGR_SW;      cfgr |= RCC_CFGR_SW_PLL; -    RCC_BASE->CFGR = cfgr; -    while ((RCC_BASE->CFGR & RCC_CFGR_SWS) != RCC_CFGR_SWS_PLL) +    RCC_WRITE_CFGR(cfgr); +    while ((RCC_READ_CFGR() & RCC_CFGR_SWS) != RCC_CFGR_SWS_PLL)          ;  } @@ -139,23 +121,16 @@ void rcc_clk_init(uint32 sysclk_src, uint32 pll_src, uint32 pll_mul) {   * @brief Turn on the clock line on a device   * @param device Clock ID of the device to turn on.   */ -void rcc_clk_enable(rcc_clk_id id) { -    uint8 lnum = rcc_dev_table[id].line_num; -    __io uint32 *enr; - -    switch(rcc_dev_table[id].clk_domain) { -    case APB1: -        enr = &RCC_BASE->APB1ENR; -        break; -    case APB2: -         enr = &RCC_BASE->APB2ENR; -        break; -    case AHB: -        enr = &RCC_BASE->AHBENR; -        break; -    } - -    *bb_perip(enr, lnum) = 1; +void rcc_clk_enable(rcc_clk_id device) { +    static const uint32 enable_regs[] = { +        [APB1] = RCC_APB1ENR, +        [APB2] = RCC_APB2ENR, +        [AHB] = RCC_AHBENR, +    }; + +    uint8 clk_domain = rcc_dev_table[device].clk_domain; + +    __set_bits(enable_regs[clk_domain], BIT(rcc_dev_table[device].line_num));  }  /** @@ -163,7 +138,7 @@ void rcc_clk_enable(rcc_clk_id id) {   * @param prescaler prescaler to set   * @param divider prescaler divider   */ -void rcc_set_prescaler(rcc_prescaler prescaler, uint32 divider) { +void rcc_set_prescaler(uint32 prescaler, uint32 divider) {      static const uint32 masks[] = {          [RCC_PRESCALER_AHB] = RCC_CFGR_HPRE,          [RCC_PRESCALER_APB1] = RCC_CFGR_PPRE1, @@ -171,39 +146,26 @@ void rcc_set_prescaler(rcc_prescaler prescaler, uint32 divider) {          [RCC_PRESCALER_USB] = RCC_CFGR_USBPRE,          [RCC_PRESCALER_ADC] = RCC_CFGR_ADCPRE,      }; -    uint32 cfgr; -    cfgr = RCC_BASE->CFGR; +    uint32 cfgr = RCC_READ_CFGR(); +      cfgr &= ~masks[prescaler];      cfgr |= divider; -    RCC_BASE->CFGR = cfgr; +    RCC_WRITE_CFGR(cfgr);  }  /** - * @brief Reset a device - * @param device Clock ID of the device to reset; the device must be - *               on APB1 or APB2. + * @brief reset a device + * @param device Clock ID of the device to reset.   */ -void rcc_reset_dev(rcc_clk_id id) { -    uint8 lnum = rcc_dev_table[id].line_num; -    __io uint32 *rstr = 0; - -    switch (rcc_dev_table[id].clk_domain) { -    case APB1: -        rstr = &RCC_BASE->APB1RSTR; -        break; -    case APB2: -        rstr = &RCC_BASE->APB2RSTR; -        break; -    case AHB: -        ASSERT(0); -        break; -    } - -    if (rstr == 0) { -        return; -    } - -    *bb_perip(rstr, lnum) = 1; -    *bb_perip(rstr, lnum) = 0; +void rcc_reset_dev(rcc_clk_id device) { +    static const uint32 reset_regs[] = { +        [APB1] = RCC_APB1RSTR, +        [APB2] = RCC_APB2RSTR, +    }; + +    uint8 clk_domain = rcc_dev_table[device].clk_domain; + +    __set_bits(reset_regs[clk_domain], BIT(rcc_dev_table[device].line_num)); +    __clear_bits(reset_regs[clk_domain], BIT(rcc_dev_table[device].line_num));  } | 
