X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Feeprom.c;h=57861376151b1151ee38817421cd8961273e169d;hb=588cab3f6529b08952f17eebcb16a2a33e43e996;hp=9271b3176c4a6c4f9bd772a561f9b6d7af978cde;hpb=0dbd4bb1aaea65177ae6d60338a96657cffa5f32;p=bertos.git diff --git a/drv/eeprom.c b/drv/eeprom.c index 9271b317..57861376 100755 --- a/drv/eeprom.c +++ b/drv/eeprom.c @@ -2,52 +2,83 @@ * \file * * - * \version $Id$ - * - * \author Stefano Fedrigo - * \author Bernardo Innocenti - * * \brief Driver for the 24xx16 and 24xx256 I2C EEPROMS (implementation) * * \note This implementation is AVR specific. - */ - -/* - * $Log$ - * Revision 1.6 2004/08/24 14:27:20 bernie - * Doxygen fix. - * - * Revision 1.5 2004/08/24 13:46:48 bernie - * Include . - * - * Revision 1.4 2004/08/10 06:57:22 bernie - * eeprom_erase(): New function. - * - * Revision 1.3 2004/07/29 22:57:09 bernie - * Add 24LC16 support. - * - * Revision 1.2 2004/07/22 01:24:43 bernie - * Document AVR dependency. - * - * Revision 1.1 2004/07/20 17:11:18 bernie - * Import into DevLib. * + * \version $Id$ + * \author Stefano Fedrigo + * \author Bernardo Innocenti */ +/*#* + *#* $Log$ + *#* Revision 1.14 2004/12/13 12:07:06 bernie + *#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE. + *#* + *#* 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++. + *#* + *#* Revision 1.9 2004/09/14 21:03:46 bernie + *#* Use debug.h instead of kdebug.h. + *#* + *#* Revision 1.8 2004/08/25 14:12:08 rasky + *#* Aggiornato il comment block dei log RCS + *#* + *#* Revision 1.7 2004/08/24 16:48:40 bernie + *#* Note reason for including + *#* + *#* Revision 1.6 2004/08/24 14:27:20 bernie + *#* Doxygen fix. + *#* + *#* Revision 1.5 2004/08/24 13:46:48 bernie + *#* Include . + *#* + *#* Revision 1.4 2004/08/10 06:57:22 bernie + *#* eeprom_erase(): New function. + *#* + *#* Revision 1.3 2004/07/29 22:57:09 bernie + *#* Add 24LC16 support. + *#* + *#* Revision 1.2 2004/07/22 01:24:43 bernie + *#* Document AVR dependency. + *#* + *#* Revision 1.1 2004/07/20 17:11:18 bernie + *#* Import into DevLib. + *#* + *#*/ + #include "eeprom.h" +#include #include /* cpu_to_be16() */ -#include +#include #include -#include +#include // IRQ_SAVE_DISABLE(), IRQ_RESTORE() +#include // CONFIG_EEPROM_VERIFY +#include // MIN() -#include // memset() +#include // memset() #include +// 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))) @@ -151,8 +182,10 @@ static void twi_stop(void) * * \return true on success, false on error. */ -static bool twi_send(const uint8_t *buf, size_t count) +static bool twi_send(const void *_buf, size_t count) { + const uint8_t *buf = (const uint8_t *)_buf; + while (count--) { TWDR = *buf++; @@ -178,8 +211,10 @@ static bool twi_send(const uint8_t *buf, size_t count) * * \return true on success, false on error */ -static bool twi_recv(uint8_t *buf, size_t count) +static bool twi_recv(void *_buf, size_t count) { + uint8_t *buf = (uint8_t *)_buf; + /* * When reading the last byte the TWEA bit is not * set, and the eeprom should answer with NACK @@ -215,7 +250,7 @@ static bool twi_recv(uint8_t *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); @@ -270,13 +305,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) { @@ -312,6 +412,8 @@ bool eeprom_read(e2addr_t addr, void *buf, size_t count) twi_stop(); + if (!res) + TRACEMSG("Read error!"); return res; } @@ -355,6 +457,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; @@ -369,8 +474,15 @@ void eeprom_erase(e2addr_t addr, size_t count) void eeprom_init(void) { cpuflags_t flags; - DISABLE_IRQSAVE(flags); + IRQ_SAVE_DISABLE(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); @@ -385,14 +497,14 @@ 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); TWSR = 0; TWCR = BV(TWEN); - ENABLE_IRQRESTORE(flags); + IRQ_RESTORE(flags); } @@ -402,8 +514,8 @@ void eeprom_init(void) void eeprom_test(void) { - static const char magic[13] = "Humpty Dumpty"; - char buf[sizeof magic + 1]; + static const char magic[14] = "Humpty Dumpty"; + char buf[sizeof magic]; size_t i; // Write something to EEPROM using unaligned sequential writes