Merge pull request #7 from TimerOverflow/20190723

20190723

Author: TimerOverflow

AvrEeprom.c SysEeprom.cAvrEeprom.c renamed to SysEeprom.c

@@ -1,35 +1,64 @@
 /*********************************************************************************/
 /*
  * Author : Jeong Hyun Gu
- * File name : AvrEeprom.c
+ * File name : SysEeprom.c
 */
 /*********************************************************************************/
-#include <ina90.h>
-#include "AvrEeprom.h"
+#include "SysEeprom.h"
 /*********************************************************************************/
-#if(AVR_EEPROM_REVISION_DATE != 20190114)
-#error wrong include file. (AvrEeprom.h)
+#if(SYS_EEPROM_REVISION_DATE != 20190723)
+#error wrong include file. (SysEeprom.h)
 #endif
 /*********************************************************************************/
 /** Global variable **/
 
+/*********************************************************************************/
+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))
+{
+	tU16 *pLastAddr = (tU16 *) &EepConfig->LastAddr;
+
+	/*
+		1) 인수
+			- EepConfig : EepConfig 인스턴스의 주소
+			- EepromWrite : 사용자가 구현한 EepromWrite 함수 포인터 주소
+			- EepromRead : 사용자가 구현한 EepromRead 함수 포인터 주소
+
+		2) 반환
+			- 초기화 성공 여부
+
+		3) 설명
+			- tag_EepControl::Config 구조체의 필요한 정보를 초기화 한다.
+			- EEPROM의 크기, HAL 구현 함수등을 연결.
+	*/
 
+	*pLastAddr = LastAddr;
+	EepConfig->EepromWrite = EepromWrite;
+	EepConfig->EepromRead = EepromRead;
+	EepConfig->Bit.Init = true;
+
+	return EepConfig->Bit.Init;
+}
 /*********************************************************************************/
-char InitEepControl(tag_EepControl *Eep, const unsigned char *DataBase, unsigned int Length)
+tU8 InitEepControl(tag_EepControl *Eep, const tU8 *DataBase, tU16 Length, tag_EepCommonConfig *Config)
 {
-	const char GapOfAnotherSector = 10;
-	static unsigned int AllocEepAddr = 0;
-	char **pDataBase = (char **) &Eep->DataBase;
-	unsigned int *pEepBase = (unsigned int *) &Eep->EepBase;
-	unsigned int *pLength = (unsigned int *) &Eep->Length;
+	const tU8 GapOfAnotherSector = 10;
+	tU8 **pDataBase = (tU8 **) &Eep->DataBase;
+	tU16 *pEepBase = (tU16 *) &Eep->EepBase;
+	tU16 *pLength = (tU16 *) &Eep->Length;
 	tag_EepBitField *pBit = (tag_EepBitField *) &Eep->Bit;
-
+	tag_EepCommonConfig **pConfig = (tag_EepCommonConfig **) &Eep->Config;
 
 	/*
 		1) 인수
 			- Eep : tag_EepControl 인스턴스의 주소
 			- DataBase : eeprom을 통해 관리할 대상의 시작주소
 			- Length : 관리할 대상의 크기
+			- Config : Eeprom에 대한 크기 정보, HAL 함수 정보를 가지고 있는 tag_EepCommonConfig 구조체 인스턴스의 주소.
 
 		2) 반환
 			- 초기화 성공 여부
@@ -39,25 +68,34 @@ char InitEepControl(tag_EepControl *Eep, const unsigned char *DataBase, unsigned
 			- tag_EepControl 인스턴스에 eeprom으로 부터 읽거나 쓸 대상의 주소와, 할당할 eeprom의 시작과 길이를 초기화한다.
 	*/
 
+	if(Config->Bit.Init == false)
+	{
+		return false;
+	}
 
-	pBit->Init = false;
+	*pConfig = (tag_EepCommonConfig *) Config;
+	//Link with "Eep" struct.
 
-	if((DataBase != 0) && (Length != 0) && ((AllocEepAddr + Length + GapOfAnotherSector) < EEPROM_SIZE))
+	if((DataBase != 0) && (Length != 0) && ((Config->AllocEepAddr + Length + GapOfAnotherSector) < Config->LastAddr))
 	{
 		*pLength = Length;
-		*pDataBase = (char *) DataBase;
-		*pEepBase = AllocEepAddr;
-		AllocEepAddr += (Length + GapOfAnotherSector);
+		*pDataBase = (tU8 *) DataBase;
+		*pEepBase = Config->AllocEepAddr;
+		Config->AllocEepAddr += (Length + GapOfAnotherSector);
 
-		pBit->Init = true;
+		pBit->InitGeneral = true;
 	}
 
-	return pBit->Init;
+	pBit->InitComplete = CheckAllOfInit(Eep);
+
+	return pBit->InitGeneral;
 }
 /*********************************************************************************/
 void DoEepReadControl(tag_EepControl *Eep)
 {
-	unsigned int Index = 0;
+	tU8 *pDataBase = (tU8 *) Eep->DataBase;
+	tU16 Index = 0;
+	tU8 Data;
 
 	/*
 		1) 인수
@@ -70,45 +108,24 @@ void DoEepReadControl(tag_EepControl *Eep)
 			- 해당 인스턴스의 eeprom으로 부터 데이터를 읽어와 대상 버퍼에 값을 대입.
 	*/
 
-	if(Eep->Bit.Init == false)
+	if(Eep->Bit.InitComplete == false)
 	{
 		return;
 		/* error or disabled */
 	}
 
 	do
 	{
-		Eep->DataBase[Index] = Eeprom_Read(Eep->EepBase + (Index));
+		Eep->Config->EepromRead(Eep->EepBase + (Index), &Data);
+		pDataBase[Index] = Data;
 	}while(++Index < Eep->Length);
 }
 /*********************************************************************************/
-void GetDataFromEeprom(char* const Dest, const int EepBase, int Length)
-{
-	unsigned int Index = 0;
-
-	/*
-		1) 인수
-			- Dest : eeprom으로 부터 읽은 데이터를 대입할 대상의 주소
-			- EepBase : 읽을 eeprom의 시작주소 (메모리 주소가 아님)
-			- Length : 읽어올 데이터의 길이.
-
-		2) 반환
-			- 없음.
-
-		3) 설명
-			- tag_EepControl 구조체를 사용하지 않고 임의 eeprom 영역으로 부터 데이터를 읽어와 대상 버퍼에 값을 대입한다.
-	*/
-
-	do
-	{
-		Dest[Index] = Eeprom_Read(EepBase + Index);
-	}while(++Index < Length);
-}
-/*********************************************************************************/
-char DoEepWriteControl(tag_EepControl *Eep)
+tU8 DoEepWriteControl(tag_EepControl *Eep)
 {
-	unsigned int *pIndex = (unsigned int *) &Eep->Index;
+	tU16 *pIndex = (tU16 *) &Eep->Index;
 	tag_EepBitField *pBit;
+	tU8 Data = 0;
 
 	/*
 		1) 인수
@@ -125,18 +142,18 @@ char DoEepWriteControl(tag_EepControl *Eep)
 			- 값이 유효하여 쓰기를 진행하거나 해당영역의 마지막에 도달할 경우에만 while loop를 탈출한다.
 	*/
 
-
-	if((Eep->Bit.Init == false) || (Eep->Bit.Write == false))
+	if((Eep->Bit.InitComplete == false) || (Eep->Bit.Write == false))
 	{
 		return false;
 		/* error or disabled */
 	}
 
 	while(true)
 	{
-		if(Eeprom_Read(Eep->EepBase + (*pIndex)) != Eep->DataBase[*pIndex])
+		Eep->Config->EepromRead(Eep->EepBase + (*pIndex), &Data);
+		if(Data != Eep->DataBase[*pIndex])
 		{
-			Eeprom_Write(Eep->EepBase + (*pIndex), Eep->DataBase[*pIndex]);
+			Eep->Config->EepromWrite(Eep->EepBase + (*pIndex), Eep->DataBase[*pIndex]);
 			return true;
 			/* check valid data */
 		}
@@ -165,42 +182,16 @@ void SetEepWriteEnable(tag_EepControl *Eep)
 			- 'Eep.Bit.Write' 상태가 'true'일 때 DoEepWriteControl()함수가 쓰기 동작을 실행한다.
 	*/
 
+	if(Eep->Bit.InitComplete == false)
+	{
+		return;
+		/* error or disabled */
+	}
+
 	tag_EepBitField *pBit = (tag_EepBitField *) &Eep->Bit;
-	unsigned int *pIndex = (unsigned int *) &Eep->Index;
+	tU16 *pIndex = (tU16 *) &Eep->Index;
 
 	pBit->Write = true;
 	*pIndex = 0;
 }
 /*********************************************************************************/
-void Eeprom_Write(unsigned int Addr, char Data)
-{
-	char cSREG;
-
-	while(EECR & 0x02) _WDR();
-	EEAR = Addr;
-	EEDR = Data;
-
-	cSREG = SREG;
-	/* stored status register */
-
-	SREG &= ~0x80;
-	/* disable global interrupt */
-
-	EECR |= 0x04;
-	/* enable EEPROM Master Write EEMWE */
-
-	EECR |= 0x02;
-	/* enable EEPROM Write EEWE */
-
-	SREG = cSREG;
-	/* restored register */
-}
-/*********************************************************************************/
-char Eeprom_Read(unsigned int Addr)
-{
-	while(EECR & 0x02) _WDR();
-	EEAR = Addr;
-	EECR |= 0x01;
-	return EEDR;
-}
-/*********************************************************************************/

AvrEeprom.h SysEeprom.hAvrEeprom.h renamed to SysEeprom.h

@@ -1,16 +1,23 @@
 /*********************************************************************************/
 /*
  * Author : Jeong Hyun Gu
- * File name : AvrEeprom.h
+ * File name : SysEeprom.h
 */
 /*********************************************************************************/
-#ifndef __AVR_EEPROM_H__
-#define	__AVR_EEPROM_H__
+#ifndef __SYS_EEPROM_H__
+#define	__SYS_EEPROM_H__
 /*********************************************************************************/
-#define AVR_EEPROM_REVISION_DATE		20190114
+#include "SysTypedef.h"
+/*********************************************************************************/
+#define SYS_EEPROM_REVISION_DATE		20190723
 /*********************************************************************************/
 /** REVISION HISTORY **/
 /*
+	2019. 07. 23.					- Eeprom_Write(), Eeprom_Read() 삭제하고 HAL 적용.
+	Jeong Hyun Gu					- 접두어 AVR -> SYS로 변경.
+												- GetDataFromEeprom() 삭제.
+												- "tag_EepCommonConfig" 추가.
+
 	2019. 01. 14.					- CPU타입 __AVR_ATMEGA2560__ 추가.
 	Jeong Hyun Gu
 
@@ -38,46 +45,6 @@
 #define	true		1
 #define	false		0
 
-
-#define __AVR_ATMEGA2560__
-
-
-#ifdef __AVR_ATMEGA8__
-#include <iom8.h>
-#define	EEPROM_SIZE		512
-/* Endurance: 100,000 Write/Erase */
-#endif
-
-#ifdef __AVR_ATMEGA16__
-#include <iom16.h>
-#define	EEPROM_SIZE		512
-/* Endurance: 100,000 Write/Erase */
-#endif
-
-#ifdef __AVR_ATMEGA32__
-#include <iom32.h>
-#define	EEPROM_SIZE		1024
-/* Endurance: 100,000 Write/Erase */
-#endif
-
-#ifdef __AVR_ATMEGA64__
-#include <iom64.h>
-#define	EEPROM_SIZE		2048
-/* Endurance: 100,000 Write/Erase */
-#endif
-
-#ifdef __AVR_ATMEGA128__
-#include <iom128.h>
-#define	EEPROM_SIZE		4096
-/* Endurance: 100,000 Write/Erase */
-#endif
-
-#ifdef __AVR_ATMEGA2560__
-#include <iom2560.h>
-#define	EEPROM_SIZE		4096
-/* Endurance: 100,000 Write/Erase */
-#endif
-
 /*********************************************************************************/
 /**Enum**/
 
@@ -87,33 +54,46 @@
 
 typedef struct
 {
-	char Init						:		1;
-	char Write					:		1;
+	struct
+	{
+		tU8 Init						:		1;
+	}Bit;
+
+	const tU16 LastAddr;					// eeprom마지막 주소(크기)
+	tU16 AllocEepAddr;
+
+	tU8 (*EepromWrite)(tU16 Addr, tU8 Data);
+	tU8 (*EepromRead)(tU16 Addr, tU8 *pData);
+}tag_EepCommonConfig;
+
+typedef struct
+{
+	tU8 InitGeneral			:		1;
+	tU8 InitComplete		:		1;
+	tU8 Write						:		1;
 }tag_EepBitField;
 
-typedef const struct
+typedef struct
 {
-	char *DataBase;								// 관리할 데이터의 시작 주소
-	unsigned int EepBase; 				// eeprom의 시작 주소
-	unsigned int Index;	 					// 쓰기 인덱스
-	unsigned int Length; 					// 관리할 데이터의 길이
+	const tag_EepBitField Bit;
+	const tag_EepCommonConfig *Config;
 
-	tag_EepBitField Bit;
+	const tU16 EepBase; 					// eeprom의 시작 주소
+	const tU8 *DataBase;					// 관리할 데이터의 시작 주소
+
+	const tU16 Index;	 					// 쓰기 인덱스
+ 	const tU16 Length; 					// 관리할 데이터의 길이
 }tag_EepControl;
 
 /*********************************************************************************/
 /**Function**/
 
-char InitEepControl(tag_EepControl *Eep, const unsigned char *DataBase, unsigned int Length);
-
-void DoEepReadControl(tag_EepControl *Eep);
-void GetDataFromEeprom(char* const Dest, const int EepBase, int Length);
+tU8 InitEepCommonConfig(tag_EepCommonConfig *EepConfig, tU16 LastAddr, tU8 (*EepromWrite)(tU16 Addr, tU8 Data), tU8 (*EepromRead)(tU16 Addr, tU8 *pData));
+tU8 InitEepControl(tag_EepControl *Eep, const tU8 *DataBase, tU16 Length, tag_EepCommonConfig *EepConfig);
 
-char DoEepWriteControl(tag_EepControl *Eep);
 void SetEepWriteEnable(tag_EepControl *Eep);
-
-void Eeprom_Write(unsigned int Addr, char Data);
-char Eeprom_Read(unsigned int Addr);
+void DoEepReadControl(tag_EepControl *Eep);
+tU8 DoEepWriteControl(tag_EepControl *Eep);
 
 /*********************************************************************************/
-#endif //__AVR_EEPROM_H__
+#endif //__SYS_EEPROM_H__