Changes in / [09178b7f:3ac66f69] in mainline


Ignore:
Files:
2 added
16 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    r09178b7f r3ac66f69  
    100100        $(USPACE_PATH)/srv/hw/netif/dp8390/dp8390 \
    101101        $(USPACE_PATH)/srv/net/netif/lo/lo \
    102         $(USPACE_PATH)/srv/net/nil/eth/eth \
    103         $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \
    104102        $(USPACE_PATH)/srv/net/il/arp/arp \
    105103        $(USPACE_PATH)/srv/net/il/ip/ip \
    … …  
    117115
    118116RD_DRV_CFG =
     117
     118ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
     119        RD_SRVS_NON_ESSENTIAL += \
     120                $(USPACE_PATH)/srv/net/nil/eth/eth \
     121                $(USPACE_PATH)/srv/net/nil/nildummy/nildummy
     122endif
    119123
    120124RD_APPS_ESSENTIAL = \

  • defaults/amd64/Makefile.config

    r09178b7f r3ac66f69  
    6565CONFIG_MOUNT_DATA = n
    6666
     67# Bundle netif/nil network layer
     68CONFIG_NETIF_NIL_BUNDLE = n

  • defaults/arm32/Makefile.config

    r09178b7f r3ac66f69  
    4141CONFIG_MOUNT_DATA = n
    4242
     43# Bundle netif/nil network layer
     44CONFIG_NETIF_NIL_BUNDLE = n

  • defaults/ia32/Makefile.config

    r09178b7f r3ac66f69  
    7171CONFIG_MOUNT_DATA = n
    7272
     73# Bundle netif/nil network layer
     74CONFIG_NETIF_NIL_BUNDLE = n

  • defaults/ia64/Makefile.config

    r09178b7f r3ac66f69  
    5353CONFIG_MOUNT_DATA = n
    5454
     55# Bundle netif/nil network layer
     56CONFIG_NETIF_NIL_BUNDLE = n

  • defaults/mips32/Makefile.config

    r09178b7f r3ac66f69  
    4747CONFIG_MOUNT_DATA = n
    4848
     49# Bundle netif/nil network layer
     50CONFIG_NETIF_NIL_BUNDLE = n

  • defaults/ppc32/Makefile.config

    r09178b7f r3ac66f69  
    4747CONFIG_MOUNT_DATA = n
    4848
     49# Bundle netif/nil network layer
     50CONFIG_NETIF_NIL_BUNDLE = n

  • defaults/sparc64/Makefile.config

    r09178b7f r3ac66f69  
    6262CONFIG_MOUNT_DATA = n
    6363
     64# Bundle netif/nil network layer
     65CONFIG_NETIF_NIL_BUNDLE = n

  • defaults/special/Makefile.config

    r09178b7f r3ac66f69  
    3232CONFIG_START_BD = n
    3333
     34# Bundle netif/nil network layer
     35CONFIG_NETIF_NIL_BUNDLE = n

  • uspace/Makefile

    r09178b7f r3ac66f69  
    9494#
    9595
    96 DIRS += \
    97         srv/net/nil/eth \
    98         srv/net/nil/nildummy
     96ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
     97        LIBN = \
     98                srv/net/nil/eth \
     99                srv/net/nil/nildummy
     100else
     101        DIRS += \
     102                srv/net/nil/eth \
     103                srv/net/nil/nildummy
     104endif
    99105
    100106## Platform-specific hardware support

  • uspace/srv/hw/netif/dp8390/Makefile

    r09178b7f r3ac66f69  
    3939-include $(CONFIG_MAKEFILE)
    4040
     41ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
     42        LIBS += $(USPACE_PREFIX)/srv/net/nil/eth/libeth.a
     43endif
     44
    4145BINARY = dp8390
    4246

  • uspace/srv/net/cfg/Makefile

    r09178b7f r3ac66f69  
    3636-include $(CONFIG_MAKEFILE)
    3737
    38 LO_SOURCE = lo.netif_standalone
    39 NE2K_SOURCE = ne2k.netif_standalone
     38ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
     39        LO_SOURCE = lo.netif_nil_bundle
     40        NE2K_SOURCE = ne2k.netif_nil_bundle
     41else
     42        LO_SOURCE = lo.netif_standalone
     43        NE2K_SOURCE = ne2k.netif_standalone
     44endif
    4045
    4146LO_TARGET = lo

  • uspace/srv/net/netif/lo/Makefile

    r09178b7f r3ac66f69  
    3939-include $(CONFIG_MAKEFILE)
    4040
     41ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
     42        LIBS += $(USPACE_PREFIX)/srv/net/nil/nildummy/libnildummy.a
     43endif
     44
    4145BINARY = lo
    4246

  • uspace/srv/net/nil/eth/Makefile

    r09178b7f r3ac66f69  
    3939-include $(CONFIG_MAKEFILE)
    4040
    41 BINARY = eth
     41ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
     42        LIBRARY = libeth
     43else
     44        BINARY = eth
     45endif
    4246
    4347SOURCES = \

  • uspace/srv/net/nil/nildummy/Makefile

    r09178b7f r3ac66f69  
    3939-include $(CONFIG_MAKEFILE)
    4040
    41 BINARY = nildummy
     41ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
     42        LIBRARY = libnildummy
     43else
     44        BINARY = nildummy
     45endif
    4246
    4347SOURCES = \

  • uspace/srv/net/tl/tcp/tcp.c

    r09178b7f r3ac66f69  
    453453
    454454has_error_service:
    455         fibril_rwlock_write_unlock(&tcp_globals.lock);
     455        fibril_rwlock_read_unlock(&tcp_globals.lock);
    456456
    457457        /* TODO error reporting/handling */
Note: See TracChangeset for help on using the changeset viewer.