Changeset 606c369 in mainline


Ignore:
Timestamp:
2012-04-19T21:35:14Z (13 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0d520a2, 1d4262e, a7a7f8c
Parents:
63920b0
Message:

Replace loopback NIC with a loopback IP link provider.

Files:
1 added
2 deleted
4 edited
1 moved

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    r63920b0 r606c369  
    108108        $(USPACE_PATH)/srv/net/ethip/ethip \
    109109        $(USPACE_PATH)/srv/net/inet/inet \
     110        $(USPACE_PATH)/srv/net/loopip/loopip \
    110111        $(USPACE_PATH)/srv/net/tcp/tcp \
    111112        $(USPACE_PATH)/srv/net/udp/udp \
    … …  
    119120        test/test2 \
    120121        test/test3 \
    121         nic/lo \
    122122        nic/ne2k \
    123123        nic/e1k \

  • uspace/Makefile

    r63920b0 r606c369  
    7777        srv/net/ethip \
    7878        srv/net/inet \
     79        srv/net/loopip \
    7980        srv/net/tcp \
    8081        srv/net/udp \
    … …  
    119120        drv/bus/usb/usbmid \
    120121        drv/bus/usb/vhc \
    121         drv/nic/lo \
    122122        drv/nic/ne2k \
    123123        drv/nic/e1k \

  • uspace/app/init/init.c

    r63920b0 r606c369  
    305305        srv_start("/srv/s3c24ts");
    306306       
     307        spawn("/srv/loopip");
    307308        spawn("/srv/ethip");
    308309        spawn("/srv/inet");

  • uspace/drv/infrastructure/rootvirt/devices.def

    r63920b0 r606c369  
    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

    r63920b0 r606c369  
    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.