Changeset 97c7682 in mainline for uspace/app/init/init.c

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/app/init/init.c (modified) (2 diffs)

uspace/app/init/init.c

@@ -302 +302 @@
         spawn("/srv/obio");
         srv_start("/srv/cuda_adb");
-        srv_start("/srv/s3c24ser");
-        srv_start("/srv/s3c24ts");
-        
-        spawn("/srv/net");
+        srv_start("/srv/s3c24xx_uart");
+        srv_start("/srv/s3c24xx_ts");
+        
+        spawn("/srv/loopip");
+        spawn("/srv/ethip");
+        spawn("/srv/inetsrv");
+        spawn("/srv/tcp");
+        spawn("/srv/udp");
         
         spawn("/srv/fb");
@@ -311 +315 @@
         console("hid/input", "hid/fb0");
         
-        spawn("/srv/clip");
+        spawn("/srv/clipboard");
         spawn("/srv/remcons");