Changeset 4d9fe7b in mainline

Timestamp:

2012-01-30T21:18:04Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c6533a7

Parents:

bf31e3f

Message:

Remove network stack under uspace/srv/net (except TCP).

Files:

• boot/Makefile.common (modified) (2 diffs)
• uspace/Makefile (modified) (1 diff)
• uspace/srv/net/cfg/e1k.nic (deleted)
• uspace/srv/net/cfg/general (deleted)
• uspace/srv/net/cfg/lo.nic (deleted)
• uspace/srv/net/cfg/ne2k.nic (deleted)
• uspace/srv/net/il/arp/Makefile (deleted)
• uspace/srv/net/il/arp/arp.c (deleted)
• uspace/srv/net/il/arp/arp.h (deleted)
• uspace/srv/net/il/ip/Makefile (deleted)
• uspace/srv/net/il/ip/ip.c (deleted)
• uspace/srv/net/il/ip/ip.h (deleted)
• uspace/srv/net/net/Makefile (deleted)
• uspace/srv/net/net/net.c (deleted)
• uspace/srv/net/net/net.h (deleted)
• uspace/srv/net/net/packet_server.c (deleted)
• uspace/srv/net/net/packet_server.h (deleted)
• uspace/srv/net/nil/eth/Makefile (deleted)
• uspace/srv/net/nil/eth/eth.c (deleted)
• uspace/srv/net/nil/eth/eth.h (deleted)
• uspace/srv/net/nil/nildummy/Makefile (deleted)
• uspace/srv/net/nil/nildummy/nildummy.c (deleted)
• uspace/srv/net/nil/nildummy/nildummy.h (deleted)
• uspace/srv/net/tl/icmp/Makefile (deleted)
• uspace/srv/net/tl/icmp/icmp.c (deleted)
• uspace/srv/net/tl/udp/Makefile (deleted)
• uspace/srv/net/tl/udp/udp.c (deleted)
• uspace/srv/net/tl/udp/udp.h (deleted)
• uspace/srv/net/tl/udp/udp_header.h (deleted)
• uspace/srv/tcp/Makefile (moved) (moved from uspace/srv/net/tl/tcp/Makefile )
• uspace/srv/tcp/conn.c (moved) (moved from uspace/srv/net/tl/tcp/conn.c )
• uspace/srv/tcp/conn.h (moved) (moved from uspace/srv/net/tl/tcp/conn.h )
• uspace/srv/tcp/iqueue.c (moved) (moved from uspace/srv/net/tl/tcp/iqueue.c )
• uspace/srv/tcp/iqueue.h (moved) (moved from uspace/srv/net/tl/tcp/iqueue.h )
• uspace/srv/tcp/ncsim.c (moved) (moved from uspace/srv/net/tl/tcp/ncsim.c )
• uspace/srv/tcp/ncsim.h (moved) (moved from uspace/srv/net/tl/tcp/ncsim.h )
• uspace/srv/tcp/pdu.c (moved) (moved from uspace/srv/net/tl/tcp/pdu.c )
• uspace/srv/tcp/pdu.h (moved) (moved from uspace/srv/net/tl/tcp/pdu.h )
• uspace/srv/tcp/rqueue.c (moved) (moved from uspace/srv/net/tl/tcp/rqueue.c )
• uspace/srv/tcp/rqueue.h (moved) (moved from uspace/srv/net/tl/tcp/rqueue.h )
• uspace/srv/tcp/segment.c (moved) (moved from uspace/srv/net/tl/tcp/segment.c )
• uspace/srv/tcp/segment.h (moved) (moved from uspace/srv/net/tl/tcp/segment.h )
• uspace/srv/tcp/seq_no.c (moved) (moved from uspace/srv/net/tl/tcp/seq_no.c )
• uspace/srv/tcp/seq_no.h (moved) (moved from uspace/srv/net/tl/tcp/seq_no.h )
• uspace/srv/tcp/sock.c (moved) (moved from uspace/srv/net/tl/tcp/sock.c )
• uspace/srv/tcp/sock.h (moved) (moved from uspace/srv/net/tl/tcp/sock.h )
• uspace/srv/tcp/std.h (moved) (moved from uspace/srv/net/tl/tcp/std.h )
• uspace/srv/tcp/tcp.c (moved) (moved from uspace/srv/net/tl/tcp/tcp.c )
• uspace/srv/tcp/tcp.h (moved) (moved from uspace/srv/net/tl/tcp/tcp.h )
• uspace/srv/tcp/tcp_type.h (moved) (moved from uspace/srv/net/tl/tcp/tcp_type.h )
• uspace/srv/tcp/test.c (moved) (moved from uspace/srv/net/tl/tcp/test.c )
• uspace/srv/tcp/test.h (moved) (moved from uspace/srv/net/tl/tcp/test.h )
• uspace/srv/tcp/tqueue.c (moved) (moved from uspace/srv/net/tl/tcp/tqueue.c )
• uspace/srv/tcp/tqueue.h (moved) (moved from uspace/srv/net/tl/tcp/tqueue.h )
• uspace/srv/tcp/ucall.c (moved) (moved from uspace/srv/net/tl/tcp/ucall.c )
• uspace/srv/tcp/ucall.h (moved) (moved from uspace/srv/net/tl/tcp/ucall.h )

boot/Makefile.common

@@ -107 +107 @@
         $(USPACE_PATH)/srv/hid/remcons/remcons \
         $(USPACE_PATH)/srv/taskmon/taskmon \
-        $(USPACE_PATH)/srv/net/nil/eth/eth \
-        $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \
-        $(USPACE_PATH)/srv/net/il/arp/arp \
-        $(USPACE_PATH)/srv/net/il/ip/ip \
-        $(USPACE_PATH)/srv/net/tl/icmp/icmp \
-        $(USPACE_PATH)/srv/net/tl/udp/udp \
-        $(USPACE_PATH)/srv/net/tl/tcp/tcp \
-        $(USPACE_PATH)/srv/net/net/net \
         $(USPACE_PATH)/srv/devman/devman
 
@@ -202 +194 @@
 endif
 
-ifneq ($(CONFIG_BAREBONE),y)
-NET_CFG = \
-        $(USPACE_PATH)/srv/net/cfg/general \
-        $(USPACE_PATH)/srv/net/cfg/lo.nic \
-        $(USPACE_PATH)/srv/net/cfg/ne2k.nic \
-        $(USPACE_PATH)/srv/net/cfg/e1k.nic
-endif
-
 COMPONENTS = \
         $(KERNEL_PATH)/kernel.bin \

uspace/Makefile

@@ -95 +95 @@
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
-        srv/net/il/arp \
-        srv/net/il/ip \
-        srv/net/tl/icmp \
-        srv/net/tl/udp \
-        srv/net/tl/tcp \
-        srv/net/nil/eth \
-        srv/net/nil/nildummy \
-        srv/net/net \
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \