Merge pull request #11 from TimerOverflow/20200115

20200115

Author: TimerOverflow

SysEeprom.c

@@ -7,7 +7,7 @@
 #include <string.h>
 #include "SysEeprom.h"
 /*********************************************************************************/
-#if(SYS_EEPROM_REVISION_DATE != 20191001)
+#if(SYS_EEPROM_REVISION_DATE != 20200115)
 #error wrong include file. (SysEeprom.h)
 #endif
 /*********************************************************************************/
@@ -19,7 +19,27 @@ static inline tU8 CheckAllOfInit(tag_EepControl *Eep)
 	return (Eep->Bit.InitGeneral) ? true : false;
 }
 /*********************************************************************************/
-tU8 InitEepCommonConfig(tag_EepCommonConfig *EepConfig, tU16 LastAddr, tU8 (*EepromWrite)(tU16 Addr, tU8 Data), tU8 (*EepromRead)(tU16 Addr, tU8 *pData))
+static void EepWrite(tag_EepCommonConfig *EepConfig, tU16 Addr, tU8 Data)
+{
+	tU8 Cnt = 0;
+	
+	while(EepConfig->HalEepromWrite(Addr, Data) == false)
+	{
+		if(++Cnt >= 5){ EepConfig->Bit.WriteFail = true; return; }
+	}
+}
+/*********************************************************************************/
+static void EepRead(tag_EepCommonConfig *EepConfig, tU16 Addr, tU8 *Data)
+{
+	tU8 Cnt = 0;
+	
+	while(EepConfig->HalEepromRead(Addr, Data) == false)
+	{
+		if(++Cnt >= 5){ EepConfig->Bit.ReadFail = true; return; }
+	}
+}
+/*********************************************************************************/
+tU8 InitEepCommonConfig(tag_EepCommonConfig *EepConfig, tU16 LastAddr, tU8 (*HalEepromWrite)(tU16 Addr, tU8 Data), tU8 (*HalEepromRead)(tU16 Addr, tU8 *pData))
 {
 	tU16 *pLastAddr = (tU16 *) &EepConfig->LastAddr;
 	static tag_EepControl EepSignature = { .Bit.InitGeneral = false };
@@ -28,8 +48,8 @@ tU8 InitEepCommonConfig(tag_EepCommonConfig *EepConfig, tU16 LastAddr, tU8 (*Eep
 	/*
 		1) 인수
 			- EepConfig : EepConfig 인스턴스의 주소
-			- EepromWrite : 사용자가 구현한 EepromWrite 함수 포인터 주소
-			- EepromRead : 사용자가 구현한 EepromRead 함수 포인터 주소
+			- HalEepromWrite : 사용자가 구현한 HalEepromWrite 함수 포인터 주소
+			- HalEepromRead : 사용자가 구현한 HalEepromRead 함수 포인터 주소
 
 		2) 반환
 			- 초기화 성공 여부
@@ -40,8 +60,8 @@ tU8 InitEepCommonConfig(tag_EepCommonConfig *EepConfig, tU16 LastAddr, tU8 (*Eep
 	*/
 
 	*pLastAddr = LastAddr;
-	EepConfig->EepromWrite = EepromWrite;
-	EepConfig->EepromRead = EepromRead;
+	EepConfig->HalEepromWrite = HalEepromWrite;
+	EepConfig->HalEepromRead = HalEepromRead;
 	EepConfig->AllocEepAddr = 0;
 	EepConfig->Bit.Init = true;
 
@@ -130,15 +150,15 @@ void DoEepReadControl(tag_EepControl *Eep)
 			- 해당 인스턴스의 eeprom으로 부터 데이터를 읽어와 대상 버퍼에 값을 대입.
 	*/
 
-	if(Eep->Bit.InitComplete == false)
+	if((Eep->Bit.InitComplete == false) || (Eep->Config->Bit.ReadFail == true) || (Eep->Config->Bit.WriteFail == true))
 	{
 		return;
 		/* error or disabled */
 	}
 
 	do
 	{
-		Eep->Config->EepromRead(Eep->EepBase + (Index), &Data);
+		EepRead((tag_EepCommonConfig *) Eep->Config, Eep->EepBase + (Index), &Data);
 		pDataBase[Index] = Data;
 	}while(++Index < Eep->Length);
 }
@@ -164,18 +184,18 @@ tU8 DoEepWriteControl(tag_EepControl *Eep)
 			- 값이 유효하여 쓰기를 진행하거나 해당영역의 마지막에 도달할 경우에만 while loop를 탈출한다.
 	*/
 
-	if((Eep->Bit.InitComplete == false) || (Eep->Bit.Write == false))
+	if((Eep->Bit.InitComplete == false) || (Eep->Config->Bit.ReadFail == true) || (Eep->Config->Bit.WriteFail == true) || (Eep->Bit.Write == false))
 	{
 		return false;
 		/* error or disabled */
 	}
 
 	while(true)
 	{
-		Eep->Config->EepromRead(Eep->EepBase + (*pIndex), &Data);
+		EepRead((tag_EepCommonConfig *) Eep->Config, Eep->EepBase + (*pIndex), &Data);
 		if(Data != Eep->DataBase[*pIndex])
 		{
-			Eep->Config->EepromWrite(Eep->EepBase + (*pIndex), Eep->DataBase[*pIndex]);
+			EepWrite((tag_EepCommonConfig *) Eep->Config, Eep->EepBase + (*pIndex), Eep->DataBase[*pIndex]);
 			return true;
 			/* check valid data */
 		}
@@ -231,14 +251,14 @@ void EraseEepCommonConfigSignature(tag_EepCommonConfig *EepConfig)
 			- 본 함수 실행 후 
 	*/
 
-	if(EepConfig->Bit.Init == false)
+	if((EepConfig->Bit.Init == false) || (EepConfig->Bit.ReadFail == true) || (EepConfig->Bit.WriteFail == true))
 	{
 		return;
 	}
 
-	EepConfig->EepromWrite(0, 0);
-	EepConfig->EepromWrite(1, 0);
-	EepConfig->EepromWrite(2, 0);
+	EepWrite(EepConfig, 0, 0);
+	EepWrite(EepConfig, 1, 0);
+	EepWrite(EepConfig, 2, 0);
 }
 /*********************************************************************************/
 

SysEeprom.h

@@ -9,10 +9,14 @@
 /*********************************************************************************/
 #include "SysTypedef.h"
 /*********************************************************************************/
-#define SYS_EEPROM_REVISION_DATE		20191001
+#define SYS_EEPROM_REVISION_DATE		20200115
 /*********************************************************************************/
 /** REVISION HISTORY **/
 /*
+	2020. 01. 15.					- 실제 Eeprom과의 정상 동작 여부 확인 기능 추가.
+	Jeong Hyun Gu					- CheckEepromError() 함수 추가. 'tag_EepCommonConfig'에서 관리 하는 실제
+													Eeprom의 정상 동작 여부 확인.
+
 	2019. 10. 01.					- EraseEepCommonConfigSignature() 함수 추가. InitEepCommonConfig()에서
 	Jeong Hyun Gu						최초 실행 여부를 확인하는데 사용하는 참조 값 Signature를 지워 다음 실행에서
 													공장 초기화 실행 가능.
@@ -70,13 +74,15 @@ typedef struct
 	{
 		tU8 Init						:		1;
 		tU8 FirstExecute		:		1;
+		tU8 ReadFail				:		1;
+		tU8 WriteFail				:		1;
 	}Bit;
 
 	const tU16 LastAddr;					// eeprom마지막 주소(크기)
 	tU16 AllocEepAddr;
 
-	tU8 (*EepromWrite)(tU16 Addr, tU8 Data);
-	tU8 (*EepromRead)(tU16 Addr, tU8 *pData);
+	tU8 (*HalEepromWrite)(tU16 Addr, tU8 Data);
+	tU8 (*HalEepromRead)(tU16 Addr, tU8 *pData);
 }tag_EepCommonConfig;
 
 typedef struct
@@ -101,10 +107,11 @@ typedef struct
 /*********************************************************************************/
 /**Function**/
 
-tU8 InitEepCommonConfig(tag_EepCommonConfig *EepConfig, tU16 LastAddr, tU8 (*EepromWrite)(tU16 Addr, tU8 Data), tU8 (*EepromRead)(tU16 Addr, tU8 *pData));
+tU8 InitEepCommonConfig(tag_EepCommonConfig *EepConfig, tU16 LastAddr, tU8 (*HalEepromWrite)(tU16 Addr, tU8 Data), tU8 (*HalEepromRead)(tU16 Addr, tU8 *pData));
 tU8 InitEepControl(tag_EepControl *Eep, const tU8 *DataBase, tU16 Length, tag_EepCommonConfig *EepConfig);
 
 #define CheckEepromFirstExecuteSignature(Eepconfig)					((Eepconfig)->Bit.FirstExecute)
+#define CheckEepromError(Eepconfig)					(((Eepconfig)->Bit.ReadFail) || ((Eepconfig)->Bit.WriteFail))
 void EraseEepCommonConfigSignature(tag_EepCommonConfig *EepConfig);
 
 void SetEepWriteEnable(tag_EepControl *Eep);