X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Feeprom.c;h=fb83a07148022570b427da94a059479e167f1ef1;hb=bcf38f772b397e7a8ba781a69aacb9380e54b32a;hp=6a136e75d4ff0f208ba8f947dc724f3768ac1bc4;hpb=af9c555446161016fdd76c1cdff96ce76bb6cba2;p=bertos.git

diff --git a/drv/eeprom.c b/drv/eeprom.c
index 6a136e75..fb83a071 100755
--- a/drv/eeprom.c
+++ b/drv/eeprom.c
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
@@ -16,6 +16,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.20  2006/07/19 12:56:25  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.19  2006/03/20 17:49:50  bernie
+ *#* Make the TWI driver more generic to work with devices other than EEPROMS.
+ *#*
+ *#* Revision 1.18  2005/11/27 23:33:40  bernie
+ *#* Use appconfig.h instead of cfg/config.h.
+ *#*
  *#* Revision 1.17  2005/04/11 19:10:27  bernie
  *#* Include top-level headers from cfg/ subdir.
  *#*
@@ -35,7 +44,7 @@
 #include "eeprom.h"
 
 #include <cfg/debug.h>
-#include <cfg/config.h>  // CONFIG_EEPROM_VERIFY
+#include <appconfig.h>  // CONFIG_EEPROM_VERIFY
 #include <cfg/macros.h>  // MIN()
 #include <drv/twi.h>
 #include <drv/wdt.h>
@@ -49,8 +58,20 @@
 	#error CONFIG_EEPROM_VERIFY must be defined to either 0 or 1
 #endif
 
+/**
+ * EEPROM ID code
+ */
+#define EEPROM_ID  0xA0
+
+/**
+ * This macros form the correct slave address for EEPROMs
+ */
+#define EEPROM_ADDR(x) (EEPROM_ID | (((uint8_t)(x)) << 1))
+
+
+
 
-/*!
+/**
  * Copy \c count bytes from buffer \c buf to
  * eeprom at address \c addr.
  */
@@ -77,7 +98,7 @@ static bool eeprom_writeRaw(e2addr_t addr, const void *buf, size_t count)
 		uint8_t blk_offs = (uint8_t)addr;
 
 		result =
-			twi_start_w(blk_addr)
+			twi_start_w(EEPROM_ADDR(blk_addr))
 			&& twi_send(&blk_offs, sizeof blk_offs)
 			&& twi_send(buf, size);
 
@@ -87,7 +108,7 @@ static bool eeprom_writeRaw(e2addr_t addr, const void *buf, size_t count)
 		uint16_t addr_be = cpu_to_be16(addr);
 
 		result =
-			twi_start_w(0)
+			twi_start_w(EEPROM_ID)
 			&& twi_send((uint8_t *)&addr_be, sizeof addr_be)
 			&& twi_send(buf, size);
 
@@ -116,7 +137,7 @@ static bool eeprom_writeRaw(e2addr_t addr, const void *buf, size_t count)
 
 
 #if CONFIG_EEPROM_VERIFY
-/*!
+/**
  * Check that the contents of an EEPROM range
  * match with a provided data buffer.
  *
@@ -176,7 +197,7 @@ bool eeprom_write(e2addr_t addr, const void *buf, size_t count)
 }
 
 
-/*!
+/**
  * Copy \c count bytes at address \c addr
  * from eeprom to RAM to buffer \c buf.
  *
@@ -195,9 +216,9 @@ bool eeprom_read(e2addr_t addr, void *buf, size_t count)
 	uint8_t blk_offs = (uint8_t)addr;
 
 	bool res =
-		twi_start_w(blk_addr)
+		twi_start_w(EEPROM_ADDR(blk_addr))
 		&& twi_send(&blk_offs, sizeof blk_offs)
-		&& twi_start_r(blk_addr)
+		&& twi_start_r(EEPROM_ADDR(blk_addr))
 		&& twi_recv(buf, count);
 
 #elif CONFIG_EEPROM_TYPE == EEPROM_24XX256
@@ -206,9 +227,9 @@ bool eeprom_read(e2addr_t addr, void *buf, size_t count)
 	addr = cpu_to_be16(addr);
 
 	bool res =
-		twi_start_w(0)
+		twi_start_w(EEPROM_ID)
 		&& twi_send((uint8_t *)&addr, sizeof(addr))
-		&& twi_start_r(0)
+		&& twi_start_r(EEPROM_ID)
 		&& twi_recv(buf, count);
 #else
 	#error Unknown device type
@@ -222,7 +243,7 @@ bool eeprom_read(e2addr_t addr, void *buf, size_t count)
 }
 
 
-/*!
+/**
  * Write a single character \a c at address \a addr.
  */
 bool eeprom_write_char(e2addr_t addr, char c)
@@ -231,7 +252,7 @@ bool eeprom_write_char(e2addr_t addr, char c)
 }
 
 
-/*!
+/**
  * Read a single character at address \a addr.
  *
  * \return the requested character or -1 in case of failure.
@@ -247,7 +268,7 @@ int eeprom_read_char(e2addr_t addr)
 }
 
 
-/*!
+/**
  * Erase specified part of eeprom, writing 0xFF.
  *
  * \param addr   starting address
@@ -272,7 +293,7 @@ void eeprom_erase(e2addr_t addr, size_t count)
 }
 
 
-/*!
+/**
  * Initialize TWI module.
  */
 void eeprom_init(void)