Changeset 3aae4e8 in mainline

Timestamp:

2010-04-04T22:07:05Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

23de644

Parents:

9f10660f (diff), 73060801 (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 mainline changes.

Files:

• HelenOS.config (modified) (view diffs)
• boot/Makefile.common (modified) (view diffs)
• defaults/arm32/Makefile.config (modified) (view diffs)
• defaults/mips32/Makefile.config (modified) (view diffs)
• defaults/ppc32/Makefile.config (modified) (view diffs)
• defaults/sparc64/sun4v/Makefile.config (modified) (view diffs)
• defaults/special/Makefile.config (modified) (view diffs)
• defaults/special/abs32le/Makefile.config (modified) (view diffs)
• kernel/arch/amd64/src/amd64.c (modified) (view diffs)
• kernel/arch/ia32/src/ia32.c (modified) (view diffs)
• kernel/arch/ia64/src/ia64.c (modified) (view diffs)
• kernel/arch/sparc64/src/smp/sun4v/smp.c (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/Makefile.common (modified) (view diffs)
• uspace/app/bdsh/Makefile (modified) (view diffs)
• uspace/app/bdsh/input.c (modified) (view diffs)
• uspace/app/bdsh/scli.c (modified) (view diffs)
• uspace/app/netecho/Makefile (moved) (moved from uspace/srv/net/socket/Makefile ) (view diffs)
• uspace/app/netecho/netecho.c (moved) (moved from uspace/srv/net/app/echo/echo.c ) (view diffs)
• uspace/app/netecho/parse.c (moved) (moved from uspace/srv/net/app/parse.c ) (view diffs)
• uspace/app/netecho/parse.h (moved) (moved from uspace/srv/net/app/parse.h ) (view diffs)
• uspace/app/netecho/print_error.c (moved) (moved from uspace/srv/net/app/print_error.c ) (view diffs)
• uspace/app/netecho/print_error.h (moved) (moved from uspace/srv/net/app/print_error.h ) (view diffs)
• uspace/app/nettest1/Makefile (moved) (moved from uspace/srv/net/app/nettest1/Makefile ) (view diffs)
• uspace/app/nettest1/nettest.c (moved) (moved from uspace/srv/net/app/nettest.c ) (view diffs)
• uspace/app/nettest1/nettest.h (moved) (moved from uspace/srv/net/app/nettest.h ) (view diffs)
• uspace/app/nettest1/nettest1.c (moved) (moved from uspace/srv/net/app/nettest1/nettest1.c ) (view diffs)
• uspace/app/nettest1/parse.c (added)
• uspace/app/nettest1/parse.h (added)
• uspace/app/nettest1/print_error.c (added)
• uspace/app/nettest1/print_error.h (added)
• uspace/app/nettest2/Makefile (moved) (moved from uspace/srv/net/app/nettest2/Makefile ) (view diffs)
• uspace/app/nettest2/nettest.c (added)
• uspace/app/nettest2/nettest.h (added)
• uspace/app/nettest2/nettest2.c (moved) (moved from uspace/srv/net/app/nettest2/nettest2.c ) (view diffs)
• uspace/app/nettest2/parse.c (added)
• uspace/app/nettest2/parse.h (added)
• uspace/app/nettest2/print_error.c (added)
• uspace/app/nettest2/print_error.h (added)
• uspace/app/ping/Makefile (moved) (moved from uspace/srv/net/app/echo/Makefile ) (view diffs)
• uspace/app/ping/parse.c (added)
• uspace/app/ping/parse.h (added)
• uspace/app/ping/ping.c (moved) (moved from uspace/srv/net/app/ping/ping.c ) (view diffs)
• uspace/app/ping/print_error.c (added)
• uspace/app/ping/print_error.h (added)
• uspace/app/sbi/Makefile (modified) (view diffs)
• uspace/app/sbi/src/os/helenos.c (modified) (view diffs)
• uspace/lib/clui/tinput.c (modified) (view diffs)
• uspace/lib/clui/tinput.h (modified) (view diffs)
• uspace/lib/net/Makefile (added)
• uspace/lib/net/adt/module_map.c (moved) (moved from uspace/srv/net/structures/module_map.c ) (view diffs)
• uspace/lib/net/generic/net_checksum.c (moved) (moved from uspace/srv/net/checksum.c ) (view diffs)
• uspace/lib/net/generic/net_remote.c (moved) (moved from uspace/srv/net/net/net_remote.c ) (view diffs)
• uspace/lib/net/generic/packet_remote.c (moved) (moved from uspace/srv/net/structures/packet/packet_remote.c ) (view diffs)
• uspace/lib/net/il/arp_remote.c (moved) (moved from uspace/srv/net/il/arp/arp_remote.c ) (view diffs)
• uspace/lib/net/il/ip_client.c (moved) (moved from uspace/srv/net/il/ip/ip_client.c ) (view diffs)
• uspace/lib/net/il/ip_remote.c (moved) (moved from uspace/srv/net/il/ip/ip_remote.c ) (view diffs)
• uspace/lib/net/include/adt/module_map.h (moved) (moved from uspace/srv/net/structures/module_map.h ) (view diffs)
• uspace/lib/net/include/arp_interface.h (moved) (moved from uspace/srv/net/include/arp_interface.h ) (view diffs)
• uspace/lib/net/include/arp_messages.h (moved) (moved from uspace/srv/net/il/arp/arp_messages.h ) (view diffs)
• uspace/lib/net/include/ethernet_lsap.h (moved) (moved from uspace/srv/net/include/ethernet_lsap.h ) (view diffs)
• uspace/lib/net/include/ethernet_protocols.h (moved) (moved from uspace/srv/net/include/ethernet_protocols.h ) (view diffs)
• uspace/lib/net/include/icmp_client.h (moved) (moved from uspace/srv/net/include/icmp_client.h ) (view diffs)
• uspace/lib/net/include/icmp_header.h (moved) (moved from uspace/srv/net/tl/icmp/icmp_header.h ) (view diffs)
• uspace/lib/net/include/icmp_interface.h (moved) (moved from uspace/srv/net/include/icmp_interface.h ) (view diffs)
• uspace/lib/net/include/il_interface.h (moved) (moved from uspace/srv/net/include/il_interface.h ) (view diffs)
• uspace/lib/net/include/il_messages.h (moved) (moved from uspace/srv/net/il/il_messages.h ) (view diffs)
• uspace/lib/net/include/il_standalone.h (moved) (moved from uspace/srv/net/configuration.h ) (view diffs)
• uspace/lib/net/include/ip_client.h (moved) (moved from uspace/srv/net/include/ip_client.h ) (view diffs)
• uspace/lib/net/include/ip_header.h (moved) (moved from uspace/srv/net/il/ip/ip_header.h ) (view diffs)
• uspace/lib/net/include/ip_interface.h (moved) (moved from uspace/srv/net/include/ip_interface.h ) (view diffs)
• uspace/lib/net/include/ip_messages.h (moved) (moved from uspace/srv/net/il/ip/ip_messages.h ) (view diffs)
• uspace/lib/net/include/net_checksum.h (moved) (moved from uspace/srv/net/include/checksum.h ) (view diffs)
• uspace/lib/net/include/net_hardware.h (moved) (moved from uspace/srv/net/include/hardware.h ) (view diffs)
• uspace/lib/net/include/net_interface.h (moved) (moved from uspace/srv/net/include/net_interface.h ) (view diffs)
• uspace/lib/net/include/net_net_messages.h (moved) (moved from uspace/srv/net/net/net_messages.h ) (view diffs)
• uspace/lib/net/include/netif.h (moved) (moved from uspace/srv/net/netif/netif.h ) (view diffs)
• uspace/lib/net/include/netif_interface.h (moved) (moved from uspace/srv/net/include/netif_interface.h ) (view diffs)
• uspace/lib/net/include/netif_messages.h (moved) (moved from uspace/srv/net/netif/netif_messages.h ) (view diffs)
• uspace/lib/net/include/netif_module.h (moved) (moved from uspace/srv/net/netif/netif_module.h ) (view diffs)
• uspace/lib/net/include/netif_nil_bundle.h (added)
• uspace/lib/net/include/netif_standalone.h (added)
• uspace/lib/net/include/nil_interface.h (moved) (moved from uspace/srv/net/include/nil_interface.h ) (view diffs)
• uspace/lib/net/include/nil_messages.h (moved) (moved from uspace/srv/net/nil/nil_messages.h ) (view diffs)
• uspace/lib/net/include/nil_module.h (moved) (moved from uspace/srv/net/nil/nil_module.h ) (view diffs)
• uspace/lib/net/include/nil_standalone.h (added)
• uspace/lib/net/include/protocol_map.h (moved) (moved from uspace/srv/net/include/protocol_map.h ) (view diffs)
• uspace/lib/net/include/tl_common.h (moved) (moved from uspace/srv/net/tl/tl_common.h ) (view diffs)
• uspace/lib/net/include/tl_interface.h (moved) (moved from uspace/srv/net/include/tl_interface.h ) (view diffs)
• uspace/lib/net/include/tl_messages.h (moved) (moved from uspace/srv/net/tl/tl_messages.h ) (view diffs)
• uspace/lib/net/include/tl_standalone.h (added)
• uspace/lib/net/netif/netif.c (moved) (moved from uspace/srv/net/netif/netif.c ) (view diffs)
• uspace/lib/net/netif/netif_nil_bundle.c (moved) (moved from uspace/srv/net/netif/netif_nil_bundle.c ) (view diffs)
• uspace/lib/net/netif/netif_standalone.c (moved) (moved from uspace/srv/net/netif/netif_standalone.c ) (view diffs)
• uspace/lib/net/nil/nil_remote.c (moved) (moved from uspace/srv/net/nil/nil_remote.c ) (view diffs)
• uspace/lib/net/tl/icmp_client.c (moved) (moved from uspace/srv/net/tl/icmp/icmp_client.c ) (view diffs)
• uspace/lib/net/tl/icmp_remote.c (moved) (moved from uspace/srv/net/tl/icmp/icmp_remote.c ) (view diffs)
• uspace/lib/net/tl/tl_common.c (moved) (moved from uspace/srv/net/tl/tl_common.c ) (view diffs)
• uspace/lib/netif/Makefile (added)
• uspace/lib/netif/generic/netif_remote.c (moved) (moved from uspace/srv/net/netif/netif_remote.c ) (view diffs)
• uspace/lib/socket/Makefile (moved) (moved from uspace/srv/net/app/ping/Makefile ) (view diffs)
• uspace/lib/socket/adt/char_map.c (moved) (moved from uspace/srv/net/structures/char_map.c ) (view diffs)
• uspace/lib/socket/adt/dynamic_fifo.c (moved) (moved from uspace/srv/net/structures/dynamic_fifo.c ) (view diffs)
• uspace/lib/socket/adt/measured_strings.c (moved) (moved from uspace/srv/net/structures/measured_strings.c ) (view diffs)
• uspace/lib/socket/generic/icmp_api.c (moved) (moved from uspace/srv/net/tl/icmp/icmp_api.c ) (view diffs)
• uspace/lib/socket/generic/icmp_common.c (moved) (moved from uspace/srv/net/tl/icmp/icmp_common.c ) (view diffs)
• uspace/lib/socket/generic/inet.c (moved) (moved from uspace/srv/net/inet.c ) (view diffs)
• uspace/lib/socket/generic/net_modules.c (moved) (moved from uspace/srv/net/modules.c ) (view diffs)
• uspace/lib/socket/generic/socket_client.c (moved) (moved from uspace/srv/net/socket/socket_client.c ) (view diffs)
• uspace/lib/socket/generic/socket_core.c (moved) (moved from uspace/srv/net/socket/socket_core.c ) (view diffs)
• uspace/lib/socket/include/adt/char_map.h (moved) (moved from uspace/srv/net/structures/char_map.h ) (view diffs)
• uspace/lib/socket/include/adt/dynamic_fifo.h (moved) (moved from uspace/srv/net/structures/dynamic_fifo.h ) (view diffs)
• uspace/lib/socket/include/adt/generic_char_map.h (moved) (moved from uspace/srv/net/structures/generic_char_map.h ) (view diffs)
• uspace/lib/socket/include/adt/generic_field.h (moved) (moved from uspace/srv/net/structures/generic_field.h ) (view diffs)
• uspace/lib/socket/include/adt/int_map.h (moved) (moved from uspace/srv/net/structures/int_map.h ) (view diffs)
• uspace/lib/socket/include/adt/measured_strings.h (moved) (moved from uspace/srv/net/structures/measured_strings.h ) (view diffs)
• uspace/lib/socket/include/icmp_api.h (moved) (moved from uspace/srv/net/include/icmp_api.h ) (view diffs)
• uspace/lib/socket/include/icmp_codes.h (moved) (moved from uspace/srv/net/include/icmp_codes.h ) (view diffs)
• uspace/lib/socket/include/icmp_common.h (moved) (moved from uspace/srv/net/include/icmp_common.h ) (view diffs)
• uspace/lib/socket/include/icmp_messages.h (moved) (moved from uspace/srv/net/tl/icmp/icmp_messages.h ) (view diffs)
• uspace/lib/socket/include/in.h (moved) (moved from uspace/srv/net/include/in.h ) (view diffs)
• uspace/lib/socket/include/in6.h (moved) (moved from uspace/srv/net/include/in6.h ) (view diffs)
• uspace/lib/socket/include/inet.h (moved) (moved from uspace/srv/net/include/inet.h ) (view diffs)
• uspace/lib/socket/include/ip_codes.h (moved) (moved from uspace/srv/net/include/ip_codes.h ) (view diffs)
• uspace/lib/socket/include/ip_protocols.h (moved) (moved from uspace/srv/net/include/ip_protocols.h ) (view diffs)
• uspace/lib/socket/include/net_byteorder.h (moved) (moved from uspace/srv/net/include/byteorder.h ) (view diffs)
• uspace/lib/socket/include/net_device.h (moved) (moved from uspace/srv/net/include/device.h ) (view diffs)
• uspace/lib/socket/include/net_err.h (moved) (moved from uspace/srv/net/err.h ) (view diffs)
• uspace/lib/socket/include/net_messages.h (moved) (moved from uspace/srv/net/messages.h ) (view diffs)
• uspace/lib/socket/include/net_modules.h (moved) (moved from uspace/srv/net/modules.h ) (view diffs)
• uspace/lib/socket/include/netdb.h (moved) (moved from uspace/srv/net/include/netdb.h ) (view diffs)
• uspace/lib/socket/include/packet/packet.h (moved) (moved from uspace/srv/net/structures/packet/packet.h ) (view diffs)
• uspace/lib/socket/include/packet/packet_client.h (moved) (moved from uspace/srv/net/structures/packet/packet_client.h ) (view diffs)
• uspace/lib/socket/include/packet/packet_header.h (moved) (moved from uspace/srv/net/structures/packet/packet_header.h ) (view diffs)
• uspace/lib/socket/include/packet/packet_messages.h (moved) (moved from uspace/srv/net/structures/packet/packet_messages.h ) (view diffs)
• uspace/lib/socket/include/packet/packet_server.h (moved) (moved from uspace/srv/net/structures/packet/packet_server.h ) (view diffs)
• uspace/lib/socket/include/socket.h (moved) (moved from uspace/srv/net/include/socket.h ) (view diffs)
• uspace/lib/socket/include/socket_codes.h (moved) (moved from uspace/srv/net/include/socket_codes.h ) (view diffs)
• uspace/lib/socket/include/socket_core.h (moved) (moved from uspace/srv/net/socket/socket_core.h ) (view diffs)
• uspace/lib/socket/include/socket_errno.h (moved) (moved from uspace/srv/net/include/socket_errno.h ) (view diffs)
• uspace/lib/socket/include/socket_messages.h (moved) (moved from uspace/srv/net/socket/socket_messages.h ) (view diffs)
• uspace/lib/socket/include/tcp_codes.h (moved) (moved from uspace/srv/net/include/tcp_codes.h ) (view diffs)
• uspace/lib/socket/packet/packet.c (moved) (moved from uspace/srv/net/structures/packet/packet.c ) (view diffs)
• uspace/lib/socket/packet/packet_client.c (moved) (moved from uspace/srv/net/structures/packet/packet_client.c ) (view diffs)
• uspace/lib/socket/packet/packet_server.c (moved) (moved from uspace/srv/net/structures/packet/packet_server.c ) (view diffs)
• uspace/srv/hw/netif/dp8390/Makefile (moved) (moved from uspace/srv/net/netif/dp8390/Makefile ) (view diffs)
• uspace/srv/hw/netif/dp8390/dp8390.c (moved) (moved from uspace/srv/net/netif/dp8390/dp8390.c ) (view diffs)
• uspace/srv/hw/netif/dp8390/dp8390.h (moved) (moved from uspace/srv/net/netif/dp8390/dp8390.h ) (view diffs)
• uspace/srv/hw/netif/dp8390/dp8390_drv.h (moved) (moved from uspace/srv/net/netif/dp8390/dp8390_drv.h ) (view diffs)
• uspace/srv/hw/netif/dp8390/dp8390_module.c (moved) (moved from uspace/srv/net/netif/dp8390/dp8390_module.c ) (view diffs)
• uspace/srv/hw/netif/dp8390/dp8390_port.h (moved) (moved from uspace/srv/net/netif/dp8390/dp8390_port.h ) (view diffs)
• uspace/srv/hw/netif/dp8390/local.h (moved) (moved from uspace/srv/net/netif/dp8390/local.h ) (view diffs)
• uspace/srv/hw/netif/dp8390/ne2000.c (moved) (moved from uspace/srv/net/netif/dp8390/ne2000.c ) (view diffs)
• uspace/srv/hw/netif/dp8390/ne2000.h (moved) (moved from uspace/srv/net/netif/dp8390/ne2000.h ) (view diffs)
• uspace/srv/net/Doxyfile (deleted)
• uspace/srv/net/il/arp/Makefile (modified) (view diffs)
• uspace/srv/net/il/arp/arp.c (modified) (view diffs)
• uspace/srv/net/il/arp/arp.h (modified) (view diffs)
• uspace/srv/net/il/arp/arp_module.c (modified) (view diffs)
• uspace/srv/net/il/ip/Makefile (modified) (view diffs)
• uspace/srv/net/il/ip/ip.c (modified) (view diffs)
• uspace/srv/net/il/ip/ip.h (modified) (view diffs)
• uspace/srv/net/il/ip/ip_module.c (modified) (view diffs)
• uspace/srv/net/module.c (deleted)
• uspace/srv/net/net/Makefile (modified) (view diffs)
• uspace/srv/net/net/net.c (modified) (view diffs)
• uspace/srv/net/net/net.h (modified) (view diffs)
• uspace/srv/net/net/net_bundle.c (modified) (view diffs)
• uspace/srv/net/net/net_standalone.c (modified) (view diffs)
• uspace/srv/net/net/start/Makefile (deleted)
• uspace/srv/net/netif/lo/Makefile (modified) (view diffs)
• uspace/srv/net/netif/lo/lo.c (modified) (view diffs)
• uspace/srv/net/netstart/Makefile (added)
• uspace/srv/net/netstart/netstart.c (moved) (moved from uspace/srv/net/net/start/netstart.c ) (view diffs)
• uspace/srv/net/netstart/self_test.c (added)
• uspace/srv/net/netstart/self_test.h (moved) (moved from uspace/srv/net/self_test.h ) (view diffs)
• uspace/srv/net/nil/eth/Makefile (modified) (view diffs)
• uspace/srv/net/nil/eth/eth.c (modified) (view diffs)
• uspace/srv/net/nil/eth/eth.h (modified) (view diffs)
• uspace/srv/net/nil/eth/eth_module.c (modified) (view diffs)
• uspace/srv/net/nil/nildummy/Makefile (modified) (view diffs)
• uspace/srv/net/nil/nildummy/nildummy.c (modified) (view diffs)
• uspace/srv/net/nil/nildummy/nildummy.h (modified) (view diffs)
• uspace/srv/net/nil/nildummy/nildummy_module.c (modified) (view diffs)
• uspace/srv/net/self_test.c (deleted)
• uspace/srv/net/tl/icmp/Makefile (modified) (view diffs)
• uspace/srv/net/tl/icmp/icmp.c (modified) (view diffs)
• uspace/srv/net/tl/icmp/icmp.h (modified) (view diffs)
• uspace/srv/net/tl/icmp/icmp_module.c (modified) (view diffs)
• uspace/srv/net/tl/tcp/Makefile (modified) (view diffs)
• uspace/srv/net/tl/tcp/tcp.c (modified) (view diffs)
• uspace/srv/net/tl/tcp/tcp.h (modified) (view diffs)
• uspace/srv/net/tl/tcp/tcp_module.c (modified) (view diffs)
• uspace/srv/net/tl/tcp/tcp_module.h (modified) (view diffs)
• uspace/srv/net/tl/udp/Makefile (modified) (view diffs)
• uspace/srv/net/tl/udp/udp.c (modified) (view diffs)
• uspace/srv/net/tl/udp/udp.h (modified) (view diffs)
• uspace/srv/net/tl/udp/udp_module.c (modified) (view diffs)
• uspace/srv/net/tl/udp/udp_module.h (modified) (view diffs)