/*!
* \file
* <!--
- * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See devlib/README for information.
+ * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
+ * This file is part of DevLib - See README.devlib for information.
* -->
*
* \brief Driver for the 24xx16 and 24xx256 I2C EEPROMS (implementation)
/*#*
*#* $Log$
- *#* Revision 1.15 2005/01/06 16:09:40 aleph
- *#* Split twi/eeprom functions from eeprom module in separate twi module
+ *#* 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.14 2004/12/13 12:07:06 bernie
- *#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE.
+ *#* Revision 1.18 2005/11/27 23:33:40 bernie
+ *#* Use appconfig.h instead of cfg/config.h.
*#*
- *#* Revision 1.13 2004/11/16 20:58:51 bernie
- *#* Add write verify.
+ *#* Revision 1.17 2005/04/11 19:10:27 bernie
+ *#* Include top-level headers from cfg/ subdir.
*#*
- *#* Revision 1.12 2004/11/02 17:50:01 bernie
- *#* CONFIG_EEPROM_VERIFY: New config option.
+ *#* Revision 1.16 2005/03/01 23:25:09 bernie
+ *#* Prune CVS log.
*#*
*#* Revision 1.11 2004/10/26 08:35:31 bernie
*#* Reset watchdog for long operations.
*#*
*#* 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 <macros.h>
- *#*
- *#* Revision 1.6 2004/08/24 14:27:20 bernie
- *#* Doxygen fix.
- *#*
- *#* Revision 1.5 2004/08/24 13:46:48 bernie
- *#* Include <macros.h>.
- *#*
- *#* 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 <debug.h>
-#include <config.h> // CONFIG_EEPROM_VERIFY
-#include <macros.h> // MIN()
+#include <cfg/debug.h>
+#include <appconfig.h> // CONFIG_EEPROM_VERIFY
+#include <cfg/macros.h> // MIN()
#include <drv/twi.h>
#include <drv/wdt.h>
#include <mware/byteorder.h> // cpu_to_be16()
#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
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);
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);
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
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