diff options
| author | SummerGift <[email protected]> | 2017-10-31 14:45:49 +0800 |
|---|---|---|
| committer | SummerGift <[email protected]> | 2017-10-31 14:46:14 +0800 |
| commit | f7111cd965a397ac85d51090451829eee2134ff5 (patch) | |
| tree | b1b3c746c738514faef1c3dffb65b02ca9569301 | |
| parent | 2568a85c7a76dfb060b8842f8cc61945320fb7f5 (diff) | |
iar 类型检查严格 修改函数定义类型。
| -rw-r--r-- | bsp/stm32f429-apollo/drivers/drv_mpu.c | 6 | ||||
| -rw-r--r-- | bsp/stm32f429-apollo/drivers/drv_mpu.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/bsp/stm32f429-apollo/drivers/drv_mpu.c b/bsp/stm32f429-apollo/drivers/drv_mpu.c index c7f7037b68..148a9526e6 100644 --- a/bsp/stm32f429-apollo/drivers/drv_mpu.c +++ b/bsp/stm32f429-apollo/drivers/drv_mpu.c @@ -20,7 +20,7 @@ -void mpu_init(void) +int mpu_init(void) { /* Disable MPU */ MPU->CTRL &= ~MPU_CTRL_ENABLE_Msk; @@ -32,7 +32,7 @@ void mpu_init(void) MPU->RNR = 0;//indicate MPU region 0 MPU->RBAR = 0x00000000; // update the base address for the region 0 MPU->RASR = MPU_RASR_ACCESS_PERMISSION(MPU_FULL_ACCESS) //full access - | MPU_RASR_REGION_SIZE(MPU_REGION_SIZE_1MB) //512Kb size + | MPU_RASR_REGION_SIZE(MPU_REGION_SIZE_1MB) //512Kb size | MPU_REGION_ENABLE; //region enable /* - Region 1:0x20000000 - 0x20007FFF --- on chip SRAM @@ -92,5 +92,7 @@ void mpu_init(void) /* Enable MPU */ MPU->CTRL |= MPU_CTRL_PRIVDEFENA_Msk | MPU_CTRL_ENABLE_Msk; + + return 0; } INIT_BOARD_EXPORT(mpu_init); diff --git a/bsp/stm32f429-apollo/drivers/drv_mpu.h b/bsp/stm32f429-apollo/drivers/drv_mpu.h index 80c3ad6313..f4fbc032bc 100644 --- a/bsp/stm32f429-apollo/drivers/drv_mpu.h +++ b/bsp/stm32f429-apollo/drivers/drv_mpu.h @@ -2,7 +2,7 @@ #define __DRV_MPU_H /* Initialize Cortex M4 MPU */ -void mpu_init(void); +int mpu_init(void); void mpu_enable(int enable); #endif |