X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Feeprom.h;h=e23cd138371da8bda3a624a5fc7061cd041bfb2c;hb=70fbca7abd15ab931dc82119f5b0b8f7b3fe1596;hp=7b7c44e6044e47ad2dfea9e20142397a79cb0870;hpb=76c53bfa0136be55cf17e57b1ee098e5dfeefa70;p=bertos.git

diff --git a/drv/eeprom.h b/drv/eeprom.h
old mode 100755
new mode 100644
index 7b7c44e6..e23cd138
--- a/drv/eeprom.h
+++ b/drv/eeprom.h
@@ -1,8 +1,33 @@
-/*!
+/**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \version $Id$
@@ -15,6 +40,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.10  2006/09/13 18:29:54  bernie
+ *#* e2addr(): New macro.
+ *#*
+ *#* Revision 1.9  2006/07/19 12:56:25  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.8  2005/11/27 23:33:40  bernie
+ *#* Use appconfig.h instead of cfg/config.h.
+ *#*
  *#* Revision 1.7  2005/11/04 16:20:02  bernie
  *#* Fix reference to README.devlib in header.
  *#*
@@ -41,9 +75,9 @@
 #define DRV_EEPROM_H
 
 #include <cfg/compiler.h>
-#include <cfg/config.h>
+#include <appconfig.h>
 
-/*!
+/**
  * \name Values for CONFIG_EEPROM_TYPE
  * \{
  */
@@ -52,18 +86,29 @@
 /*\}*/
 
 #if CONFIG_EEPROM_TYPE == EEPROM_24XX16
-	#define EEPROM_BLKSIZE   0x10 //!< Eeprom block size (16byte)
-	#define EEPROM_SIZE     0x800 //!< Eeprom total size (2kB)
+	#define EEPROM_BLKSIZE   0x10 ///< Eeprom block size (16byte)
+	#define EEPROM_SIZE     0x800 ///< Eeprom total size (2kB)
 #elif CONFIG_EEPROM_TYPE == EEPROM_24XX256
-	#define EEPROM_BLKSIZE   0x40 //!< Eeprom block size (64byte)
-	#define EEPROM_SIZE    0x8000 //!< Eeprom total size (32kB)
+	#define EEPROM_BLKSIZE   0x40 ///< Eeprom block size (64byte)
+	#define EEPROM_SIZE    0x8000 ///< Eeprom total size (32kB)
 #else
 	#error Unsupported EEPROM type.
 #endif
 
-//! Type for EEPROM addresses
+/// Type for EEPROM addresses
 typedef uint16_t e2addr_t;
 
+/**
+ * Macro for E2Layout offset calculation
+ *
+ * \note We can't just use offsetof() here because we could use
+ *       non-constant expressions to access array elements.
+ *
+ * \note E2Layout is a structure that must be defined in user files.
+ */
+#define e2addr(x) ((e2addr_t)&(((struct E2Layout *)0)->x))
+
+
 bool eeprom_write(e2addr_t addr, const void *buf, size_t count);
 bool eeprom_read(e2addr_t addr, void *buf, size_t count);
 bool eeprom_write_char(e2addr_t addr, char c);