From 09adae6f41c839444a18f5190f8a4112dda77b65 Mon Sep 17 00:00:00 2001 From: cfif Date: Thu, 28 May 2026 14:13:48 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BB=D0=B0=D1=82=D1=8B=20=D0=BD?= =?UTF-8?q?=D0=B0=20V2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Inc/fc7xxx_driver_flash.h | 3 ++- Src/fc7xxx_driver_flash.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Inc/fc7xxx_driver_flash.h b/Inc/fc7xxx_driver_flash.h index dcbf5ee..8382b95 100644 --- a/Inc/fc7xxx_driver_flash.h +++ b/Inc/fc7xxx_driver_flash.h @@ -127,7 +127,8 @@ typedef struct uint32_t u32Address; /**< Logical target address */ uint32_t u32Length; /**< Length in logical sectors or bytes */ uint8_t *pData; /**< Pointer to data buffer (read only) */ - uint8_t (*wdTriggerFct)(void); /**< Pointer to watchdog handling function */ + uint8_t (*wdTriggerFct)(void*); /**< Pointer to watchdog handling function */ + void *wdTriggerFct_env; uint32_t u32ErrorAddress; /**< Error address */ } FLASH_DRIVER_ParamType; diff --git a/Src/fc7xxx_driver_flash.c b/Src/fc7xxx_driver_flash.c index 355ed08..8f8e08f 100644 --- a/Src/fc7xxx_driver_flash.c +++ b/Src/fc7xxx_driver_flash.c @@ -567,7 +567,7 @@ FLASH_StatusType FLASHDRIVER_PFlashEraseSector(FLASH_DRIVER_ParamType *pFlashPar /* trigger watchdog function */ if (pFlashParam->wdTriggerFct != ((void *)0)) { - pFlashParam->wdTriggerFct(); + pFlashParam->wdTriggerFct(pFlashParam->wdTriggerFct_env); } } @@ -714,7 +714,7 @@ FLASH_StatusType FLASHDRIVER_PFlashWrite(FLASH_DRIVER_ParamType *pFlashParam) /* trigger watchdog function */ if (pFlashParam->wdTriggerFct != ((void *)0)) { - pFlashParam->wdTriggerFct(); + pFlashParam->wdTriggerFct(pFlashParam->wdTriggerFct_env); } } @@ -837,7 +837,7 @@ FLASH_StatusType FLASHDRIVER_DFlashEraseSector(FLASH_DRIVER_ParamType *pFlashPar /* trigger watchdog function */ if (pFlashParam->wdTriggerFct != ((void *)0)) { - pFlashParam->wdTriggerFct(); + pFlashParam->wdTriggerFct(pFlashParam->wdTriggerFct_env); } } @@ -983,7 +983,7 @@ FLASH_StatusType FLASHDRIVER_DFlashWrite(FLASH_DRIVER_ParamType *pFlashParam) /* trigger watchdog function */ if (pFlashParam->wdTriggerFct != ((void *)0)) { - pFlashParam->wdTriggerFct(); + pFlashParam->wdTriggerFct(pFlashParam->wdTriggerFct_env); } }