Changeset 0c37135 in mainline
- Timestamp:
- 2012-04-18T07:32:58Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 5f67cd61
- Parents:
- 3d93289a (diff), 63920b0 (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. - Files:
-
- 46 added
- 74 deleted
- 31 edited
- 46 moved
-
boot/Makefile (modified) (view diffs)
-
boot/Makefile.common (modified) (view diffs)
-
boot/generic/src/printf_core.c (modified) (view diffs)
-
kernel/generic/src/printf/printf_core.c (modified) (view diffs)
-
kernel/test/print/print1.c (modified) (view diffs)
-
uspace/Makefile (modified) (view diffs)
-
uspace/app/inetcfg/Makefile (moved) (moved from uspace/srv/net/il/ip/Makefile ) (view diffs)
-
uspace/app/inetcfg/inetcfg.c (added)
-
uspace/app/init/init.c (modified) (view diffs)
-
uspace/app/netecho/netecho.c (modified) (view diffs)
-
uspace/app/netecho/print_error.c (modified) (view diffs)
-
uspace/app/ping/Makefile (modified) (view diffs)
-
uspace/app/ping/ping.c (modified) (view diffs)
-
uspace/app/ping/print_error.c (deleted)
-
uspace/app/ping/print_error.h (deleted)
-
uspace/app/tester/print/print1.c (modified) (view diffs)
-
uspace/app/top/screen.c (modified) (view diffs)
-
uspace/app/top/screen.h (modified) (view diffs)
-
uspace/app/top/top.c (modified) (view diffs)
-
uspace/app/top/top.h (modified) (view diffs)
-
uspace/drv/nic/e1k/Makefile (modified) (view diffs)
-
uspace/drv/nic/e1k/e1k.c (modified) (view diffs)
-
uspace/drv/nic/lo/Makefile (modified) (view diffs)
-
uspace/drv/nic/ne2k/Makefile (modified) (view diffs)
-
uspace/drv/nic/rtl8139/Makefile (modified) (view diffs)
-
uspace/drv/nic/rtl8139/driver.c (modified) (view diffs)
-
uspace/lib/c/Makefile (modified) (view diffs)
-
uspace/lib/c/generic/adt/measured_strings.c (deleted)
-
uspace/lib/c/generic/inet.c (added)
-
uspace/lib/c/generic/inetcfg.c (added)
-
uspace/lib/c/generic/inetping.c (added)
-
uspace/lib/c/generic/io/printf_core.c (modified) (view diffs)
-
uspace/lib/c/generic/iplink.c (added)
-
uspace/lib/c/generic/iplink_srv.c (added)
-
uspace/lib/c/generic/net/icmp_api.c (deleted)
-
uspace/lib/c/generic/net/packet.c (deleted)
-
uspace/lib/c/include/inet/inet.h (moved) (moved from uspace/lib/net/include/net_hardware.h ) (view diffs)
-
uspace/lib/c/include/inet/inetcfg.h (added)
-
uspace/lib/c/include/inet/inetping.h (moved) (moved from uspace/lib/c/generic/net/icmp_common.c ) (view diffs)
-
uspace/lib/c/include/inet/iplink.h (moved) (moved from uspace/lib/net/include/icmp_remote.h ) (view diffs)
-
uspace/lib/c/include/inet/iplink_srv.h (moved) (moved from uspace/lib/c/include/adt/measured_strings.h ) (view diffs)
-
uspace/lib/c/include/ipc/icmp.h (deleted)
-
uspace/lib/c/include/ipc/il.h (deleted)
-
uspace/lib/c/include/ipc/inet.h (moved) (moved from uspace/srv/net/net/packet_server.h ) (view diffs)
-
uspace/lib/c/include/ipc/ip.h (deleted)
-
uspace/lib/c/include/ipc/iplink.h (moved) (moved from uspace/lib/c/include/ipc/tl.h ) (view diffs)
-
uspace/lib/c/include/ipc/net.h (deleted)
-
uspace/lib/c/include/ipc/net_net.h (deleted)
-
uspace/lib/c/include/ipc/netif.h (deleted)
-
uspace/lib/c/include/ipc/nil.h (deleted)
-
uspace/lib/c/include/ipc/packet.h (deleted)
-
uspace/lib/c/include/ipc/services.h (modified) (view diffs)
-
uspace/lib/c/include/ipc/socket.h (modified) (view diffs)
-
uspace/lib/c/include/net/icmp_codes.h (deleted)
-
uspace/lib/c/include/net/in.h (modified) (view diffs)
-
uspace/lib/c/include/net/packet.h (deleted)
-
uspace/lib/c/include/net/packet_header.h (deleted)
-
uspace/lib/net/Makefile (modified) (view diffs)
-
uspace/lib/net/adt/module_map.c (deleted)
-
uspace/lib/net/generic/generic.c (deleted)
-
uspace/lib/net/generic/net_checksum.c (deleted)
-
uspace/lib/net/generic/net_remote.c (deleted)
-
uspace/lib/net/generic/packet_client.c (deleted)
-
uspace/lib/net/generic/packet_remote.c (deleted)
-
uspace/lib/net/generic/protocol_map.c (deleted)
-
uspace/lib/net/il/arp_remote.c (deleted)
-
uspace/lib/net/il/il_remote.c (deleted)
-
uspace/lib/net/il/il_skel.c (deleted)
-
uspace/lib/net/il/ip_client.c (deleted)
-
uspace/lib/net/il/ip_remote.c (deleted)
-
uspace/lib/net/include/adt/module_map.h (deleted)
-
uspace/lib/net/include/arp_interface.h (deleted)
-
uspace/lib/net/include/ethernet_lsap.h (deleted)
-
uspace/lib/net/include/generic.h (deleted)
-
uspace/lib/net/include/icmp_header.h (deleted)
-
uspace/lib/net/include/il_skel.h (deleted)
-
uspace/lib/net/include/ip_client.h (deleted)
-
uspace/lib/net/include/ip_header.h (deleted)
-
uspace/lib/net/include/ip_interface.h (deleted)
-
uspace/lib/net/include/ip_remote.h (deleted)
-
uspace/lib/net/include/net_interface.h (deleted)
-
uspace/lib/net/include/nil_remote.h (deleted)
-
uspace/lib/net/include/nil_skel.h (deleted)
-
uspace/lib/net/include/packet_client.h (deleted)
-
uspace/lib/net/include/protocol_map.h (deleted)
-
uspace/lib/net/include/socket_core.h (modified) (view diffs)
-
uspace/lib/net/include/tl_common.h (deleted)
-
uspace/lib/net/include/tl_remote.h (deleted)
-
uspace/lib/net/include/tl_skel.h (deleted)
-
uspace/lib/net/nil/nil_remote.c (deleted)
-
uspace/lib/net/nil/nil_skel.c (deleted)
-
uspace/lib/net/tl/icmp_client.c (deleted)
-
uspace/lib/net/tl/icmp_remote.c (deleted)
-
uspace/lib/net/tl/socket_core.c (modified) (view diffs)
-
uspace/lib/net/tl/tl_common.c (deleted)
-
uspace/lib/net/tl/tl_remote.c (deleted)
-
uspace/lib/net/tl/tl_skel.c (deleted)
-
uspace/srv/loc/loc.c (modified) (view diffs)
-
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/ethip/Makefile (moved) (moved from uspace/srv/net/il/arp/Makefile ) (view diffs)
-
uspace/srv/net/ethip/arp.c (added)
-
uspace/srv/net/ethip/arp.h (added)
-
uspace/srv/net/ethip/atrans.c (added)
-
uspace/srv/net/ethip/atrans.h (added)
-
uspace/srv/net/ethip/ethip.c (added)
-
uspace/srv/net/ethip/ethip.h (added)
-
uspace/srv/net/ethip/ethip_nic.c (added)
-
uspace/srv/net/ethip/ethip_nic.h (added)
-
uspace/srv/net/ethip/pdu.c (added)
-
uspace/srv/net/ethip/pdu.h (moved) (moved from uspace/lib/net/include/packet_remote.h ) (view diffs)
-
uspace/srv/net/ethip/std.h (moved) (moved from uspace/lib/net/include/net_checksum.h ) (view diffs)
-
uspace/srv/net/il/arp/arp.c (deleted)
-
uspace/srv/net/il/arp/arp.h (deleted)
-
uspace/srv/net/il/ip/ip.c (deleted)
-
uspace/srv/net/il/ip/ip.h (deleted)
-
uspace/srv/net/inet/Makefile (moved) (moved from uspace/srv/net/tl/icmp/Makefile ) (view diffs)
-
uspace/srv/net/inet/addrobj.c (added)
-
uspace/srv/net/inet/addrobj.h (moved) (moved from uspace/lib/net/include/il_remote.h ) (view diffs)
-
uspace/srv/net/inet/icmp.c (added)
-
uspace/srv/net/inet/icmp.h (added)
-
uspace/srv/net/inet/icmp_std.h (moved) (moved from uspace/srv/net/tl/udp/udp_header.h ) (view diffs)
-
uspace/srv/net/inet/inet.c (added)
-
uspace/srv/net/inet/inet.h (added)
-
uspace/srv/net/inet/inet_link.c (added)
-
uspace/srv/net/inet/inet_link.h (added)
-
uspace/srv/net/inet/inet_std.h (moved) (moved from uspace/lib/c/include/ipc/arp.h ) (view diffs)
-
uspace/srv/net/inet/inet_util.c (added)
-
uspace/srv/net/inet/inet_util.h (added)
-
uspace/srv/net/inet/inetcfg.c (added)
-
uspace/srv/net/inet/inetcfg.h (added)
-
uspace/srv/net/inet/inetping.c (added)
-
uspace/srv/net/inet/inetping.h (added)
-
uspace/srv/net/inet/pdu.c (added)
-
uspace/srv/net/inet/pdu.h (added)
-
uspace/srv/net/inet/reass.c (added)
-
uspace/srv/net/inet/reass.h (added)
-
uspace/srv/net/inet/sroute.c (added)
-
uspace/srv/net/inet/sroute.h (added)
-
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/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/tcp/Makefile (moved) (moved from uspace/srv/net/tl/tcp/Makefile ) (view diffs)
-
uspace/srv/net/tcp/conn.c (moved) (moved from uspace/srv/net/tl/tcp/conn.c ) (view diffs)
-
uspace/srv/net/tcp/conn.h (moved) (moved from uspace/srv/net/tl/tcp/conn.h ) (view diffs)
-
uspace/srv/net/tcp/iqueue.c (moved) (moved from uspace/srv/net/tl/tcp/iqueue.c ) (view diffs)
-
uspace/srv/net/tcp/iqueue.h (moved) (moved from uspace/srv/net/tl/tcp/iqueue.h ) (view diffs)
-
uspace/srv/net/tcp/ncsim.c (moved) (moved from uspace/srv/net/tl/tcp/ncsim.c ) (view diffs)
-
uspace/srv/net/tcp/ncsim.h (moved) (moved from uspace/srv/net/tl/tcp/ncsim.h ) (view diffs)
-
uspace/srv/net/tcp/pdu.c (moved) (moved from uspace/srv/net/tl/tcp/pdu.c ) (view diffs)
-
uspace/srv/net/tcp/pdu.h (moved) (moved from uspace/srv/net/tl/tcp/pdu.h ) (view diffs)
-
uspace/srv/net/tcp/rqueue.c (moved) (moved from uspace/srv/net/tl/tcp/rqueue.c ) (view diffs)
-
uspace/srv/net/tcp/rqueue.h (moved) (moved from uspace/srv/net/tl/tcp/rqueue.h ) (view diffs)
-
uspace/srv/net/tcp/segment.c (moved) (moved from uspace/srv/net/tl/tcp/segment.c ) (view diffs)
-
uspace/srv/net/tcp/segment.h (moved) (moved from uspace/srv/net/tl/tcp/segment.h ) (view diffs)
-
uspace/srv/net/tcp/seq_no.c (moved) (moved from uspace/srv/net/tl/tcp/seq_no.c ) (view diffs)
-
uspace/srv/net/tcp/seq_no.h (moved) (moved from uspace/srv/net/tl/tcp/seq_no.h ) (view diffs)
-
uspace/srv/net/tcp/sock.c (moved) (moved from uspace/srv/net/tl/tcp/sock.c ) (view diffs)
-
uspace/srv/net/tcp/sock.h (moved) (moved from uspace/srv/net/tl/tcp/sock.h ) (view diffs)
-
uspace/srv/net/tcp/std.h (moved) (moved from uspace/srv/net/tl/tcp/std.h ) (view diffs)
-
uspace/srv/net/tcp/tcp.c (added)
-
uspace/srv/net/tcp/tcp.h (moved) (moved from uspace/srv/net/tl/tcp/tcp.h ) (view diffs)
-
uspace/srv/net/tcp/tcp_type.h (moved) (moved from uspace/srv/net/tl/tcp/tcp_type.h ) (view diffs)
-
uspace/srv/net/tcp/test.c (moved) (moved from uspace/srv/net/tl/tcp/test.c ) (view diffs)
-
uspace/srv/net/tcp/test.h (moved) (moved from uspace/srv/net/tl/tcp/test.h ) (view diffs)
-
uspace/srv/net/tcp/tqueue.c (moved) (moved from uspace/srv/net/tl/tcp/tqueue.c ) (view diffs)
-
uspace/srv/net/tcp/tqueue.h (moved) (moved from uspace/srv/net/tl/tcp/tqueue.h ) (view diffs)
-
uspace/srv/net/tcp/ucall.c (moved) (moved from uspace/srv/net/tl/tcp/ucall.c ) (view diffs)
-
uspace/srv/net/tcp/ucall.h (moved) (moved from uspace/srv/net/tl/tcp/ucall.h ) (view diffs)
-
uspace/srv/net/tl/icmp/icmp.c (deleted)
-
uspace/srv/net/tl/tcp/tcp.c (deleted)
-
uspace/srv/net/tl/udp/udp.c (deleted)
-
uspace/srv/net/udp/Makefile (moved) (moved from uspace/srv/net/tl/udp/Makefile ) (view diffs)
-
uspace/srv/net/udp/assoc.c (added)
-
uspace/srv/net/udp/assoc.h (moved) (moved from uspace/lib/net/include/ethernet_protocols.h ) (view diffs)
-
uspace/srv/net/udp/msg.c (added)
-
uspace/srv/net/udp/msg.h (added)
-
uspace/srv/net/udp/pdu.c (added)
-
uspace/srv/net/udp/pdu.h (added)
-
uspace/srv/net/udp/sock.c (added)
-
uspace/srv/net/udp/sock.h (moved) (moved from uspace/lib/c/include/net/icmp_common.h ) (view diffs)
-
uspace/srv/net/udp/std.h (added)
-
uspace/srv/net/udp/ucall.c (added)
-
uspace/srv/net/udp/ucall.h (moved) (moved from uspace/lib/c/include/net/icmp_api.h ) (view diffs)
-
uspace/srv/net/udp/udp.c (moved) (moved from uspace/srv/net/tl/udp/udp.h ) (view diffs)
-
uspace/srv/net/udp/udp_inet.c (added)
-
uspace/srv/net/udp/udp_inet.h (moved) (moved from uspace/lib/net/include/icmp_client.h ) (view diffs)
-
uspace/srv/net/udp/udp_type.h (added)
Note:
See TracChangeset
for help on using the changeset viewer.
