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

Changeset 09178b7f in mainline


Ignore:
Timestamp:
2010-12-25T17:21:51Z (11 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master
Children:
3750c06, 973ef9fc
Parents:
3ac66f69 (diff), 092e4f1 (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 from lp:~jakub/helenos/net.

Files:
2 deleted
16 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile.common

    r3ac66f69 r09178b7f  
    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 \
    102104        $(USPACE_PATH)/srv/net/il/arp/arp \
    103105        $(USPACE_PATH)/srv/net/il/ip/ip \
     
    115117
    116118RD_DRV_CFG =
    117 
    118 ifneq ($(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
    122 endif
    123119
    124120RD_APPS_ESSENTIAL = \
  • defaults/amd64/Makefile.config

    r3ac66f69 r09178b7f  
    6565CONFIG_MOUNT_DATA = n
    6666
    67 # Bundle netif/nil network layer
    68 CONFIG_NETIF_NIL_BUNDLE = n
  • defaults/arm32/Makefile.config

    r3ac66f69 r09178b7f  
    4141CONFIG_MOUNT_DATA = n
    4242
    43 # Bundle netif/nil network layer
    44 CONFIG_NETIF_NIL_BUNDLE = n
  • defaults/ia32/Makefile.config

    r3ac66f69 r09178b7f  
    7171CONFIG_MOUNT_DATA = n
    7272
    73 # Bundle netif/nil network layer
    74 CONFIG_NETIF_NIL_BUNDLE = n
  • defaults/ia64/Makefile.config

    r3ac66f69 r09178b7f  
    5353CONFIG_MOUNT_DATA = n
    5454
    55 # Bundle netif/nil network layer
    56 CONFIG_NETIF_NIL_BUNDLE = n
  • defaults/mips32/Makefile.config

    r3ac66f69 r09178b7f  
    4747CONFIG_MOUNT_DATA = n
    4848
    49 # Bundle netif/nil network layer
    50 CONFIG_NETIF_NIL_BUNDLE = n
  • defaults/ppc32/Makefile.config

    r3ac66f69 r09178b7f  
    4747CONFIG_MOUNT_DATA = n
    4848
    49 # Bundle netif/nil network layer
    50 CONFIG_NETIF_NIL_BUNDLE = n
  • defaults/sparc64/Makefile.config

    r3ac66f69 r09178b7f  
    6262CONFIG_MOUNT_DATA = n
    6363
    64 # Bundle netif/nil network layer
    65 CONFIG_NETIF_NIL_BUNDLE = n
  • defaults/special/Makefile.config

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

    r3ac66f69 r09178b7f  
    9494#
    9595
    96 ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
    97         LIBN = \
    98                 srv/net/nil/eth \
    99                 srv/net/nil/nildummy
    100 else
    101         DIRS += \
    102                 srv/net/nil/eth \
    103                 srv/net/nil/nildummy
    104 endif
     96DIRS += \
     97        srv/net/nil/eth \
     98        srv/net/nil/nildummy
    10599
    106100## Platform-specific hardware support
  • uspace/srv/hw/netif/dp8390/Makefile

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

    r3ac66f69 r09178b7f  
    3636-include $(CONFIG_MAKEFILE)
    3737
    38 ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
    39         LO_SOURCE = lo.netif_nil_bundle
    40         NE2K_SOURCE = ne2k.netif_nil_bundle
    41 else
    42         LO_SOURCE = lo.netif_standalone
    43         NE2K_SOURCE = ne2k.netif_standalone
    44 endif
     38LO_SOURCE = lo.netif_standalone
     39NE2K_SOURCE = ne2k.netif_standalone
    4540
    4641LO_TARGET = lo
  • uspace/srv/net/netif/lo/Makefile

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

    r3ac66f69 r09178b7f  
    3939-include $(CONFIG_MAKEFILE)
    4040
    41 ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
    42         LIBRARY = libeth
    43 else
    44         BINARY = eth
    45 endif
     41BINARY = eth
    4642
    4743SOURCES = \
  • uspace/srv/net/nil/nildummy/Makefile

    r3ac66f69 r09178b7f  
    3939-include $(CONFIG_MAKEFILE)
    4040
    41 ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y)
    42         LIBRARY = libnildummy
    43 else
    44         BINARY = nildummy
    45 endif
     41BINARY = nildummy
    4642
    4743SOURCES = \
  • uspace/srv/net/tl/tcp/tcp.c

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