diff options
| author | Damien George <damien.p.george@gmail.com> | 2016-11-11 17:53:45 +1100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2016-11-11 17:53:45 +1100 |
| commit | 1375c52772ad4f07d4bce40bfa114a0f2f0e6cfc (patch) | |
| tree | 12cb3458f2d09395d656d52d146d01fd8ad94099 /stmhal/mphalport.c | |
| parent | 74fb5d6932c835f92c6985799e30ea28b6449705 (diff) | |
| download | micropython-1375c52772ad4f07d4bce40bfa114a0f2f0e6cfc.tar.gz micropython-1375c52772ad4f07d4bce40bfa114a0f2f0e6cfc.zip | |
stmhal: Rename mp_hal_pin_set_af to _config_alt, to simplify alt config.
This way the caller doesn't need to initialise a big GPIO_InitTypeDef
struct, and HAL_GPIO_Init is no longer called.
Diffstat (limited to 'stmhal/mphalport.c')
| -rw-r--r-- | stmhal/mphalport.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/stmhal/mphalport.c b/stmhal/mphalport.c index 8d6aa1a759..028756c76c 100644 --- a/stmhal/mphalport.c +++ b/stmhal/mphalport.c @@ -142,16 +142,11 @@ void mp_hal_pin_config(mp_hal_pin_obj_t pin_obj, uint32_t mode, uint32_t pull, u gpio->AFR[pin >> 3] = (gpio->AFR[pin >> 3] & ~(15 << (4 * (pin & 7)))) | (alt << (4 * (pin & 7))); } -bool mp_hal_pin_set_af(mp_hal_pin_obj_t pin, GPIO_InitTypeDef *init, uint8_t fn, uint8_t unit) { - mp_hal_gpio_clock_enable(pin->gpio); - +bool mp_hal_pin_config_alt(mp_hal_pin_obj_t pin, uint32_t mode, uint32_t pull, uint8_t fn, uint8_t unit) { const pin_af_obj_t *af = pin_find_af(pin, fn, unit); if (af == NULL) { return false; } - init->Pin = pin->pin_mask; - init->Alternate = af->idx; - HAL_GPIO_Init(pin->gpio, init); - + mp_hal_pin_config(pin, mode, pull, af->idx); return true; } |