Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 1d4262e in mainline


Ignore:
Timestamp:
2012-04-20T08:08:25Z (10 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master
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:
1 added
2 deleted
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • boot/Makefile.common

    re6f6260 r1d4262e  
    112112        $(USPACE_PATH)/srv/net/ethip/ethip \
    113113        $(USPACE_PATH)/srv/net/inet/inet \
     114        $(USPACE_PATH)/srv/net/loopip/loopip \
    114115        $(USPACE_PATH)/srv/net/tcp/tcp \
    115116        $(USPACE_PATH)/srv/net/udp/udp \
     
    123124        test/test2 \
    124125        test/test3 \
    125         nic/lo \
    126126        nic/ne2k \
    127127        nic/e1k \
  • uspace/Makefile

    re6f6260 r1d4262e  
    7878        srv/net/ethip \
    7979        srv/net/inet \
     80        srv/net/loopip \
    8081        srv/net/tcp \
    8182        srv/net/udp \
     
    121122        drv/bus/usb/usbmid \
    122123        drv/bus/usb/vhc \
    123         drv/nic/lo \
    124124        drv/nic/ne2k \
    125125        drv/nic/e1k \
  • uspace/app/init/init.c

    re6f6260 r1d4262e  
    305305        srv_start("/srv/s3c24ts");
    306306       
     307        spawn("/srv/loopip");
    307308        spawn("/srv/ethip");
    308309        spawn("/srv/inet");
  • uspace/drv/infrastructure/rootvirt/devices.def

    re6f6260 r1d4262e  
    44 * Unless the list is empty, the last item shall be followed by a comma.
    55 */
    6 
    7 /* Loopback network interface */
    8 {
    9     .name = "lo",
    10     .match_id = "virtual&loopback"
    11 },
    126
    137#ifdef CONFIG_TEST_DRIVERS
  • uspace/srv/net/loopip/Makefile

    re6f6260 r1d4262e  
    11#
    2 # Copyright (c) 2011 Radim Vansa
     2# Copyright (c) 2012 Jiri Svoboda
    33# All rights reserved.
    44#
     
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBNIC_PREFIX)/libnic.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBNIC_PREFIX)/include
    32 BINARY = lo
     30BINARY = loopip
    3331
    3432SOURCES = \
    35         lo.c
     33        loopip.c
    3634
    3735include $(USPACE_PREFIX)/Makefile.common
Note: See TracChangeset for help on using the changeset viewer.