X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Feeprom.c;h=e951daee5b20bcf2cdb71cdf3c5e518ed9b47947;hb=06f0503a2066ab4fd13529b8ed8906e52b1d672b;hp=81b295888e195e02a1b15a59580161c90097e846;hpb=018b68ae17c81e82f8a1991f518c08107657bc9b;p=bertos.git

diff --git a/drv/eeprom.c b/drv/eeprom.c
index 81b29588..e951daee 100755
--- a/drv/eeprom.c
+++ b/drv/eeprom.c
@@ -2,7 +2,7 @@
  * \file
  * <!--
  * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
- * All Rights Reserved.
+ * This file is part of DevLib - See devlib/README for information.
  * -->
  *
  * \brief Driver for the 24xx16 and 24xx256 I2C EEPROMS (implementation)
@@ -16,6 +16,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.13  2004/11/16 20:58:51  bernie
+ *#* Add write verify.
+ *#*
+ *#* Revision 1.12  2004/11/02 17:50:01  bernie
+ *#* CONFIG_EEPROM_VERIFY: New config option.
+ *#*
+ *#* Revision 1.11  2004/10/26 08:35:31  bernie
+ *#* Reset watchdog for long operations.
+ *#*
  *#* Revision 1.10  2004/09/20 03:31:22  bernie
  *#* Sanitize for C++.
  *#*
@@ -50,15 +59,22 @@
 
 #include "eeprom.h"
 
+#include <drv/wdt.h>
 #include <mware/byteorder.h> /* cpu_to_be16() */
 #include <debug.h>
 #include <hw.h>
+#include <config.h>  // CONFIG_EEPROM_VERIFY
 #include <macros.h>  // MIN()
 
-#include <string.h> // memset()
+#include <string.h>  // memset()
 
 #include <avr/twi.h>
 
+// Configuration sanity checks
+#if !defined(CONFIG_EEPROM_VERIFY) || (CONFIG_EEPROM_VERIFY != 0 && CONFIG_EEPROM_VERIFY != 1)
+	#error CONFIG_EEPROM_VERIFY must be defined to either 0 or 1
+#endif
+
 
 /* Wait for TWINT flag set: bus is ready */
 #define WAIT_TWI_READY  do {} while (!(TWCR & BV(TWINT)))
@@ -230,7 +246,7 @@ static bool twi_recv(void *_buf, size_t count)
  * Copy \c count bytes from buffer \c buf to
  * eeprom at address \c addr.
  */
-bool eeprom_write(e2addr_t addr, const void *buf, size_t count)
+static bool eeprom_writeRaw(e2addr_t addr, const void *buf, size_t count)
 {
 	bool result = true;
 	ASSERT(addr + count <= EEPROM_SIZE);
@@ -285,13 +301,78 @@ bool eeprom_write(e2addr_t addr, const void *buf, size_t count)
 		buf = ((const char *)buf) + size;
 	}
 
+	if (!result)
+		TRACEMSG("Write error!");
 	return result;
 }
 
 
+#if CONFIG_EEPROM_VERIFY
+/*!
+ * Check that the contents of an EEPROM range
+ * match with a provided data buffer.
+ *
+ * \return true on success.
+ */
+static bool eeprom_verify(e2addr_t addr, const void *buf, size_t count)
+{
+	uint8_t verify_buf[16];
+	bool result = true;
+
+	while (count && result)
+	{
+		/* Split read in smaller pieces */
+		size_t size = MIN(count, sizeof verify_buf);
+
+		/* Read back buffer */
+		if (eeprom_read(addr, verify_buf, size))
+		{
+			if (memcmp(buf, verify_buf, size) != 0)
+			{
+				TRACEMSG("Data mismatch!");
+				result = false;
+			}
+		}
+		else
+		{
+			TRACEMSG("Read error!");
+			result = false;
+		}
+
+		/* Update count and addr for next operation */
+		count -= size;
+		addr += size;
+		buf = ((const char *)buf) + size;
+	}
+
+	return result;
+}
+#endif /* CONFIG_EEPROM_VERIFY */
+
+
+bool eeprom_write(e2addr_t addr, const void *buf, size_t count)
+{
+#if CONFIG_EEPROM_VERIFY
+	int retries = 5;
+
+	while (retries--)
+		if (eeprom_writeRaw(addr, buf, count)
+				&& eeprom_verify(addr, buf, count))
+			return true;
+
+	return false;
+
+#else /* !CONFIG_EEPROM_VERIFY */
+	return eeprom_writeRaw(addr, buf, count);
+#endif /* !CONFIG_EEPROM_VERIFY */
+}
+
+
 /*!
  * Copy \c count bytes at address \c addr
  * from eeprom to RAM to buffer \c buf.
+ *
+ * \return true on success.
  */
 bool eeprom_read(e2addr_t addr, void *buf, size_t count)
 {
@@ -327,6 +408,8 @@ bool eeprom_read(e2addr_t addr, void *buf, size_t count)
 
 	twi_stop();
 
+	if (!res)
+		TRACEMSG("Read error!");
 	return res;
 }
 
@@ -370,6 +453,9 @@ void eeprom_erase(e2addr_t addr, size_t count)
 	// Clear all but struct hw_info at start of eeprom
 	while (count)
 	{
+		// Long operation, reset watchdog
+		wdt_reset();
+
 		size_t size = MIN(count, sizeof buf);
 		eeprom_write(addr, buf, size);
 		addr += size;
@@ -386,6 +472,13 @@ void eeprom_init(void)
 	cpuflags_t flags;
 	DISABLE_IRQSAVE(flags);
 
+	/*
+	 * This is pretty useless according to AVR's datasheet,
+	 * but it helps us driving the TWI data lines on boards
+	 * where the bus pull-up resistors are missing.  This is
+	 * probably due to some unwanted interaction between the
+	 * port pin and the TWI lines.
+	 */
 #if defined(__AVR_ATmega64__)
 	PORTD |= BV(PD0) | BV(PD1);
 	DDRD |= BV(PD0) | BV(PD1);
@@ -400,7 +493,7 @@ void eeprom_init(void)
 	 * Set speed:
 	 * F = CLOCK_FREQ / (16 + 2*TWBR * 4^TWPS)
 	 */
-	#define TWI_FREQ  300000  /* 300 kHz */
+	#define TWI_FREQ  100000  /* ~100 kHz */
 	#define TWI_PRESC 1       /* 4 ^ TWPS */
 
 	TWBR = (CLOCK_FREQ / (2 * TWI_FREQ * TWI_PRESC)) - (8 / TWI_PRESC);