Changeset f4f866c in mainline

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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)
• boot/arch/amd64/Makefile.inc (modified) (view diffs)
• boot/arch/arm32/Makefile.inc (modified) (view diffs)
• boot/arch/arm32/loader/main.c (modified) (view diffs)
• boot/arch/ia64/Makefile.inc (modified) (view diffs)
• boot/arch/mips32/Makefile.inc (modified) (view diffs)
• boot/arch/ppc32/Makefile.inc (modified) (view diffs)
• boot/arch/ppc32/loader/asm.h (modified) (view diffs)
• boot/arch/sparc64/Makefile.inc (modified) (view diffs)
• defaults/amd64/Makefile.config (modified) (view diffs)
• defaults/arm32/Makefile.config (modified) (view diffs)
• defaults/ia32/Makefile.config (modified) (view diffs)
• defaults/ia64/Makefile.config (modified) (view diffs)
• defaults/mips32/Makefile.config (modified) (view diffs)
• defaults/ppc32/Makefile.config (modified) (view diffs)
• defaults/sparc64/Makefile.config (modified) (view diffs)
• defaults/special/Makefile.config (modified) (view diffs)
• kernel/Makefile (modified) (view diffs)
• kernel/arch/arm32/_link.ld.in (modified) (view diffs)
• kernel/arch/mips32/include/arch.h (modified) (view diffs)
• kernel/arch/mips32/include/asm/boot.h (modified) (view diffs)
• kernel/arch/mips32/include/asm/regname.h (modified) (view diffs)
• kernel/generic/include/cpu.h (modified) (view diffs)
• kernel/generic/include/func.h (modified) (view diffs)
• kernel/generic/include/ipc/sysipc.h (modified) (view diffs)
• kernel/generic/include/mm/frame.h (modified) (view diffs)
• kernel/generic/include/print.h (modified) (view diffs)
• kernel/generic/include/printf/printf_core.h (modified) (view diffs)
• kernel/generic/include/proc/task.h (modified) (view diffs)
• kernel/generic/include/proc/thread.h (modified) (view diffs)
• kernel/generic/include/str.h (modified) (view diffs)
• kernel/generic/include/syscall/syscall.h (modified) (view diffs)
• kernel/generic/include/sysinfo/abi.h (added)
• kernel/generic/include/sysinfo/stats.h (moved) (moved from kernel/test/sysinfo/sysinfo1.c ) (view diffs)
• kernel/generic/include/sysinfo/sysinfo.h (modified) (view diffs)
• kernel/generic/include/time/clock.h (modified) (view diffs)
• kernel/generic/src/console/cmd.c (modified) (view diffs)
• kernel/generic/src/cpu/cpu.c (modified) (view diffs)
• kernel/generic/src/interrupt/interrupt.c (modified) (view diffs)
• kernel/generic/src/ipc/ipc.c (modified) (view diffs)
• kernel/generic/src/ipc/sysipc.c (modified) (view diffs)
• kernel/generic/src/lib/func.c (modified) (view diffs)
• kernel/generic/src/lib/str.c (modified) (view diffs)
• kernel/generic/src/main/kinit.c (modified) (view diffs)
• kernel/generic/src/main/main.c (modified) (view diffs)
• kernel/generic/src/main/version.c (modified) (view diffs)
• kernel/generic/src/mm/frame.c (modified) (view diffs)
• kernel/generic/src/printf/printf.c (modified) (view diffs)
• kernel/generic/src/printf/printf_core.c (modified) (view diffs)
• kernel/generic/src/proc/scheduler.c (modified) (view diffs)
• kernel/generic/src/proc/task.c (modified) (view diffs)
• kernel/generic/src/proc/thread.c (modified) (view diffs)
• kernel/generic/src/synch/waitq.c (modified) (view diffs)
• kernel/generic/src/syscall/syscall.c (modified) (view diffs)
• kernel/generic/src/sysinfo/stats.c (added)
• kernel/generic/src/sysinfo/sysinfo.c (modified) (view diffs)
• kernel/generic/src/time/clock.c (modified) (view diffs)
• kernel/test/sysinfo/sysinfo1.def (deleted)
• kernel/test/test.c (modified) (view diffs)
• kernel/test/test.h (modified) (view diffs)
• tools/toolchain.sh (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/Makefile.common (modified) (view diffs)
• uspace/app/bdsh/exec.c (modified) (view diffs)
• uspace/app/bdsh/scli.h (modified) (view diffs)
• uspace/app/dummy_load/Makefile (moved) (moved from uspace/lib/netif/Makefile ) (view diffs)
• uspace/app/dummy_load/dummy_load.c (added)
• uspace/app/dummy_load/input.c (added)
• uspace/app/dummy_load/input.h (added)
• uspace/app/edit/edit.c (modified) (view diffs)
• uspace/app/getterm/getterm.c (modified) (view diffs)
• uspace/app/init/init.c (modified) (view diffs)
• uspace/app/klog/klog.c (modified) (view diffs)
• uspace/app/netecho/Makefile (modified) (view diffs)
• uspace/app/netecho/netecho.c (modified) (view diffs)
• uspace/app/netecho/parse.c (deleted)
• uspace/app/netecho/parse.h (deleted)
• uspace/app/nettest1/Makefile (modified) (view diffs)
• uspace/app/nettest1/nettest1.c (modified) (view diffs)
• uspace/app/nettest1/parse.c (deleted)
• uspace/app/nettest1/parse.h (deleted)
• uspace/app/nettest2/Makefile (modified) (view diffs)
• uspace/app/nettest2/nettest2.c (modified) (view diffs)
• uspace/app/nettest2/parse.c (deleted)
• uspace/app/nettest2/parse.h (deleted)
• uspace/app/ping/Makefile (modified) (view diffs)
• uspace/app/ping/parse.c (deleted)
• uspace/app/ping/parse.h (deleted)
• uspace/app/ping/ping.c (modified) (view diffs)
• uspace/app/redir/redir.c (modified) (view diffs)
• uspace/app/sbi/src/os/helenos.c (modified) (view diffs)
• uspace/app/sbi/src/run_expr.c (modified) (view diffs)
• uspace/app/stats/Makefile (added)
• uspace/app/stats/stats.c (added)
• uspace/app/tasks/Makefile (added)
• uspace/app/tasks/tasks.c (added)
• uspace/app/tester/console/console1.c (modified) (view diffs)
• uspace/app/tetris/screen.c (modified) (view diffs)
• uspace/app/tetris/screen.h (modified) (view diffs)
• uspace/app/top/Makefile (added)
• uspace/app/top/input.c (added)
• uspace/app/top/input.h (added)
• uspace/app/top/screen.c (added)
• uspace/app/top/screen.h (moved) (moved from uspace/lib/net/include/netif_standalone.h ) (view diffs)
• uspace/app/top/top.c (added)
• uspace/app/top/top.h (added)
• uspace/app/trace/syscalls.c (modified) (view diffs)
• uspace/lib/c/Makefile (modified) (view diffs)
• uspace/lib/c/arch/abs32le/include/types.h (modified) (view diffs)
• uspace/lib/c/arch/amd64/include/types.h (modified) (view diffs)
• uspace/lib/c/arch/arm32/include/types.h (modified) (view diffs)
• uspace/lib/c/arch/ia32/include/types.h (modified) (view diffs)
• uspace/lib/c/arch/ia64/include/types.h (modified) (view diffs)
• uspace/lib/c/arch/ia64/src/ddi.c (modified) (view diffs)
• uspace/lib/c/arch/mips32/include/types.h (modified) (view diffs)
• uspace/lib/c/arch/ppc32/include/types.h (modified) (view diffs)
• uspace/lib/c/arch/sparc64/include/types.h (modified) (view diffs)
• uspace/lib/c/generic/adt/hash_table.c (modified) (view diffs)
• uspace/lib/c/generic/arg_parse.c (added)
• uspace/lib/c/generic/async.c (modified) (view diffs)
• uspace/lib/c/generic/fibril.c (modified) (view diffs)
• uspace/lib/c/generic/futex.c (modified) (view diffs)
• uspace/lib/c/generic/io/asprintf.c (modified) (view diffs)
• uspace/lib/c/generic/io/console.c (modified) (view diffs)
• uspace/lib/c/generic/io/printf_core.c (modified) (view diffs)
• uspace/lib/c/generic/io/screenbuffer.c (moved) (moved from uspace/srv/hid/console/screenbuffer.c ) (view diffs)
• uspace/lib/c/generic/io/vprintf.c (modified) (view diffs)
• uspace/lib/c/generic/libc.c (modified) (view diffs)
• uspace/lib/c/generic/malloc.c (modified) (view diffs)
• uspace/lib/c/generic/stats.c (added)
• uspace/lib/c/generic/str.c (modified) (view diffs)
• uspace/lib/c/generic/str_error.c (added)
• uspace/lib/c/generic/sysinfo.c (modified) (view diffs)
• uspace/lib/c/generic/task.c (modified) (view diffs)
• uspace/lib/c/include/arg_parse.h (added)
• uspace/lib/c/include/bool.h (modified) (view diffs)
• uspace/lib/c/include/errno.h (modified) (view diffs)
• uspace/lib/c/include/futex.h (modified) (view diffs)
• uspace/lib/c/include/io/color.h (modified) (view diffs)
• uspace/lib/c/include/io/console.h (modified) (view diffs)
• uspace/lib/c/include/io/keycode.h (modified) (view diffs)
• uspace/lib/c/include/io/klog.h (modified) (view diffs)
• uspace/lib/c/include/io/printf_core.h (modified) (view diffs)
• uspace/lib/c/include/io/screenbuffer.h (moved) (moved from uspace/srv/hid/console/screenbuffer.h ) (view diffs)
• uspace/lib/c/include/io/style.h (modified) (view diffs)
• uspace/lib/c/include/stats.h (added)
• uspace/lib/c/include/str.h (modified) (view diffs)
• uspace/lib/c/include/str_error.h (added)
• uspace/lib/c/include/sysinfo.h (modified) (view diffs)
• uspace/lib/c/include/task.h (modified) (view diffs)
• uspace/lib/clui/Makefile (modified) (view diffs)
• uspace/lib/clui/tinput.c (modified) (view diffs)
• uspace/lib/clui/tinput.h (modified) (view diffs)
• uspace/lib/net/Makefile (modified) (view diffs)
• uspace/lib/net/adt/module_map.c (modified) (view diffs)
• uspace/lib/net/generic/net_remote.c (modified) (view diffs)
• uspace/lib/net/generic/packet_remote.c (modified) (view diffs)
• uspace/lib/net/il/arp_remote.c (modified) (view diffs)
• uspace/lib/net/il/ip_client.c (modified) (view diffs)
• uspace/lib/net/il/ip_remote.c (modified) (view diffs)
• uspace/lib/net/include/arp_interface.h (modified) (view diffs)
• uspace/lib/net/include/icmp_interface.h (modified) (view diffs)
• uspace/lib/net/include/il_interface.h (modified) (view diffs)
• uspace/lib/net/include/il_local.h (moved) (moved from uspace/lib/net/include/tl_standalone.h ) (view diffs)
• uspace/lib/net/include/il_messages.h (modified) (view diffs)
• uspace/lib/net/include/ip_client.h (modified) (view diffs)
• uspace/lib/net/include/ip_interface.h (modified) (view diffs)
• uspace/lib/net/include/ip_local.h (added)
• uspace/lib/net/include/ip_remote.h (added)
• uspace/lib/net/include/net_interface.h (modified) (view diffs)
• uspace/lib/net/include/netif.h (deleted)
• uspace/lib/net/include/netif_interface.h (modified) (view diffs)
• uspace/lib/net/include/netif_local.h (added)
• uspace/lib/net/include/netif_messages.h (modified) (view diffs)
• uspace/lib/net/include/netif_module.h (deleted)
• uspace/lib/net/include/netif_nil_bundle.h (modified) (view diffs)
• uspace/lib/net/include/netif_remote.h (added)
• uspace/lib/net/include/nil_interface.h (modified) (view diffs)
• uspace/lib/net/include/nil_local.h (moved) (moved from uspace/lib/net/include/nil_module.h ) (view diffs)
• uspace/lib/net/include/nil_messages.h (modified) (view diffs)
• uspace/lib/net/include/nil_remote.h (moved) (moved from uspace/lib/net/include/nil_standalone.h ) (view diffs)
• uspace/lib/net/include/packet_remote.h (added)
• uspace/lib/net/include/tl_common.h (modified) (view diffs)
• uspace/lib/net/include/tl_interface.h (modified) (view diffs)
• uspace/lib/net/include/tl_local.h (moved) (moved from uspace/lib/net/include/il_standalone.h ) (view diffs)
• uspace/lib/net/netif/netif.c (deleted)
• uspace/lib/net/netif/netif_local.c (added)
• uspace/lib/net/netif/netif_nil_bundle.c (modified) (view diffs)
• uspace/lib/net/netif/netif_remote.c (moved) (moved from uspace/lib/netif/generic/netif_remote.c ) (view diffs)
• uspace/lib/net/netif/netif_standalone.c (deleted)
• uspace/lib/net/nil/nil_remote.c (modified) (view diffs)
• uspace/lib/net/tl/icmp_remote.c (modified) (view diffs)
• uspace/lib/net/tl/tl_common.c (modified) (view diffs)
• uspace/lib/socket/Makefile (modified) (view diffs)
• uspace/lib/socket/generic/net_modules.c (modified) (view diffs)
• uspace/lib/socket/generic/socket_client.c (modified) (view diffs)
• uspace/lib/socket/generic/socket_core.c (modified) (view diffs)
• uspace/lib/socket/generic/socket_parse.c (added)
• uspace/lib/socket/include/net_err.h (modified) (view diffs)
• uspace/lib/socket/include/net_messages.h (modified) (view diffs)
• uspace/lib/socket/include/net_modules.h (modified) (view diffs)
• uspace/lib/socket/include/packet/packet_client.h (modified) (view diffs)
• uspace/lib/socket/include/socket_parse.h (added)
• uspace/lib/socket/packet/packet_client.c (modified) (view diffs)
• uspace/lib/socket/packet/packet_server.c (modified) (view diffs)
• uspace/srv/bd/rd/rd.c (modified) (view diffs)
• uspace/srv/devmap/devmap.c (modified) (view diffs)
• uspace/srv/hid/console/Makefile (modified) (view diffs)
• uspace/srv/hid/console/console.c (modified) (view diffs)
• uspace/srv/hid/console/gcons.c (modified) (view diffs)
• uspace/srv/hid/console/gcons.h (modified) (view diffs)
• uspace/srv/hid/console/keybuffer.h (modified) (view diffs)
• uspace/srv/hid/fb/Makefile (modified) (view diffs)
• uspace/srv/hid/fb/ega.c (modified) (view diffs)
• uspace/srv/hid/fb/fb.c (modified) (view diffs)
• uspace/srv/hid/fb/main.c (modified) (view diffs)
• uspace/srv/hid/fb/msim.c (modified) (view diffs)
• uspace/srv/hid/fb/niagara.c (modified) (view diffs)
• uspace/srv/hid/fb/serial_console.c (modified) (view diffs)
• uspace/srv/hid/fb/serial_console.h (modified) (view diffs)
• uspace/srv/hid/fb/sgcn.c (modified) (view diffs)
• uspace/srv/hid/kbd/generic/kbd.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/gxemul.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/msim.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/niagara.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/ns16550.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/pl050.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/sgcn.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/sun.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/z8530.c (modified) (view diffs)
• uspace/srv/hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
• uspace/srv/hw/char/i8042/i8042.c (modified) (view diffs)
• uspace/srv/hw/cir/fhc/fhc.c (modified) (view diffs)
• uspace/srv/hw/cir/obio/obio.c (modified) (view diffs)
• uspace/srv/hw/netif/dp8390/Makefile (modified) (view diffs)
• uspace/srv/hw/netif/dp8390/dp8390.c (modified) (view diffs)
• uspace/srv/hw/netif/dp8390/dp8390_module.c (modified) (view diffs)
• uspace/srv/net/cfg/Makefile (added)
• uspace/srv/net/cfg/general (moved) (moved from uspace/srv/net/cfg/modular/general ) (view diffs)
• uspace/srv/net/cfg/lo.netif_nil_bundle (moved) (moved from uspace/srv/net/cfg/module/lo ) (view diffs)
• uspace/srv/net/cfg/lo.netif_standalone (moved) (moved from uspace/srv/net/cfg/modular/lo ) (view diffs)
• uspace/srv/net/cfg/module/general (deleted)
• uspace/srv/net/cfg/ne2k.netif_nil_bundle (moved) (moved from uspace/srv/net/cfg/module/ne2k ) (view diffs)
• uspace/srv/net/cfg/ne2k.netif_standalone (moved) (moved from uspace/srv/net/cfg/modular/ne2k ) (view diffs)
• uspace/srv/net/il/arp/arp.c (modified) (view diffs)
• uspace/srv/net/il/arp/arp_module.c (modified) (view diffs)
• uspace/srv/net/il/arp/arp_module.h (modified) (view diffs)
• uspace/srv/net/il/ip/ip.c (modified) (view diffs)
• uspace/srv/net/il/ip/ip_module.c (modified) (view diffs)
• uspace/srv/net/il/ip/ip_module.h (modified) (view diffs)
• 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/netif/lo/Makefile (modified) (view diffs)
• uspace/srv/net/netif/lo/lo.c (modified) (view diffs)
• uspace/srv/net/netstart/netstart.c (modified) (view diffs)
• uspace/srv/net/netstart/self_test.c (modified) (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_module.c (modified) (view diffs)
• uspace/srv/net/tl/icmp/icmp.c (modified) (view diffs)
• uspace/srv/net/tl/icmp/icmp_module.c (modified) (view diffs)
• uspace/srv/net/tl/icmp/icmp_module.h (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/udp.c (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)
• uspace/srv/ns/ns.c (modified) (view diffs)
• uspace/srv/taskmon/taskmon.c (modified) (view diffs)