Compare commits

..

No commits in common. "8939dc6b0d8976294e7a30124639f53f82714572" and "9510a8fb1fbc3bb7142b13b441bb52296a317a2f" have entirely different histories.

3 changed files with 19 additions and 40 deletions

View File

@ -10,9 +10,7 @@
#include "stddef.h"
bool D_bInternalFlashPage_Clear(
uint32_t pageAddress,
void *wdTriggerFct,
void *wdTriggerFct_env
uint32_t pageAddress
);
size_t D_sInternalFlashPage_Write(
@ -37,9 +35,7 @@ size_t D_sInternalFlashPage_Read(
bool D_bInternalFlashPage_ClearRange(
uint32_t firstPageAddr,
uint32_t totalSize,
void *wdTriggerFct,
void *wdTriggerFct_env
uint32_t totalSize
);
bool D_bInternalFlashPage_WriteFromRam(uint32_t beginPageAddr, void *sourceRamAddr, uint32_t size);
@ -47,9 +43,7 @@ bool D_bInternalFlashPage_WriteFromRam(uint32_t beginPageAddr, void *sourceRamAd
bool D_bInternalFlashPage_CopyRange(
uint32_t targetPageAddr,
uint32_t sourcePageAddr,
uint32_t totalCopySize,
void *wdTriggerFct,
void *wdTriggerFct_env
uint32_t totalCopySize
);
uint32_t D_iInternalFlashPage_ReadWord(uint32_t addressOnFlash);
@ -92,9 +86,7 @@ size_t P_sInternalFlashPage_Read(
bool P_bInternalFlashPage_ClearRange(
uint32_t firstPageAddr,
uint32_t totalSize,
void *wdTriggerFct,
void *wdTriggerFct_env
uint32_t totalSize
);
bool P_bInternalFlashPage_WriteFromRam(uint32_t beginPageAddr, void *sourceRamAddr, uint32_t size);
@ -102,9 +94,7 @@ bool P_bInternalFlashPage_WriteFromRam(uint32_t beginPageAddr, void *sourceRamAd
bool P_bInternalFlashPage_CopyRange(
uint32_t targetPageAddr,
uint32_t sourcePageAddr,
uint32_t totalCopySize,
void *wdTriggerFct,
void *wdTriggerFct_env
uint32_t totalCopySize
);
uint32_t P_iInternalFlashPage_ReadWord(uint32_t addressOnFlash);

View File

@ -42,14 +42,12 @@ size_t D_sInternalFlashPage_Read(
}
bool D_bInternalFlashPage_Clear(
uint32_t pageAddress,
void *wdTriggerFct,
void *wdTriggerFct_env
uint32_t pageAddress
) {
FLASHDRIVER_Init();
FLASH_DRIVER_ParamType tFlashParam = {.pData = wdTriggerFct,
.wdTriggerFct = wdTriggerFct_env
FLASH_DRIVER_ParamType tFlashParam = {.pData = NULL,
.wdTriggerFct = (void *) 0
};
tFlashParam.u32Address = pageAddress;
@ -77,9 +75,7 @@ bool D_bInternalFlashPage_Clear(
bool D_bInternalFlashPage_ClearRange(
uint32_t firstPageAddr,
uint32_t totalSize,
void *wdTriggerFct,
void *wdTriggerFct_env
uint32_t totalSize
) {
if (totalSize % FLASH_PAGE_SIZE) {
return false;
@ -87,7 +83,7 @@ bool D_bInternalFlashPage_ClearRange(
uint32_t endAddr = firstPageAddr + totalSize;
for (; firstPageAddr < endAddr; firstPageAddr += FLASH_PAGE_SIZE) {
if (!D_bInternalFlashPage_Clear(firstPageAddr, wdTriggerFct, wdTriggerFct_env)) {
if (!D_bInternalFlashPage_Clear(firstPageAddr)) {
return false;
}
}
@ -98,11 +94,9 @@ bool D_bInternalFlashPage_ClearRange(
bool D_bInternalFlashPage_CopyRange(
uint32_t targetPageAddr,
uint32_t sourcePageAddr,
uint32_t size,
void *wdTriggerFct,
void *wdTriggerFct_env
uint32_t size
) {
if (!D_bInternalFlashPage_ClearRange(targetPageAddr, size, wdTriggerFct, wdTriggerFct_env)) {
if (!D_bInternalFlashPage_ClearRange(targetPageAddr, size)) {
return false;
}
@ -178,7 +172,7 @@ size_t D_bInternalFlashPage_DumpFromRam(
) {
size_t alignedSize = ((size / FLASH_PAGE_SIZE) + (size % FLASH_PAGE_SIZE ? 1 : 0)) * FLASH_PAGE_SIZE;
if (!D_bInternalFlashPage_ClearRange(beginPageAddr, alignedSize,NULL, 0)) {
if (!D_bInternalFlashPage_ClearRange(beginPageAddr, alignedSize)) {
return 0;
}

View File

@ -76,9 +76,7 @@ bool P_bInternalFlashPage_Clear(
bool P_bInternalFlashPage_ClearRange(
uint32_t firstPageAddr,
uint32_t totalSize,
void *wdTriggerFct,
void *wdTriggerFct_env
uint32_t totalSize
) {
if (totalSize % FLASH_PAGE_SIZE) {
return false;
@ -87,9 +85,8 @@ bool P_bInternalFlashPage_ClearRange(
FLASHDRIVER_Init();
FLASH_DRIVER_ParamType tFlashParam = {
.pData = 0,
.wdTriggerFct = wdTriggerFct,
.wdTriggerFct_env = wdTriggerFct_env,
.pData = NULL,
.wdTriggerFct = (void *)0,
.u32Address = firstPageAddr,
.u32Length = totalSize
};
@ -118,11 +115,9 @@ bool P_bInternalFlashPage_ClearRange(
bool P_bInternalFlashPage_CopyRange(
uint32_t targetPageAddr,
uint32_t sourcePageAddr,
uint32_t size,
void *wdTriggerFct,
void *wdTriggerFct_env
uint32_t size
) {
if (!P_bInternalFlashPage_ClearRange(targetPageAddr, size, wdTriggerFct, wdTriggerFct_env)) {
if (!P_bInternalFlashPage_ClearRange(targetPageAddr, size)) {
return false;
}
@ -198,7 +193,7 @@ size_t P_bInternalFlashPage_DumpFromRam(
) {
size_t alignedSize = ((size / FLASH_PAGE_SIZE) + (size % FLASH_PAGE_SIZE ? 1 : 0)) * FLASH_PAGE_SIZE;
if (!P_bInternalFlashPage_ClearRange(beginPageAddr, alignedSize, NULL, 0)) {
if (!P_bInternalFlashPage_ClearRange(beginPageAddr, alignedSize)) {
return 0;
}