Changeset 3b2e387 in mainline for uspace/lib/c

Timestamp:

2011-06-21T19:36:05Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e3a6c45

Parents:

40f606b (diff), 022d9f67 (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 input server, console and various other improvements

Location:

uspace/lib/c

Files:

• generic/async.c (modified) (3 diffs)
• generic/str.c (modified) (1 diff)
• generic/task.c (modified) (1 diff)
• include/async.h (modified) (1 diff)
• include/ipc/mouseev.h (moved) (moved from uspace/lib/c/include/ipc/mouse.h ) (1 diff)
• include/ipc/services.h (modified) (1 diff)

uspace/lib/c/generic/async.c

@@ -213 +213 @@
  * This function is defined as a weak symbol - to be redefined in user code.
  *
- * @param callid        Hash of the incoming call.
- * @param call          Data of the incoming call.
- * @param arg           Local argument
+ * @param callid Hash of the incoming call.
+ * @param call   Data of the incoming call.
+ * @param arg    Local argument
  *
  */
@@ -228 +228 @@
  * This function is defined as a weak symbol - to be redefined in user code.
  *
- * @param callid        Hash of the incoming call.
- * @param call          Data of the incoming call.
- * @param arg           Local argument.
+ * @param callid Hash of the incoming call.
+ * @param call   Data of the incoming call.
+ * @param arg    Local argument.
  *
  */
@@ -709 +709 @@
  * @param cfibril       Fibril function that should be called upon opening the
  *                      connection.
- * @param carg          Extra argument to pass to the connection fibril
+ * @param carg          Extra argument to pass to the connection fibril
  *
  * @return New fibril id or NULL on failure.

uspace/lib/c/generic/str.c

@@ -540 +540 @@
 
         dstr_size = str_size(dest);
-        if (dstr_size >= size) {
+        if (dstr_size >= size)
                 return;
-        }
+        
         str_cpy(dest + dstr_size, size - dstr_size, src);
 }

uspace/lib/c/generic/task.c

@@ -190 +190 @@
         
         return EOK;
+        
 error:
         /* Error exit */

uspace/lib/c/include/async.h

@@ -55 +55 @@
 /** Client connection handler
  *
- * @param callid        ID of incoming call or 0 if connection initiated from
- *                      inside using async_connect_to_me()
- * @param call          Incoming call or 0 if connection initiated from inside
- * @param arg           Local argument passed from async_new_connection() or
- *                      async_connect_to_me()
+ * @param callid ID of incoming call or 0 if connection initiated from
+ *               inside using async_connect_to_me()
+ * @param call   Incoming call or 0 if connection initiated from inside
+ * @param arg    Local argument passed from async_new_connection() or
+ *               async_connect_to_me()
  */
 typedef void (*async_client_conn_t)(ipc_callid_t, ipc_call_t *, void *);

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

@@ -34 +34 @@
  */
 
-#ifndef LIBC_IPC_MOUSE_H_
-#define LIBC_IPC_MOUSE_H_
+#ifndef LIBC_IPC_MOUSEEV_H_
+#define LIBC_IPC_MOUSEEV_H_
 
 #include <ipc/common.h>
+#include <ipc/dev_iface.h>
 
 typedef enum {
-        MEVENT_BUTTON = IPC_FIRST_USER_METHOD,
-        MEVENT_MOVE
-} mouse_notif_t;
+        MOUSEEV_YIELD = DEV_FIRST_CUSTOM_METHOD,
+        MOUSEEV_RECLAIM
+} mouseev_request_t;
+
+typedef enum {
+        MOUSEEV_MOVE_EVENT = IPC_FIRST_USER_METHOD,
+        MOUSEEV_BUTTON_EVENT
+} mouseev_notif_t;
 
 #endif

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

@@ -43 +43 @@
         SERVICE_PCI,
         SERVICE_VIDEO,
-        SERVICE_CONSOLE,
         SERVICE_VFS,
         SERVICE_DEVMAP,