iar 类型检查严格 修改函数定义类型。
This commit is contained in:
parent
2568a85c7a
commit
f7111cd965
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void mpu_init(void)
|
int mpu_init(void)
|
||||||
{
|
{
|
||||||
/* Disable MPU */
|
/* Disable MPU */
|
||||||
MPU->CTRL &= ~MPU_CTRL_ENABLE_Msk;
|
MPU->CTRL &= ~MPU_CTRL_ENABLE_Msk;
|
||||||
|
@ -32,7 +32,7 @@ void mpu_init(void)
|
||||||
MPU->RNR = 0;//indicate MPU region 0
|
MPU->RNR = 0;//indicate MPU region 0
|
||||||
MPU->RBAR = 0x00000000; // update the base address for the 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 = 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
|
| MPU_REGION_ENABLE; //region enable
|
||||||
|
|
||||||
/* - Region 1:0x20000000 - 0x20007FFF --- on chip SRAM
|
/* - Region 1:0x20000000 - 0x20007FFF --- on chip SRAM
|
||||||
|
@ -92,5 +92,7 @@ void mpu_init(void)
|
||||||
|
|
||||||
/* Enable MPU */
|
/* Enable MPU */
|
||||||
MPU->CTRL |= MPU_CTRL_PRIVDEFENA_Msk | MPU_CTRL_ENABLE_Msk;
|
MPU->CTRL |= MPU_CTRL_PRIVDEFENA_Msk | MPU_CTRL_ENABLE_Msk;
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
INIT_BOARD_EXPORT(mpu_init);
|
INIT_BOARD_EXPORT(mpu_init);
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#define __DRV_MPU_H
|
#define __DRV_MPU_H
|
||||||
|
|
||||||
/* Initialize Cortex M4 MPU */
|
/* Initialize Cortex M4 MPU */
|
||||||
void mpu_init(void);
|
int mpu_init(void);
|
||||||
void mpu_enable(int enable);
|
void mpu_enable(int enable);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue