Changeset 1d4262e in mainline

Timestamp:

2012-04-20T08:08:25Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

dfac604

Parents:

e6f6260 (diff), 606c369 (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 with mainline

Files:

• boot/Makefile.common (modified) (2 diffs)
• uspace/Makefile (modified) (2 diffs)
• uspace/app/init/init.c (modified) (1 diff)
• uspace/drv/infrastructure/rootvirt/devices.def (modified) (1 diff)
• uspace/drv/nic/lo/lo.c (deleted)
• uspace/drv/nic/lo/lo.ma (deleted)
• uspace/srv/net/loopip/Makefile (moved) (moved from uspace/drv/nic/lo/Makefile ) (2 diffs)
• uspace/srv/net/loopip/loopip.c (added)

boot/Makefile.common

@@ -112 +112 @@
         $(USPACE_PATH)/srv/net/ethip/ethip \
         $(USPACE_PATH)/srv/net/inet/inet \
+        $(USPACE_PATH)/srv/net/loopip/loopip \
         $(USPACE_PATH)/srv/net/tcp/tcp \
         $(USPACE_PATH)/srv/net/udp/udp \
@@ -123 +124 @@
         test/test2 \
         test/test3 \
-        nic/lo \
         nic/ne2k \
         nic/e1k \

uspace/Makefile

@@ -78 +78 @@
         srv/net/ethip \
         srv/net/inet \
+        srv/net/loopip \
         srv/net/tcp \
         srv/net/udp \
@@ -121 +122 @@
         drv/bus/usb/usbmid \
         drv/bus/usb/vhc \
-        drv/nic/lo \
         drv/nic/ne2k \
         drv/nic/e1k \

uspace/app/init/init.c

@@ -305 +305 @@
         srv_start("/srv/s3c24ts");
         
+        spawn("/srv/loopip");
         spawn("/srv/ethip");
         spawn("/srv/inet");

uspace/drv/infrastructure/rootvirt/devices.def

@@ -4 +4 @@
  * Unless the list is empty, the last item shall be followed by a comma.
  */
-
-/* Loopback network interface */
-{
-    .name = "lo",
-    .match_id = "virtual&loopback"
-},
 
 #ifdef CONFIG_TEST_DRIVERS

uspace/srv/net/loopip/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 2011 Radim Vansa
+# Copyright (c) 2012 Jiri Svoboda
 # All rights reserved.
 #
@@ -28 +28 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBNIC_PREFIX)/libnic.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBNIC_PREFIX)/include
-BINARY = lo
+BINARY = loopip
 
 SOURCES = \
-        lo.c
+        loopip.c
 
 include $(USPACE_PREFIX)/Makefile.common