From 4f392e463998658951d4a28348ab6f6072f9c7fd Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Thu, 24 Sep 2015 14:16:12 +0200 Subject: [PATCH] Rename pincfg.h to stm32f4xx_hal_msp.h --- src/omv/sccb.c | 2 +- src/omv/sdcard_sdio.c | 5 ++-- src/omv/sensor.c | 4 ++- src/omv/stm32f4xx_hal_msp.c | 36 ++++------------------- src/omv/{pincfg.h => stm32f4xx_hal_msp.h} | 6 ++-- 5 files changed, 16 insertions(+), 37 deletions(-) rename src/omv/{pincfg.h => stm32f4xx_hal_msp.h} (98%) diff --git a/src/omv/sccb.c b/src/omv/sccb.c index b9e3429f1..e4eea254b 100644 --- a/src/omv/sccb.c +++ b/src/omv/sccb.c @@ -7,8 +7,8 @@ * */ #include +#include #include "sccb.h" -#include "pincfg.h" #include "mdefs.h" #define SCCB_FREQ (100000) #define SLAVE_ADDR (0x60) diff --git a/src/omv/sdcard_sdio.c b/src/omv/sdcard_sdio.c index e36105bba..1a3b1ca12 100644 --- a/src/omv/sdcard_sdio.c +++ b/src/omv/sdcard_sdio.c @@ -6,13 +6,14 @@ * SD card SDIO driver. * */ -#include "mp.h" #include #include +#include + +#include "mp.h" #include "mdefs.h" #include "ffconf.h" #include "diskio.h" -#include "pincfg.h" #include "systick.h" #include "sdcard.h" diff --git a/src/omv/sensor.c b/src/omv/sensor.c index c6eb5b981..95d14401a 100644 --- a/src/omv/sensor.c +++ b/src/omv/sensor.c @@ -8,12 +8,14 @@ */ #include #include +#include +#include + #include "sccb.h" #include "ov9650.h" #include "ov2640.h" #include "sensor.h" #include "systick.h" -#include "pincfg.h" #include "framebuffer.h" #define REG_PID 0x0A diff --git a/src/omv/stm32f4xx_hal_msp.c b/src/omv/stm32f4xx_hal_msp.c index af18650b0..a43860b87 100644 --- a/src/omv/stm32f4xx_hal_msp.c +++ b/src/omv/stm32f4xx_hal_msp.c @@ -6,37 +6,13 @@ * HAL MSP. * */ -#include "pincfg.h" #include - -/* GPIOs */ -#ifdef OPENMV1 -const gpio_t gpio_pins[] = { - {GPIOC, GPIO_PIN_12}, - {GPIOB, GPIO_PIN_11}, - {GPIOC, GPIO_PIN_11}, - {GPIOB, GPIO_PIN_10}, - {GPIOC, GPIO_PIN_10}, - {GPIOA, GPIO_PIN_15}, - {NULL, 0} -}; -#else -const gpio_t gpio_pins[] = { - {GPIOA, GPIO_PIN_2 }, - {GPIOA, GPIO_PIN_3 }, - {GPIOC, GPIO_PIN_4 }, - {GPIOC, GPIO_PIN_5 }, - {GPIOD, GPIO_PIN_8 }, - {GPIOD, GPIO_PIN_9 }, - {GPIOD, GPIO_PIN_12}, - {GPIOD, GPIO_PIN_13}, - {GPIOE, GPIO_PIN_2 }, - {GPIOE, GPIO_PIN_3 }, - {GPIOE, GPIO_PIN_5 }, - {GPIOE, GPIO_PIN_6 }, - {NULL, 0} -}; -#endif +#include +/* GPIO struct */ +typedef struct { + GPIO_TypeDef *port; + uint16_t pin; +} gpio_t; /* DCMI GPIOs */ static const gpio_t dcmi_pins[] = { diff --git a/src/omv/pincfg.h b/src/omv/stm32f4xx_hal_msp.h similarity index 98% rename from src/omv/pincfg.h rename to src/omv/stm32f4xx_hal_msp.h index 5e27f7425..618b61514 100644 --- a/src/omv/pincfg.h +++ b/src/omv/stm32f4xx_hal_msp.h @@ -6,8 +6,8 @@ * Pin definitions. * */ -#ifndef __PINCFG_H__ -#define __PINCFG_H__ +#ifndef __STM32F4XX_HAL_MSP_H__ +#define __STM32F4XX_HAL_MSP_H__ #ifdef OPENMV1 /* SCCB/I2C */ #define SCCB_I2C (I2C1) @@ -159,4 +159,4 @@ #define SD_CD_PORT (GPIOA) #endif //OPENMV1 -#endif //__PINCFG_H__ +#endif //__STM32F4XX_HAL_MSP_H__