Merge from kseries.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1095 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/drv/eeprom.h b/drv/eeprom.h
index 5e3f78a280aa090c580ae1ba8667ebca827a4042..21ae105ae6c49a3faa3ba536b30912f769a26f83 100644 (file)
--- a/drv/eeprom.h
+++ b/drv/eeprom.h
@@ -71,9 +71,10 @@ typedef uint16_t e2addr_t;
  * \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.
+ * \note 'type' is the structure type holding eeprom layout
+ *       and must be defined in user files.
  */
-#define e2addr(x) ((e2addr_t)&(((struct E2Layout *)0)->x))
+#define e2addr(type, field) ((e2addr_t)&(((type *)0)->field))
 
 
 bool eeprom_write(e2addr_t addr, const void *buf, size_t count);

diff --git a/gfx/win.c b/gfx/win.c
index f2f7efe32247ce34af9d47d0db29a028a03a0daa..4925ace68c2bd97534335ff3627e11b36f29cc65 100644 (file)
--- a/gfx/win.c
+++ b/gfx/win.c
@@ -45,6 +45,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.2  2006/08/01 17:26:04  batt
+ *#* Update docs.
+ *#*
+ *#* Revision 1.1  2006/08/01 15:43:01  batt
+ *#* Add in board_kd current edited channel visualization.
+ *#*
  *#* Revision 1.4  2006/07/19 12:56:26  bernie
  *#* Convert to new Doxygen style.
  *#*
@@ -65,8 +71,8 @@
 /**
  * Map the contents of all child-windows into the bitmap of \a w.
  *
- * Please note that recursively draw children into their parent
- * effectively damages the parent buffer.
+ * \note Recursively drawing children into their parent
+ *       effectively damages the parent buffer.
  */
 void win_compose(Window *w)
 {
@@ -202,7 +208,6 @@ void win_resize(Window *w, coord_t width, coord_t height)
 /**
  * Initialize a new window structure.
  *
- *
  * The new window initial position is set to (0,0).
  * The size is set to the size of the installed bitmap,
  * or (0,0) if there's no backing store.

diff --git a/verstag.h b/verstag.h
index 343d6136678ee13ba2c905ff0f08e6bb39ac99bc..a37bcc1112d53d7a98119ce8fe78ef6353199cea 100644 (file)
--- a/verstag.h
+++ b/verstag.h
@@ -41,7 +41,7 @@
 #define DEVLIB_VERSTAG_H
 
 #ifndef ARCH_CONFIG_H
-       #include "cfg/arch_config.h"
+       #include <cfg/arch_config.h>
 #endif
 
 #define APP_NAME "Appname"