Changes in / [3558ba93:9521eca] in mainline

Files:

• kernel/generic/include/adt/list.h (modified) (3 diffs)
• tools/toolchain.sh (modified) (2 diffs)
• uspace/lib/c/include/adt/list.h (modified) (4 diffs)
• uspace/lib/gui/canvas.c (modified) (1 diff)
• uspace/lib/gui/canvas.h (modified) (1 diff)

kernel/generic/include/adt/list.h

@@ -37 +37 @@
 #define KERN_LIST_H_
 
-#include <debug.h>
 #include <typedefs.h>
 #include <trace.h>
@@ -74 +73 @@
             _link != &(list).head; _link = _link->next)
 
-#define list_foreach_rev(list, member, itype, iterator) \
-        for (itype *iterator = NULL; iterator == NULL; iterator = (itype *) 1) \
-            for (link_t *_link = (list).head.prev; \
-            iterator = list_get_instance(_link, itype, member), \
-            _link != &(list).head; _link = _link->prev)
-
 #define assert_link_not_used(link) \
-        ASSERT(!link_used(link))
+        ASSERT(((link)->prev == NULL) && ((link)->next == NULL))
 
 /** Initialize doubly-linked circular list link
@@ -326 +319 @@
 }
 
-/** Determine if link is used.
- *
- * @param link Link
- * @return @c true if link is used, @c false if not.
- */
-static inline bool link_used(link_t *link)
-{
-        if (link->prev == NULL && link->next == NULL)
-                return false;
-
-        ASSERT(link->prev != NULL && link->next != NULL);
-        return true;
-}
-
 extern int list_member(const link_t *, const list_t *);
 extern void list_concat(list_t *, list_t *);

tools/toolchain.sh

@@ -62 +62 @@
 
 BASEDIR="`pwd`"
-SRCDIR="$(readlink -f $(dirname "$0"))"
 BINUTILS="binutils-${BINUTILS_VERSION}${BINUTILS_RELEASE}.tar.bz2"
 GCC="gcc-${GCC_VERSION}.tar.bz2"
@@ -441 +440 @@
         echo ">>> Applying patches"
         for p in $BINUTILS_PATCHES; do
-                patch_sources "${SRCDIR}/${p}" 0 "binutils"
+                patch_sources "${BASEDIR}/${p}" 0 "binutils"
         done
         for p in $GCC_PATCHES; do
-                patch_sources "${SRCDIR}/${p}" 0 "GCC"
+                patch_sources "${BASEDIR}/${p}" 0 "GCC"
         done
         for p in $GDB_PATCHES; do
-                patch_sources "${SRCDIR}/${p}" 0 "GDB"
+                patch_sources "${BASEDIR}/${p}" 0 "GDB"
         done
         

uspace/lib/c/include/adt/list.h

@@ -38 +38 @@
 
 #include <assert.h>
-#include <stdbool.h>
 #include <unistd.h>
 
@@ -73 +72 @@
             iterator = list_get_instance(_link, itype, member), \
             _link != &(list).head; _link = _link->next)
-
-#define list_foreach_rev(list, member, itype, iterator) \
-        for (itype *iterator = NULL; iterator == NULL; iterator = (itype *) 1) \
-            for (link_t *_link = (list).head.prev; \
-            iterator = list_get_instance(_link, itype, member), \
-            _link != &(list).head; _link = _link->prev)
 
 /** Unlike list_foreach(), allows removing items while traversing a list.
@@ -112 +105 @@
 
 #define assert_link_not_used(link) \
-        assert(!link_used(link))
+        assert(((link)->prev == NULL) && ((link)->next == NULL))
 
 /** Returns true if the link is definitely part of a list. False if not sure. */
@@ -364 +357 @@
 }
 
-/** Determine if link is used.
- *
- * @param link Link
- * @return @c true if link is used, @c false if not.
- */
-static inline bool link_used(link_t *link)
-{
-        if (link->prev == NULL && link->next == NULL)
-                return false;
-
-        assert(link->prev != NULL && link->next != NULL);
-        return true;
-}
-
 extern int list_member(const link_t *, const list_t *);
 extern void list_concat(list_t *, list_t *);

uspace/lib/gui/canvas.c

@@ -112 +112 @@
 static void canvas_handle_position_event(widget_t *widget, pos_event_t event)
 {
-        canvas_t *canvas = (canvas_t *) widget;
-        pos_event_t tevent;
-        
-        tevent = event;
-        tevent.hpos -= widget->hpos;
-        tevent.vpos -= widget->vpos;
-        
-        sig_send(&canvas->position_event, &tevent);
+        /* No-op */
 }
 

uspace/lib/gui/canvas.h

@@ -50 +50 @@
         surface_t *surface;
         signal_t keyboard_event;
-        signal_t position_event;
 } canvas_t;