Changeset 3781092 in mainline for uspace/lib/c/include

Timestamp:

2011-09-09T18:22:33Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

40a2af3

Parents:

980671e7 (diff), 5da7199 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

Location:

uspace/lib/c/include

Files:

• adt/list.h (modified) (2 diffs)
• async.h (modified) (1 diff)
• async_obsolete.h (deleted)
• io/color.h (modified) (1 diff)
• io/console.h (modified) (3 diffs)
• io/screenbuffer.h (deleted)
• ipc/services.h (modified) (1 diff)

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

@@ -72 +72 @@
 
 #define assert_link_not_used(link) \
-        assert((link)->prev == NULL && (link)->next == NULL)
+        assert(((link)->prev == NULL) && ((link)->next == NULL))
 
 /** Initialize doubly-linked circular list link
@@ -158 +158 @@
 static inline void list_remove(link_t *link)
 {
-        link->next->prev = link->prev;
-        link->prev->next = link->next;
+        if ((link->prev != NULL) && (link->next != NULL)) {
+                link->next->prev = link->prev;
+                link->prev->next = link->next;
+        }
+        
         link_initialize(link);
 }

uspace/lib/c/include/async.h

@@ -96 +96 @@
 
 /** Forward declarations */
-struct _async_exch;
-struct _async_sess;
-
-typedef struct _async_sess async_sess_t;
-typedef struct _async_exch async_exch_t;
+struct async_exch;
+struct async_sess;
+
+typedef struct async_sess async_sess_t;
+typedef struct async_exch async_exch_t;
 
 extern atomic_t threads_in_ipc_wait;

uspace/lib/c/include/io/color.h

@@ -44 +44 @@
         COLOR_MAGENTA = 5,
         COLOR_YELLOW  = 6,
-        COLOR_WHITE   = 7,
-        
-        CATTR_BRIGHT  = 8,
-        CATTR_BLINK   = 8
+        COLOR_WHITE   = 7
 } console_color_t;
+
+typedef enum {
+        CATTR_NORMAL = 0,
+        CATTR_BRIGHT = 8,
+        CATTR_BLINK  = 16
+} console_color_attr_t;
 
 #endif

uspace/lib/c/include/io/console.h

@@ -37 +37 @@
 
 #include <sys/time.h>
+#include <io/keycode.h>
 #include <async.h>
 #include <bool.h>
@@ -42 +43 @@
 
 typedef enum {
-        CONSOLE_CCAP_NONE = 0,
-        CONSOLE_CCAP_STYLE,
-        CONSOLE_CCAP_INDEXED,
-        CONSOLE_CCAP_RGB
+        CONSOLE_CAP_NONE = 0,
+        CONSOLE_CAP_STYLE = 1,
+        CONSOLE_CAP_INDEXED = 2,
+        CONSOLE_CAP_RGB = 4
 } console_caps_t;
 
@@ -76 +77 @@
 /** Console event structure. */
 typedef struct {
+        /** List handle */
+        link_t link;
+        
         /** Press or release event. */
         kbd_event_type_t type;
         
         /** Keycode of the key that was pressed or released. */
-        unsigned int key;
+        keycode_t key;
         
         /** Bitmask of modifiers held. */
-        unsigned int mods;
+        keymod_t mods;
         
         /** The character that was generated or '\0' for none. */

uspace/lib/c/include/ipc/services.h

@@ -43 +43 @@
         SERVICE_NONE       = 0,
         SERVICE_LOAD       = FOURCC('l', 'o', 'a', 'd'),
-        SERVICE_VIDEO      = FOURCC('v', 'i', 'd', ' '),
         SERVICE_VFS        = FOURCC('v', 'f', 's', ' '),
         SERVICE_LOC        = FOURCC('l', 'o', 'c', ' '),