Changeset 3b2e387 in mainline for uspace/app

Timestamp:

2011-06-21T19:36:05Z (15 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/app

Files:

• init/init.c (modified) (1 diff)
• klog/klog.c (modified) (1 diff)
• mkbd/main.c (modified) (1 diff)
• trace/trace.c (modified) (2 diffs)

uspace/app/init/init.c

@@ -275 +275 @@
         srv_start("/srv/i8042");
         srv_start("/srv/s3c24ser");
-        srv_start("/srv/adb_ms");
-        srv_start("/srv/char_ms");
         srv_start("/srv/s3c24ts");
         
         spawn("/srv/fb");
         spawn("/srv/input");
-        console("hid_in/input");
+        console("hid/input");
         
         spawn("/srv/clip");

uspace/app/klog/klog.c

@@ -143 +143 @@
  * Receives kernel klog notifications.
  *
- * @param callid        IPC call ID
- * @param call          IPC call structure
- * @param arg           Local argument
+ * @param callid IPC call ID
+ * @param call   IPC call structure
+ * @param arg    Local argument
  *
  */

uspace/app/mkbd/main.c

@@ -280 +280 @@
         size_t actual_size;
         int event_nr;
-
+        
         while (true) {
                 /** @todo Try blocking call. */

uspace/app/trace/trace.c

@@ -792 +792 @@
         proto_register(SERVICE_VFS, p);
 
+#if 0
         p = proto_new("console");
 
@@ -827 +828 @@
         proto_console = p;
         proto_register(SERVICE_CONSOLE, p);
+#endif
 }