Changeset 69146b93 in mainline
- Timestamp:
- 2012-11-26T19:02:45Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 04552324
- Parents:
- 5d230a30 (diff), 7462674 (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:
-
- 23 added
- 15 deleted
- 122 edited
- 5 moved
-
HelenOS.config (modified) (view diffs)
-
abi/include/mm/as.h (modified) (view diffs)
-
boot/Makefile.common (modified) (view diffs)
-
boot/Makefile.uboot (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)
-
boot/arch/ia64/src/main.c (modified) (view diffs)
-
contrib/conf/ski.conf (modified) (view diffs)
-
defaults/arm32/beagleboardxm/Makefile.config (added)
-
defaults/arm32/gta02/Makefile.config (modified) (view diffs)
-
kernel/arch/amd64/Makefile.inc (modified) (view diffs)
-
kernel/arch/amd64/src/mm/page.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/asm.h (modified) (view diffs)
-
kernel/arch/arm32/include/barrier.h (modified) (view diffs)
-
kernel/arch/arm32/include/cpu.h (modified) (view diffs)
-
kernel/arch/arm32/include/mach/beagleboardxm/beagleboardxm.h (moved) (moved from uspace/srv/fs/ext2fs/ext2fs.h ) (view diffs)
-
kernel/arch/arm32/include/machine_func.h (modified) (view diffs)
-
kernel/arch/arm32/include/mm/frame.h (modified) (view diffs)
-
kernel/arch/arm32/include/mm/page.h (modified) (view diffs)
-
kernel/arch/arm32/include/mm/page_armv4.h (added)
-
kernel/arch/arm32/include/mm/page_armv6.h (added)
-
kernel/arch/arm32/include/mm/page_fault.h (modified) (view diffs)
-
kernel/arch/arm32/include/regutils.h (modified) (view diffs)
-
kernel/arch/arm32/src/arm32.c (modified) (view diffs)
-
kernel/arch/arm32/src/cpu/cpu.c (modified) (view diffs)
-
kernel/arch/arm32/src/exception.c (modified) (view diffs)
-
kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (added)
-
kernel/arch/arm32/src/machine_func.c (modified) (view diffs)
-
kernel/arch/arm32/src/mm/page.c (modified) (view diffs)
-
kernel/arch/arm32/src/mm/page_fault.c (modified) (view diffs)
-
kernel/arch/ia64/include/mm/as.h (modified) (view diffs)
-
kernel/arch/ia64/src/mm/tlb.c (modified) (view diffs)
-
kernel/arch/mips32/src/mm/tlb.c (modified) (view diffs)
-
kernel/arch/mips64/src/mm/tlb.c (modified) (view diffs)
-
kernel/arch/ppc32/src/mm/pht.c (modified) (view diffs)
-
kernel/arch/ppc32/src/ppc32.c (modified) (view diffs)
-
kernel/arch/sparc64/src/mm/sun4u/tlb.c (modified) (view diffs)
-
kernel/arch/sparc64/src/mm/sun4v/tlb.c (modified) (view diffs)
-
kernel/genarch/Makefile.inc (modified) (view diffs)
-
kernel/genarch/include/drivers/amdm37x_dispc/amdm37x_dispc.h (added)
-
kernel/genarch/include/drivers/amdm37x_gpt/amdm37x_gpt.h (added)
-
kernel/genarch/include/drivers/amdm37x_irc/amdm37x_irc.h (added)
-
kernel/genarch/include/drivers/amdm37x_uart/amdm37x_uart.h (added)
-
kernel/genarch/src/drivers/amdm37x_uart/amdm37x_uart.c (added)
-
kernel/genarch/src/mm/page_ht.c (modified) (view diffs)
-
kernel/genarch/src/mm/page_pt.c (modified) (view diffs)
-
kernel/generic/include/config.h (modified) (view diffs)
-
kernel/generic/include/mm/as.h (modified) (view diffs)
-
kernel/generic/src/console/cmd.c (modified) (view diffs)
-
kernel/generic/src/console/kconsole.c (modified) (view diffs)
-
kernel/generic/src/interrupt/interrupt.c (modified) (view diffs)
-
kernel/generic/src/main/kinit.c (modified) (view diffs)
-
kernel/generic/src/mm/as.c (modified) (view diffs)
-
kernel/generic/src/mm/backend_anon.c (modified) (view diffs)
-
kernel/generic/src/mm/backend_elf.c (modified) (view diffs)
-
kernel/generic/src/mm/backend_phys.c (modified) (view diffs)
-
kernel/generic/src/mm/km.c (modified) (view diffs)
-
kernel/generic/src/proc/program.c (modified) (view diffs)
-
kernel/generic/src/proc/task.c (modified) (view diffs)
-
tools/autotool.py (modified) (view diffs)
-
tools/config.py (modified) (view diffs)
-
tools/mkarray.py (modified) (view diffs)
-
tools/mkuimage.py (modified) (view diffs)
-
tools/pack.py (modified) (view diffs)
-
uspace/Makefile (modified) (view diffs)
-
uspace/Makefile.common (modified) (view diffs)
-
uspace/app/ext2info/ext2info.c (deleted)
-
uspace/app/tester/Makefile (modified) (view diffs)
-
uspace/app/tester/ext2/ext2_1.c (deleted)
-
uspace/app/tester/ext2/ext2_1.def (deleted)
-
uspace/app/tester/float/softfloat1.c (modified) (view diffs)
-
uspace/app/tester/mm/common.c (modified) (view diffs)
-
uspace/app/tester/mm/mapping1.c (modified) (view diffs)
-
uspace/app/tester/tester.c (modified) (view diffs)
-
uspace/app/tester/tester.h (modified) (view diffs)
-
uspace/drv/bus/isa/i8237.c (modified) (view diffs)
-
uspace/drv/bus/pci/pciintel/pci.c (modified) (view diffs)
-
uspace/drv/bus/usb/ehci/ehci.ma (modified) (view diffs)
-
uspace/drv/bus/usb/ohci/ohci.ma (modified) (view diffs)
-
uspace/drv/bus/usb/ohci/ohci_regs.h (modified) (view diffs)
-
uspace/drv/bus/usb/uhci/hc.c (modified) (view diffs)
-
uspace/drv/bus/usb/uhci/hc.h (modified) (view diffs)
-
uspace/drv/bus/usb/uhcirh/port.c (modified) (view diffs)
-
uspace/drv/char/i8042/i8042.c (modified) (view diffs)
-
uspace/drv/char/ns8250/ns8250.c (modified) (view diffs)
-
uspace/drv/infrastructure/rootamdm37x/Makefile (moved) (moved from uspace/app/ext2info/Makefile ) (view diffs)
-
uspace/drv/infrastructure/rootamdm37x/amdm37x.c (added)
-
uspace/drv/infrastructure/rootamdm37x/amdm37x.h (moved) (moved from uspace/srv/fs/ext2fs/ext2fs.c ) (view diffs)
-
uspace/drv/infrastructure/rootamdm37x/cm/clock_control.h (added)
-
uspace/drv/infrastructure/rootamdm37x/cm/core.h (added)
-
uspace/drv/infrastructure/rootamdm37x/cm/iva2.h (added)
-
uspace/drv/infrastructure/rootamdm37x/cm/mpu.h (added)
-
uspace/drv/infrastructure/rootamdm37x/cm/usbhost.h (added)
-
uspace/drv/infrastructure/rootamdm37x/prm/clock_control.h (added)
-
uspace/drv/infrastructure/rootamdm37x/prm/global_reg.h (added)
-
uspace/drv/infrastructure/rootamdm37x/prm/usbhost.h (added)
-
uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c (added)
-
uspace/drv/infrastructure/rootamdm37x/rootamdm37x.ma (added)
-
uspace/drv/infrastructure/rootamdm37x/uhh.h (added)
-
uspace/drv/infrastructure/rootamdm37x/usbtll.h (added)
-
uspace/drv/nic/e1k/e1k.c (modified) (view diffs)
-
uspace/drv/nic/ne2k/dp8390.c (modified) (view diffs)
-
uspace/drv/nic/rtl8139/defs.h (modified) (view diffs)
-
uspace/drv/nic/rtl8139/driver.c (modified) (view diffs)
-
uspace/drv/time/cmos-rtc/cmos-rtc.c (modified) (view diffs)
-
uspace/lib/c/Makefile (modified) (view diffs)
-
uspace/lib/c/arch/abs32le/include/ddi.h (modified) (view diffs)
-
uspace/lib/c/arch/arm32/Makefile.common (modified) (view diffs)
-
uspace/lib/c/arch/arm32/include/ddi.h (modified) (view diffs)
-
uspace/lib/c/arch/ia32/include/ddi.h (modified) (view diffs)
-
uspace/lib/c/arch/ia64/include/ddi.h (modified) (view diffs)
-
uspace/lib/c/arch/ia64/src/ddi.c (modified) (view diffs)
-
uspace/lib/c/arch/mips32/include/ddi.h (modified) (view diffs)
-
uspace/lib/c/arch/mips64/include/ddi.h (modified) (view diffs)
-
uspace/lib/c/arch/ppc32/include/ddi.h (modified) (view diffs)
-
uspace/lib/c/arch/sparc64/include/ddi.h (modified) (view diffs)
-
uspace/lib/c/generic/ddi.c (modified) (view diffs)
-
uspace/lib/c/generic/fibril.c (modified) (view diffs)
-
uspace/lib/c/generic/malloc.c (modified) (view diffs)
-
uspace/lib/c/generic/pio_trace.c (added)
-
uspace/lib/c/generic/stack.c (moved) (moved from uspace/lib/ext2/libext2_block_group.h ) (view diffs)
-
uspace/lib/c/generic/thread.c (modified) (view diffs)
-
uspace/lib/c/include/ddi.h (modified) (view diffs)
-
uspace/lib/c/include/macros.h (modified) (view diffs)
-
uspace/lib/c/include/stack.h (moved) (moved from uspace/lib/ext2/libext2.h ) (view diffs)
-
uspace/lib/ext2/Makefile (deleted)
-
uspace/lib/ext2/libext2_block_group.c (deleted)
-
uspace/lib/ext2/libext2_directory.c (deleted)
-
uspace/lib/ext2/libext2_directory.h (deleted)
-
uspace/lib/ext2/libext2_filesystem.c (deleted)
-
uspace/lib/ext2/libext2_filesystem.h (deleted)
-
uspace/lib/ext2/libext2_inode.c (deleted)
-
uspace/lib/ext2/libext2_inode.h (deleted)
-
uspace/lib/ext2/libext2_superblock.c (deleted)
-
uspace/lib/ext2/libext2_superblock.h (deleted)
-
uspace/lib/ext4/libext4_block_group.c (modified) (view diffs)
-
uspace/lib/ext4/libext4_block_group.h (modified) (view diffs)
-
uspace/lib/ext4/libext4_directory.c (modified) (view diffs)
-
uspace/lib/ext4/libext4_directory.h (modified) (view diffs)
-
uspace/lib/ext4/libext4_filesystem.c (modified) (view diffs)
-
uspace/lib/ext4/libext4_filesystem.h (modified) (view diffs)
-
uspace/lib/ext4/libext4_inode.c (modified) (view diffs)
-
uspace/lib/ext4/libext4_inode.h (modified) (view diffs)
-
uspace/lib/ext4/libext4_superblock.c (modified) (view diffs)
-
uspace/lib/ext4/libext4_superblock.h (modified) (view diffs)
-
uspace/lib/ext4/libext4_types.h (modified) (view diffs)
-
uspace/lib/softfloat/common.c (modified) (view diffs)
-
uspace/lib/usbdev/include/usb/dev/request.h (modified) (view diffs)
-
uspace/srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
-
uspace/srv/bd/gxe_bd/gxe_bd.c (modified) (view diffs)
-
uspace/srv/fs/ext2fs/Makefile (deleted)
-
uspace/srv/fs/ext2fs/ext2fs_ops.c (deleted)
-
uspace/srv/fs/ext4fs/ext4fs_ops.c (modified) (view diffs)
-
uspace/srv/hid/input/port/pl050.c (modified) (view diffs)
-
uspace/srv/hid/output/port/ega.c (modified) (view diffs)
-
uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
-
uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
-
uspace/srv/hw/irc/i8259/i8259.c (modified) (view diffs)
-
uspace/srv/logger/initlvl.c (modified) (view diffs)
Note:
See TracChangeset
for help on using the changeset viewer.
