Changeset 66be0288 in mainline
- Timestamp:
- 2014-01-17T17:02:59Z (11 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 476f62c, facc34d
- Parents:
- 2e80321 (diff), 61b5b73d (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:
-
- 18 added
- 2 deleted
- 94 edited
- 4 moved
-
.bzrignore (modified) (view diffs)
-
HelenOS.config (modified) (view diffs)
-
abi/include/abi/ipc/event.h (modified) (view diffs)
-
abi/include/abi/kio.h (added)
-
abi/include/abi/klog.h (modified) (view diffs)
-
abi/include/abi/log.h (added)
-
abi/include/abi/syscall.h (modified) (view diffs)
-
boot/Makefile.common (modified) (view diffs)
-
boot/arch/arm32/Makefile.inc (modified) (view diffs)
-
boot/arch/arm32/include/arch.h (modified) (view diffs)
-
boot/arch/arm32/include/main.h (modified) (view diffs)
-
boot/arch/arm32/include/mm.h (modified) (view diffs)
-
boot/arch/arm32/src/mm.c (modified) (view diffs)
-
boot/arch/arm32/src/putchar.c (modified) (view diffs)
-
contrib/arch/HelenOS.adl (modified) (view diffs)
-
contrib/arch/kernel/kernel.adl (modified) (view diffs)
-
contrib/arch/uspace/app/kio/kio.adl (moved) (moved from contrib/arch/uspace/app/klog/klog.adl ) (view diffs)
-
contrib/arch/uspace/lib/libc/bind (modified) (view diffs)
-
contrib/arch/uspace/lib/libc/protocol (modified) (view diffs)
-
contrib/arch/uspace/lib/libc/requires (modified) (view diffs)
-
contrib/arch/uspace/lib/libc/subsume (modified) (view diffs)
-
contrib/arch/uspace/srv/ns/ns.adl (modified) (view diffs)
-
defaults/arm32/raspberrypi/Makefile.config (added)
-
kernel/Makefile (modified) (view diffs)
-
kernel/arch/amd64/src/interrupt.c (modified) (view diffs)
-
kernel/arch/arm32/Makefile.inc (modified) (view diffs)
-
kernel/arch/arm32/_link.ld.in (modified) (view diffs)
-
kernel/arch/arm32/include/arch/cp15.h (modified) (view diffs)
-
kernel/arch/arm32/include/arch/mach/integratorcp/integratorcp.h (modified) (view diffs)
-
kernel/arch/arm32/include/arch/mach/raspberrypi/raspberrypi.h (added)
-
kernel/arch/arm32/include/arch/mm/frame.h (modified) (view diffs)
-
kernel/arch/arm32/include/arch/mm/page_armv6.h (modified) (view diffs)
-
kernel/arch/arm32/src/mach/gta02/gta02.c (modified) (view diffs)
-
kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (modified) (view diffs)
-
kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c (added)
-
kernel/arch/arm32/src/machine_func.c (modified) (view diffs)
-
kernel/arch/ia32/src/drivers/i8259.c (modified) (view diffs)
-
kernel/arch/ia32/src/smp/apic.c (modified) (view diffs)
-
kernel/arch/ia32/src/smp/mps.c (modified) (view diffs)
-
kernel/arch/ia32/src/smp/smp.c (modified) (view diffs)
-
kernel/arch/mips32/src/debugger.c (modified) (view diffs)
-
kernel/arch/mips32/src/exception.c (modified) (view diffs)
-
kernel/arch/mips32/src/mm/tlb.c (modified) (view diffs)
-
kernel/arch/ppc32/src/interrupt.c (modified) (view diffs)
-
kernel/arch/sparc64/src/drivers/kbd.c (modified) (view diffs)
-
kernel/arch/sparc64/src/drivers/pci.c (modified) (view diffs)
-
kernel/arch/sparc64/src/drivers/scr.c (modified) (view diffs)
-
kernel/arch/sparc64/src/mm/sun4v/tlb.c (modified) (view diffs)
-
kernel/arch/sparc64/src/smp/sun4u/smp.c (modified) (view diffs)
-
kernel/arch/sparc64/src/sun4v/md.c (modified) (view diffs)
-
kernel/arch/sparc64/src/trap/sun4u/interrupt.c (modified) (view diffs)
-
kernel/arch/sparc64/src/trap/sun4v/interrupt.c (modified) (view diffs)
-
kernel/doc/doxygroups.h (modified) (view diffs)
-
kernel/genarch/Makefile.inc (modified) (view diffs)
-
kernel/genarch/include/genarch/drivers/arm926_uart/arm926_uart.h (deleted)
-
kernel/genarch/include/genarch/drivers/bcm2835/irc.h (added)
-
kernel/genarch/include/genarch/drivers/bcm2835/mbox.h (added)
-
kernel/genarch/include/genarch/drivers/bcm2835/timer.h (added)
-
kernel/genarch/include/genarch/drivers/pl011/pl011.h (added)
-
kernel/genarch/src/acpi/acpi.c (modified) (view diffs)
-
kernel/genarch/src/acpi/madt.c (modified) (view diffs)
-
kernel/genarch/src/drivers/bcm2835/mbox.c (added)
-
kernel/genarch/src/drivers/pl011/pl011.c (moved) (moved from kernel/genarch/src/drivers/arm926_uart/arm926_uart.c ) (view diffs)
-
kernel/genarch/src/drivers/via-cuda/cuda.c (modified) (view diffs)
-
kernel/generic/include/console/console.h (modified) (view diffs)
-
kernel/generic/include/debug.h (modified) (view diffs)
-
kernel/generic/include/log.h (added)
-
kernel/generic/include/synch/spinlock.h (modified) (view diffs)
-
kernel/generic/src/console/cmd.c (modified) (view diffs)
-
kernel/generic/src/console/console.c (modified) (view diffs)
-
kernel/generic/src/lib/func.c (modified) (view diffs)
-
kernel/generic/src/lib/rd.c (modified) (view diffs)
-
kernel/generic/src/log/log.c (added)
-
kernel/generic/src/main/kinit.c (modified) (view diffs)
-
kernel/generic/src/main/main.c (modified) (view diffs)
-
kernel/generic/src/main/shutdown.c (modified) (view diffs)
-
kernel/generic/src/mm/frame.c (modified) (view diffs)
-
kernel/generic/src/proc/program.c (modified) (view diffs)
-
kernel/generic/src/proc/scheduler.c (modified) (view diffs)
-
kernel/generic/src/syscall/syscall.c (modified) (view diffs)
-
uspace/Makefile (modified) (view diffs)
-
uspace/app/init/init.c (modified) (view diffs)
-
uspace/app/kio/Makefile (moved) (moved from uspace/app/klog/Makefile ) (view diffs)
-
uspace/app/kio/kio.c (moved) (moved from uspace/app/klog/klog.c ) (view diffs)
-
uspace/app/trace/syscalls.c (modified) (view diffs)
-
uspace/app/vdemo/vdemo.c (modified) (view diffs)
-
uspace/app/viewer/viewer.c (modified) (view diffs)
-
uspace/app/vlaunch/vlaunch.c (modified) (view diffs)
-
uspace/app/vterm/vterm.c (modified) (view diffs)
-
uspace/lib/c/Makefile (modified) (view diffs)
-
uspace/lib/c/generic/assert.c (modified) (view diffs)
-
uspace/lib/c/generic/io/io.c (modified) (view diffs)
-
uspace/lib/c/generic/io/kio.c (added)
-
uspace/lib/c/generic/io/klog.c (modified) (view diffs)
-
uspace/lib/c/generic/io/window.c (modified) (view diffs)
-
uspace/lib/c/generic/private/stdio.h (modified) (view diffs)
-
uspace/lib/c/include/io/kio.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/window.h (modified) (view diffs)
-
uspace/lib/c/include/stdio.h (modified) (view diffs)
-
uspace/lib/draw/cursor/embedded.c (modified) (view diffs)
-
uspace/lib/gui/Makefile (modified) (view diffs)
-
uspace/lib/gui/button.c (modified) (view diffs)
-
uspace/lib/gui/button.h (modified) (view diffs)
-
uspace/lib/gui/common.c (added)
-
uspace/lib/gui/common.h (added)
-
uspace/lib/gui/connection.c (modified) (view diffs)
-
uspace/lib/gui/label.c (modified) (view diffs)
-
uspace/lib/gui/label.h (modified) (view diffs)
-
uspace/lib/gui/window.c (modified) (view diffs)
-
uspace/lib/gui/window.h (modified) (view diffs)
-
uspace/srv/hid/compositor/Makefile (modified) (view diffs)
-
uspace/srv/hid/compositor/compositor.c (modified) (view diffs)
-
uspace/srv/hid/compositor/gfx/nameic.tga (deleted)
-
uspace/srv/klog/Makefile (added)
-
uspace/srv/klog/klog.c (added)
-
uspace/srv/logger/writer.c (modified) (view diffs)
Note:
See TracChangeset
for help on using the changeset viewer.
