aboutsummaryrefslogtreecommitdiff
path: root/stmhal/mphalport.c
diff options
context:
space:
mode:
authorDamien George2016-10-18 14:32:42 +1100
committerDamien George2016-10-18 14:34:08 +1100
commitd49d81b1675b39c0c29c95b105edbbb7384f9314 (patch)
treebf84f199d40de596e53cf1e0256a13fef1b70445 /stmhal/mphalport.c
parentcd9b14bb11c35e013e47db46bcc73734f0d6cd55 (diff)
stmhal: Refactor pin usage to use mp_hal_pin API.
Diffstat (limited to 'stmhal/mphalport.c')
-rw-r--r--stmhal/mphalport.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/stmhal/mphalport.c b/stmhal/mphalport.c
index 3bf993ec2..8d6aa1a75 100644
--- a/stmhal/mphalport.c
+++ b/stmhal/mphalport.c
@@ -131,7 +131,9 @@ void mp_hal_gpio_clock_enable(GPIO_TypeDef *gpio) {
}
}
-void mp_hal_gpio_config(GPIO_TypeDef *gpio, uint32_t pin, uint32_t mode, uint32_t pull, uint32_t alt) {
+void mp_hal_pin_config(mp_hal_pin_obj_t pin_obj, uint32_t mode, uint32_t pull, uint32_t alt) {
+ GPIO_TypeDef *gpio = pin_obj->gpio;
+ uint32_t pin = pin_obj->pin;
mp_hal_gpio_clock_enable(gpio);
gpio->MODER = (gpio->MODER & ~(3 << (2 * pin))) | ((mode & 3) << (2 * pin));
gpio->OTYPER = (gpio->OTYPER & ~(1 << pin)) | ((mode >> 2) << pin);
@@ -140,7 +142,7 @@ void mp_hal_gpio_config(GPIO_TypeDef *gpio, uint32_t pin, uint32_t mode, uint32_
gpio->AFR[pin >> 3] = (gpio->AFR[pin >> 3] & ~(15 << (4 * (pin & 7)))) | (alt << (4 * (pin & 7)));
}
-bool mp_hal_gpio_set_af(const pin_obj_t *pin, GPIO_InitTypeDef *init, uint8_t fn, uint8_t unit) {
+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);
const pin_af_obj_t *af = pin_find_af(pin, fn, unit);