Changeset 70253688 in mainline

Timestamp:

2012-09-07T08:12:05Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e0c836e8

Parents:

131d9a4 (diff), 8cf4823 (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)
• Makefile (modified) (view diffs)
• boot/Makefile.common (modified) (view diffs)
• boot/arch/arm32/include/main.h (modified) (view diffs)
• boot/arch/ppc32/_link.ld.in (modified) (view diffs)
• boot/arch/ppc32/include/arch.h (modified) (view diffs)
• boot/arch/ppc32/src/main.c (modified) (view diffs)
• boot/generic/include/printf.h (modified) (view diffs)
• boot/generic/include/printf_verify.h (added)
• kernel/arch/arm32/src/exception.c (modified) (view diffs)
• kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (modified) (view diffs)
• kernel/genarch/Makefile.inc (modified) (view diffs)
• kernel/genarch/include/drivers/arm926_uart/arm926_uart.h (added)
• kernel/genarch/src/drivers/arm926_uart/arm926_uart.c (added)
• kernel/generic/include/interrupt.h (modified) (view diffs)
• kernel/generic/include/lib/elf_load.h (modified) (view diffs)
• kernel/generic/include/print.h (modified) (view diffs)
• kernel/generic/include/printf/verify.h (added)
• uspace/Makefile (modified) (view diffs)
• uspace/app/bdsh/errors.h (modified) (view diffs)
• uspace/app/bdsh/input.c (modified) (view diffs)
• uspace/app/edit/edit.c (modified) (view diffs)
• uspace/app/top/screen.h (modified) (view diffs)
• uspace/dist/src/c/demos/top/screen.h (modified) (view diffs)
• uspace/drv/bus/isa/i8237.c (modified) (view diffs)
• uspace/drv/char/ps2mouse/ps2mouse.c (modified) (view diffs)
• uspace/drv/nic/rtl8139/driver.c (modified) (view diffs)
• uspace/lib/c/Makefile (modified) (view diffs)
• uspace/lib/c/arch/abs32le/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/abs32le/include/types.h (modified) (view diffs)
• uspace/lib/c/arch/amd64/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/amd64/include/types.h (modified) (view diffs)
• uspace/lib/c/arch/arm32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/arm32/include/types.h (modified) (view diffs)
• uspace/lib/c/arch/ia32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/ia32/include/types.h (modified) (view diffs)
• uspace/lib/c/arch/ia64/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/ia64/include/types.h (modified) (view diffs)
• uspace/lib/c/arch/mips32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/mips32/include/types.h (modified) (view diffs)
• uspace/lib/c/arch/mips64/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/mips64/include/types.h (modified) (view diffs)
• uspace/lib/c/arch/ppc32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/ppc32/include/types.h (modified) (view diffs)
• uspace/lib/c/arch/sparc64/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/sparc64/include/types.h (modified) (view diffs)
• uspace/lib/c/generic/io/con_srv.c (added)
• uspace/lib/c/generic/io/console.c (modified) (view diffs)
• uspace/lib/c/generic/io/input.c (added)
• uspace/lib/c/generic/io/output.c (modified) (view diffs)
• uspace/lib/c/generic/tls.c (modified) (view diffs)
• uspace/lib/c/include/io/con_srv.h (added)
• uspace/lib/c/include/io/concaps.h (added)
• uspace/lib/c/include/io/console.h (modified) (view diffs)
• uspace/lib/c/include/io/input.h (added)
• uspace/lib/c/include/io/kbd_event.h (added)
• uspace/lib/c/include/io/klog.h (modified) (view diffs)
• uspace/lib/c/include/io/log.h (modified) (view diffs)
• uspace/lib/c/include/io/verify.h (added)
• uspace/lib/c/include/ipc/console.h (modified) (view diffs)
• uspace/lib/c/include/stdio.h (modified) (view diffs)
• uspace/lib/draw/surface.c (modified) (view diffs)
• uspace/lib/draw/surface.h (modified) (view diffs)
• uspace/lib/drv/include/ddf/log.h (modified) (view diffs)
• uspace/lib/ext4/libext4_filesystem.c (modified) (view diffs)
• uspace/lib/gui/terminal.c (modified) (view diffs)
• uspace/lib/gui/terminal.h (modified) (view diffs)
• uspace/srv/fs/udf/Makefile (added)
• uspace/srv/fs/udf/udf.c (added)
• uspace/srv/fs/udf/udf.h (added)
• uspace/srv/fs/udf/udf_cksum.c (added)
• uspace/srv/fs/udf/udf_cksum.h (added)
• uspace/srv/fs/udf/udf_file.c (added)
• uspace/srv/fs/udf/udf_file.h (added)
• uspace/srv/fs/udf/udf_idx.c (added)
• uspace/srv/fs/udf/udf_idx.h (added)
• uspace/srv/fs/udf/udf_ops.c (added)
• uspace/srv/fs/udf/udf_osta.c (added)
• uspace/srv/fs/udf/udf_osta.h (added)
• uspace/srv/fs/udf/udf_types.h (added)
• uspace/srv/fs/udf/udf_volume.c (added)
• uspace/srv/fs/udf/udf_volume.h (added)
• uspace/srv/hid/compositor/compositor.c (modified) (view diffs)
• uspace/srv/hid/compositor/compositor.h (modified) (view diffs)
• uspace/srv/hid/console/console.c (modified) (view diffs)
• uspace/srv/hid/remcons/remcons.c (modified) (view diffs)
• uspace/srv/hid/remcons/user.c (modified) (view diffs)
• uspace/srv/hid/remcons/user.h (modified) (view diffs)
• uspace/srv/net/ethip/pdu.c (modified) (view diffs)
• uspace/srv/net/tcp/conn.c (modified) (view diffs)
• uspace/srv/net/tcp/segment.c (modified) (view diffs)
• uspace/srv/net/tcp/sock.c (modified) (view diffs)
• uspace/srv/net/tcp/tqueue.c (modified) (view diffs)
• uspace/srv/net/udp/sock.c (modified) (view diffs)