MFp4: consolidate #include files down to lib.h

4 files changed, 24 insertions, 69 deletions

diff --git a/sys/boot/arm/at91/libat91/eeprom.h b/sys/boot/arm/at91/libat91/eeprom.h
deleted file mode 100644
index 9f41ac4..0000000
--- a/sys/boot/arm/at91/libat91/eeprom.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- *
- * Filename: eeprom.h
- *
- * Definition of eeprom routines
- *
- * Revision information:
- *
- * 28AUG2004	kb_admin	initial creation - adapted from Atmel sources
- * 12JAN2005	kb_admin	add init
- *
- * BEGIN_KBDD_BLOCK
- * No warranty, expressed or implied, is included with this software.  It is
- * provided "AS IS" and no warranty of any kind including statutory or aspects
- * relating to merchantability or fitness for any purpose is provided.  All
- * intellectual property rights of others is maintained with the respective
- * owners.  This software is not copyrighted and is intended for reference
- * only.
- * END_BLOCK
- *
- * $FreeBSD$
- ******************************************************************************/
-
-#ifndef _EEPROM_H_
-#define _EEPROM_H_
-
-#endif /* _EEPROM_H_ */
diff --git a/sys/boot/arm/at91/libat91/lib.h b/sys/boot/arm/at91/libat91/lib.h
index 73a1f47..8e3b25b 100644
--- a/sys/boot/arm/at91/libat91/lib.h
+++ b/sys/boot/arm/at91/libat91/lib.h
@@ -33,11 +33,32 @@ void printf(const char *fmt,...);
 
 /* The following function write eeprom at ee_addr using data 	*/
 /*  from data_add for size bytes.				*/
-void ReadEEPROM(unsigned ee_addr, char *data_addr, unsigned size);
-void WriteEEPROM(unsigned ee_addr, char *data_addr, unsigned size);
+void ReadEEPROM(unsigned eeoff, char *data_addr, unsigned size);
+void WriteEEPROM(unsigned eeoff, char *data_addr, unsigned size);
 void InitEEPROM(void);
 
 /* XMODEM protocol */
 int xmodem_rx(char *dst);
 
+/*  */
+void start_wdog(int n);
+void reset(void);
+
+/* Delay us */
+void Delay(int us);
+
+#define ToASCII(x) ((x > 9) ? (x + 'A' - 0xa) : (x + '0'))
+
+int p_IsWhiteSpace(char cValue);
+unsigned p_HexCharValue(char cValue);
+unsigned p_ASCIIToHex(const char *buf);
+unsigned p_ASCIIToDec(const char *buf);
+
+void p_memset(char *buffer, char value, int size);
+int p_strlen(const char *buffer);
+char *p_strcpy(char *to, const char *from);
+void p_memcpy(char *to, const char *from, unsigned size);
+int p_memcmp(const char *to, const char *from, unsigned size);
+int p_strcmp(const char *to, const char *from);
+
 #endif
diff --git a/sys/boot/arm/at91/libat91/p_string.c b/sys/boot/arm/at91/libat91/p_string.c
index 743b011..6d38e4f 100644
--- a/sys/boot/arm/at91/libat91/p_string.c
+++ b/sys/boot/arm/at91/libat91/p_string.c
@@ -23,7 +23,7 @@
  * $FreeBSD$
  *****************************************************************************/
 
-#include "p_string.h"
+#include "lib.h"
 
 /*
  * .KB_C_FN_DEFINITION_START
diff --git a/sys/boot/arm/at91/libat91/p_string.h b/sys/boot/arm/at91/libat91/p_string.h
deleted file mode 100644
index d4461b3..0000000
--- a/sys/boot/arm/at91/libat91/p_string.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/******************************************************************************
- *
- * Filename: p_string.h
- *
- * Definition of basic, private, string operations to prevent inclusion of full
- *
- * Revision information:
- *
- * 20AUG2004	kb_admin	initial creation
- *
- * BEGIN_KBDD_BLOCK
- * No warranty, expressed or implied, is included with this software.  It is
- * provided "AS IS" and no warranty of any kind including statutory or aspects
- * relating to merchantability or fitness for any purpose is provided.  All
- * intellectual property rights of others is maintained with the respective
- * owners.  This software is not copyrighted and is intended for reference
- * only.
- * END_BLOCK
- *
- * $FreeBSD$
- *****************************************************************************/
-
-#ifndef _P_STRING_H_
-#define _P_STRING_H_
-
-#define ToASCII(x) ((x > 9) ? (x + 'A' - 0xa) : (x + '0'))
-
-int p_IsWhiteSpace(char cValue);
-unsigned p_HexCharValue(char cValue);
-void p_memset(char *buffer, char value, int size);
-int p_strlen(const char *buffer);
-char *p_strcpy(char *to, const char *from);
-unsigned p_ASCIIToHex(const char *buf);
-unsigned p_ASCIIToDec(const char *buf);
-void p_memcpy(char *to, const char *from, unsigned size);
-int p_memcmp(const char *to, const char *from, unsigned size);
-int p_strcmp(const char *to, const char *from);
-
-#endif /* _P_STRING_H_ */