Changeset d1e196f7 in mainline

Timestamp:

2011-08-21T12:04:27Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

8a6ba94

Parents:

1877128 (diff), a6480d5 (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)
• abi/include/ipc/event.h (modified) (view diffs)
• abi/include/ipc/methods.h (modified) (view diffs)
• boot/Makefile.common (modified) (view diffs)
• kernel/arch/amd64/include/asm.h (modified) (view diffs)
• kernel/arch/ia32/Makefile.inc (modified) (view diffs)
• kernel/arch/ia32/include/asm.h (modified) (view diffs)
• kernel/arch/ia32/include/atomic.h (modified) (view diffs)
• kernel/arch/ia32/include/boot/boot.h (modified) (view diffs)
• kernel/arch/ia32/include/cycle.h (modified) (view diffs)
• kernel/arch/ia32/src/asm.S (modified) (view diffs)
• kernel/arch/ia32/src/boot/boot.S (modified) (view diffs)
• kernel/arch/ia32/src/cpu/cpu.c (modified) (view diffs)
• kernel/arch/ia32/src/proc/scheduler.c (modified) (view diffs)
• kernel/arch/ia32/src/syscall.c (modified) (view diffs)
• kernel/generic/include/ipc/ipc.h (modified) (view diffs)
• kernel/generic/src/console/console.c (modified) (view diffs)
• kernel/generic/src/ipc/event.c (modified) (view diffs)
• kernel/generic/src/ipc/ipc.c (modified) (view diffs)
• kernel/generic/src/ipc/sysipc.c (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/app/devctl/Makefile (added)
• uspace/app/devctl/devctl.c (added)
• uspace/app/lsusb/main.c (modified) (view diffs)
• uspace/app/mkbd/main.c (modified) (view diffs)
• uspace/app/tester/hw/serial/serial1.c (modified) (view diffs)
• uspace/lib/c/arch/ia32/Makefile.common (modified) (view diffs)
• uspace/lib/c/arch/ia32/Makefile.inc (modified) (view diffs)
• uspace/lib/c/arch/ia32/include/ddi.h (modified) (view diffs)
• uspace/lib/c/arch/ia32/src/entry.S (moved) (moved from uspace/lib/c/arch/ia32/src/entry.s ) (view diffs)
• uspace/lib/c/generic/async.c (modified) (view diffs)
• uspace/lib/c/generic/async_obsolete.c (modified) (view diffs)
• uspace/lib/c/generic/devman.c (modified) (view diffs)
• uspace/lib/c/generic/io/printf_core.c (modified) (view diffs)
• uspace/lib/c/generic/ipc.c (modified) (view diffs)
• uspace/lib/c/generic/loader.c (modified) (view diffs)
• uspace/lib/c/generic/loc.c (modified) (view diffs)
• uspace/lib/c/generic/ns.c (modified) (view diffs)
• uspace/lib/c/generic/private/async.h (modified) (view diffs)
• uspace/lib/c/include/async.h (modified) (view diffs)
• uspace/lib/c/include/devman.h (modified) (view diffs)
• uspace/lib/c/include/ipc/common.h (modified) (view diffs)
• uspace/lib/c/include/ipc/devman.h (modified) (view diffs)
• uspace/lib/c/include/ipc/ipc.h (modified) (view diffs)
• uspace/lib/drv/generic/driver.c (modified) (view diffs)
• uspace/lib/usb/src/resolve.c (modified) (view diffs)
• uspace/lib/usbvirt/src/device.c (modified) (view diffs)
• uspace/srv/devman/devman.c (modified) (view diffs)
• uspace/srv/devman/devman.h (modified) (view diffs)
• uspace/srv/devman/main.c (modified) (view diffs)
• uspace/srv/vfs/vfs.c (modified) (view diffs)
• uspace/srv/vfs/vfs.h (modified) (view diffs)
• uspace/srv/vfs/vfs_file.c (modified) (view diffs)