Use new naming convention for list macros.

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

diff --git a/drv/kbd.c b/drv/kbd.c
index e231536524f2397cfb7c3a316f2a76b3417c75bf..f85f897c2b3c48cc60efb49d8374946f168bb78b 100755 (executable)
--- a/drv/kbd.c
+++ b/drv/kbd.c
@@ -17,6 +17,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.4  2006/02/24 00:27:14  bernie
+ *#* Use new naming convention for list macros.
+ *#*
  *#* Revision 1.3  2006/02/17 21:15:42  bernie
  *#* Add MOD_CHECK() checks.
  *#*
@@ -94,7 +97,7 @@ static void kbd_poll(void)
        keymask_t key = kbd_readkeys();
 
        /* Call raw input handlers */
-       FOREACHNODE(handler, &kbd_rawHandlers)
+       FOREACH_NODE(handler, &kbd_rawHandlers)
                key = handler->hook(key);
 
        /* If this key was not previously pressed */
@@ -104,7 +107,7 @@ static void kbd_poll(void)
                current_key = key;
 
                /* Call cooked input handlers */
-               FOREACHNODE(handler, &kbd_handlers)
+               FOREACH_NODE(handler, &kbd_handlers)
                        key = handler->hook(key);
        }
 }
@@ -221,12 +224,12 @@ void kbd_addHandler(struct KbdHandler *handler)
         * Search for the first node whose priority
         * is lower than the timer we want to add.
         */
-       FOREACHNODE(node,list)
+       FOREACH_NODE(node,list)
                if (node->pri < handler->pri)
                        break;
 
        /* Enqueue handler in the handlers chain */
-       INSERTBEFORE(&handler->link, &node->link);
+       INSERT_BEFORE(&handler->link, &node->link);
 
        IRQ_RESTORE(flags);
 }

diff --git a/drv/lcd_text.c b/drv/lcd_text.c
index 284c8b020d8ff5628971a3cae9615ed2f4002980..0527e520696d2e542c825fab2f21b1d4e873d281 100755 (executable)
--- a/drv/lcd_text.c
+++ b/drv/lcd_text.c
@@ -14,6 +14,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.2  2006/02/24 00:27:14  bernie
+ *#* Use new naming convention for list macros.
+ *#*
  *#* Revision 1.1  2005/11/04 18:00:42  bernie
  *#* Import into DevLib.
  *#*
@@ -278,7 +281,7 @@ int lcd_printf(Layer *layer, lcdpos_t addr, uint8_t mode, const char *format, ..
 
 
 /*!
- * Internal function to move a layer betweet two positions.
+ * Internal function to move a layer between two positions.
  *
  * \note The layer must be *already* enqueued in some list.
  * \note The display must be already locked!
@@ -296,12 +299,12 @@ static void lcd_enqueueLayer(Layer *layer, char pri)
         * Search for the first layer whose priority
         * is less or equal to the layer we are adding.
         */
-       FOREACHNODE(l2, &lcd_Layers)
+       FOREACH_NODE(l2, &lcd_Layers)
                if (l2->pri <= pri)
                        break;
 
        /* Enqueue layer */
-       INSERTBEFORE(layer, l2);
+       INSERT_BEFORE(layer, l2);
 }
 
 Layer *lcd_newLayer(char pri)
@@ -339,7 +342,7 @@ static void lcd_refresh(void)
 
        for (addr = 0; addr < LCD_ROWS * LCD_COLS; ++addr)
        {
-               FOREACHNODE(l, &lcd_Layers)
+               FOREACH_NODE(l, &lcd_Layers)
                {
                        //kprintf("%d %x %p\n", addr, l->buf[0], l);
                        if (l->pri == LAYER_HIDDEN)