Changeset 69146b93 in mainline for uspace

Timestamp:

2012-11-26T19:02:45Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

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.

Message:

Merged mainline,1723.

Location:

uspace

Files:

• Makefile (modified) (view diffs)
• Makefile.common (modified) (view diffs)
• app/ext2info/ext2info.c (deleted)
• app/tester/Makefile (modified) (view diffs)
• app/tester/ext2/ext2_1.c (deleted)
• app/tester/ext2/ext2_1.def (deleted)
• app/tester/float/softfloat1.c (modified) (view diffs)
• app/tester/mm/common.c (modified) (view diffs)
• app/tester/mm/mapping1.c (modified) (view diffs)
• app/tester/tester.c (modified) (view diffs)
• app/tester/tester.h (modified) (view diffs)
• drv/bus/isa/i8237.c (modified) (view diffs)
• drv/bus/pci/pciintel/pci.c (modified) (view diffs)
• drv/bus/usb/ehci/ehci.ma (modified) (view diffs)
• drv/bus/usb/ohci/ohci.ma (modified) (view diffs)
• drv/bus/usb/ohci/ohci_regs.h (modified) (view diffs)
• drv/bus/usb/uhci/hc.c (modified) (view diffs)
• drv/bus/usb/uhci/hc.h (modified) (view diffs)
• drv/bus/usb/uhcirh/port.c (modified) (view diffs)
• drv/char/i8042/i8042.c (modified) (view diffs)
• drv/char/ns8250/ns8250.c (modified) (view diffs)
• drv/infrastructure/rootamdm37x/Makefile (moved) (moved from uspace/app/ext2info/Makefile ) (view diffs)
• drv/infrastructure/rootamdm37x/amdm37x.c (added)
• drv/infrastructure/rootamdm37x/amdm37x.h (moved) (moved from uspace/srv/fs/ext2fs/ext2fs.c ) (view diffs)
• drv/infrastructure/rootamdm37x/cm/clock_control.h (added)
• drv/infrastructure/rootamdm37x/cm/core.h (added)
• drv/infrastructure/rootamdm37x/cm/iva2.h (added)
• drv/infrastructure/rootamdm37x/cm/mpu.h (added)
• drv/infrastructure/rootamdm37x/cm/usbhost.h (added)
• drv/infrastructure/rootamdm37x/prm/clock_control.h (added)
• drv/infrastructure/rootamdm37x/prm/global_reg.h (added)
• drv/infrastructure/rootamdm37x/prm/usbhost.h (added)
• drv/infrastructure/rootamdm37x/rootamdm37x.c (added)
• drv/infrastructure/rootamdm37x/rootamdm37x.ma (added)
• drv/infrastructure/rootamdm37x/uhh.h (added)
• drv/infrastructure/rootamdm37x/usbtll.h (added)
• drv/nic/e1k/e1k.c (modified) (view diffs)
• drv/nic/ne2k/dp8390.c (modified) (view diffs)
• drv/nic/rtl8139/defs.h (modified) (view diffs)
• drv/nic/rtl8139/driver.c (modified) (view diffs)
• drv/time/cmos-rtc/cmos-rtc.c (modified) (view diffs)
• lib/c/Makefile (modified) (view diffs)
• lib/c/arch/abs32le/include/ddi.h (modified) (view diffs)
• lib/c/arch/arm32/Makefile.common (modified) (view diffs)
• lib/c/arch/arm32/include/ddi.h (modified) (view diffs)
• lib/c/arch/ia32/include/ddi.h (modified) (view diffs)
• lib/c/arch/ia64/include/ddi.h (modified) (view diffs)
• lib/c/arch/ia64/src/ddi.c (modified) (view diffs)
• lib/c/arch/mips32/include/ddi.h (modified) (view diffs)
• lib/c/arch/mips64/include/ddi.h (modified) (view diffs)
• lib/c/arch/ppc32/include/ddi.h (modified) (view diffs)
• lib/c/arch/sparc64/include/ddi.h (modified) (view diffs)
• lib/c/generic/ddi.c (modified) (view diffs)
• lib/c/generic/fibril.c (modified) (view diffs)
• lib/c/generic/malloc.c (modified) (view diffs)
• lib/c/generic/pio_trace.c (added)
• lib/c/generic/stack.c (moved) (moved from uspace/lib/ext2/libext2_block_group.h ) (view diffs)
• lib/c/generic/thread.c (modified) (view diffs)
• lib/c/include/ddi.h (modified) (view diffs)
• lib/c/include/macros.h (modified) (view diffs)
• lib/c/include/stack.h (moved) (moved from uspace/lib/ext2/libext2.h ) (view diffs)
• lib/ext2/Makefile (deleted)
• lib/ext2/libext2_block_group.c (deleted)
• lib/ext2/libext2_directory.c (deleted)
• lib/ext2/libext2_directory.h (deleted)
• lib/ext2/libext2_filesystem.c (deleted)
• lib/ext2/libext2_filesystem.h (deleted)
• lib/ext2/libext2_inode.c (deleted)
• lib/ext2/libext2_inode.h (deleted)
• lib/ext2/libext2_superblock.c (deleted)
• lib/ext2/libext2_superblock.h (deleted)
• lib/ext4/libext4_block_group.c (modified) (view diffs)
• lib/ext4/libext4_block_group.h (modified) (view diffs)
• lib/ext4/libext4_directory.c (modified) (view diffs)
• lib/ext4/libext4_directory.h (modified) (view diffs)
• lib/ext4/libext4_filesystem.c (modified) (view diffs)
• lib/ext4/libext4_filesystem.h (modified) (view diffs)
• lib/ext4/libext4_inode.c (modified) (view diffs)
• lib/ext4/libext4_inode.h (modified) (view diffs)
• lib/ext4/libext4_superblock.c (modified) (view diffs)
• lib/ext4/libext4_superblock.h (modified) (view diffs)
• lib/ext4/libext4_types.h (modified) (view diffs)
• lib/softfloat/common.c (modified) (view diffs)
• lib/usbdev/include/usb/dev/request.h (modified) (view diffs)
• srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
• srv/bd/gxe_bd/gxe_bd.c (modified) (view diffs)
• srv/fs/ext2fs/Makefile (deleted)
• srv/fs/ext2fs/ext2fs_ops.c (deleted)
• srv/fs/ext4fs/ext4fs_ops.c (modified) (view diffs)
• srv/hid/input/port/pl050.c (modified) (view diffs)
• srv/hid/output/port/ega.c (modified) (view diffs)
• srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• srv/hw/irc/i8259/i8259.c (modified) (view diffs)
• srv/logger/initlvl.c (modified) (view diffs)