Changeset 90478727 in mainline

Timestamp:

2012-08-12T11:46:44Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

41b764b7

Parents:

e1e4192 (diff), 371cb6c (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/ddi/irq.h (modified) (view diffs)
• abi/include/proc/uarg.h (modified) (view diffs)
• boot/Makefile.build (modified) (view diffs)
• boot/Makefile.common (modified) (view diffs)
• boot/Makefile.grub (modified) (view diffs)
• boot/arch/ia64/Makefile.inc (modified) (view diffs)
• boot/arch/mips32/Makefile.inc (modified) (view diffs)
• boot/arch/mips64/Makefile.inc (modified) (view diffs)
• boot/arch/ppc32/Makefile.inc (modified) (view diffs)
• boot/generic/src/str.c (modified) (view diffs)
• contrib/arch/HelenOS.adl (modified) (view diffs)
• contrib/bazaar/bzreml/__init__.py (modified) (view diffs)
• contrib/bazaar/bzreml/setup.py (modified) (view diffs)
• contrib/bazaar/mbprotect/__init__.py (modified) (view diffs)
• contrib/conf/mips32-gx.sh (modified) (view diffs)
• defaults/mips32/Makefile.config (modified) (view diffs)
• defaults/ppc32/Makefile.config (modified) (view diffs)
• defaults/sparc64/ultra/Makefile.config (modified) (view diffs)
• kernel/Makefile (modified) (view diffs)
• kernel/arch/abs32le/include/mm/page.h (modified) (view diffs)
• kernel/arch/amd64/Makefile.inc (modified) (view diffs)
• kernel/arch/amd64/include/mm/page.h (modified) (view diffs)
• kernel/arch/amd64/src/asm.S (modified) (view diffs)
• kernel/arch/amd64/src/boot/multiboot.S (modified) (view diffs)
• kernel/arch/amd64/src/boot/multiboot2.S (modified) (view diffs)
• kernel/arch/amd64/src/boot/vesa_ret.inc (modified) (view diffs)
• kernel/arch/amd64/src/mm/page.c (modified) (view diffs)
• kernel/arch/amd64/src/userspace.c (modified) (view diffs)
• kernel/arch/arm32/include/mm/page.h (modified) (view diffs)
• kernel/arch/arm32/src/userspace.c (modified) (view diffs)
• kernel/arch/ia32/Makefile.inc (modified) (view diffs)
• kernel/arch/ia32/include/mm/page.h (modified) (view diffs)
• kernel/arch/ia32/src/boot/multiboot.S (modified) (view diffs)
• kernel/arch/ia32/src/boot/multiboot2.S (modified) (view diffs)
• kernel/arch/ia32/src/boot/vesa_prot.inc (modified) (view diffs)
• kernel/arch/ia32/src/boot/vesa_real.inc (modified) (view diffs)
• kernel/arch/ia32/src/boot/vesa_ret.inc (modified) (view diffs)
• kernel/arch/ia32/src/mm/page.c (modified) (view diffs)
• kernel/arch/ia32/src/smp/apic.c (modified) (view diffs)
• kernel/arch/ia32/src/userspace.c (modified) (view diffs)
• kernel/arch/ia64/Makefile.inc (modified) (view diffs)
• kernel/arch/ia64/src/drivers/ski.c (modified) (view diffs)
• kernel/arch/ia64/src/ia64.c (modified) (view diffs)
• kernel/arch/mips32/Makefile.inc (modified) (view diffs)
• kernel/arch/mips32/include/mm/page.h (modified) (view diffs)
• kernel/arch/mips32/src/mips32.c (modified) (view diffs)
• kernel/arch/mips64/Makefile.inc (modified) (view diffs)
• kernel/arch/mips64/src/mips64.c (modified) (view diffs)
• kernel/arch/ppc32/include/mm/page.h (modified) (view diffs)
• kernel/arch/ppc32/src/ppc32.c (modified) (view diffs)
• kernel/arch/sparc64/Makefile.inc (modified) (view diffs)
• kernel/arch/sparc64/src/drivers/niagara.c (modified) (view diffs)
• kernel/arch/sparc64/src/proc/sun4u/scheduler.c (modified) (view diffs)
• kernel/arch/sparc64/src/proc/sun4v/scheduler.c (modified) (view diffs)
• kernel/arch/sparc64/src/proc/thread.c (modified) (view diffs)
• kernel/arch/sparc64/src/smp/sun4u/ipi.c (modified) (view diffs)
• kernel/arch/sparc64/src/sun4u/sparc64.c (modified) (view diffs)
• kernel/arch/sparc64/src/sun4v/sparc64.c (modified) (view diffs)
• kernel/genarch/include/mm/page_pt.h (modified) (view diffs)
• kernel/genarch/src/kbrd/kbrd.c (modified) (view diffs)
• kernel/genarch/src/mm/as_ht.c (modified) (view diffs)
• kernel/genarch/src/mm/page_ht.c (modified) (view diffs)
• kernel/genarch/src/mm/page_pt.c (modified) (view diffs)
• kernel/genarch/src/srln/srln.c (modified) (view diffs)
• kernel/generic/include/console/prompt.h (added)
• kernel/generic/include/debug.h (modified) (view diffs)
• kernel/generic/include/interrupt.h (modified) (view diffs)
• kernel/generic/include/ipc/irq.h (modified) (view diffs)
• kernel/generic/include/proc/thread.h (modified) (view diffs)
• kernel/generic/include/symtab.h (modified) (view diffs)
• kernel/generic/include/symtab_lookup.h (added)
• kernel/generic/src/adt/btree.c (modified) (view diffs)
• kernel/generic/src/console/cmd.c (modified) (view diffs)
• kernel/generic/src/console/kconsole.c (modified) (view diffs)
• kernel/generic/src/console/prompt.c (added)
• kernel/generic/src/debug/symtab.c (modified) (view diffs)
• kernel/generic/src/interrupt/interrupt.c (modified) (view diffs)
• kernel/generic/src/ipc/ipc.c (modified) (view diffs)
• kernel/generic/src/ipc/irq.c (modified) (view diffs)
• kernel/generic/src/ipc/kbox.c (modified) (view diffs)
• kernel/generic/src/lib/ra.c (modified) (view diffs)
• kernel/generic/src/lib/str.c (modified) (view diffs)
• kernel/generic/src/main/kinit.c (modified) (view diffs)
• kernel/generic/src/main/main.c (modified) (view diffs)
• kernel/generic/src/main/uinit.c (modified) (view diffs)
• kernel/generic/src/mm/as.c (modified) (view diffs)
• kernel/generic/src/mm/slab.c (modified) (view diffs)
• kernel/generic/src/mm/tlb.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/proc/task.c (modified) (view diffs)
• kernel/generic/src/proc/thread.c (modified) (view diffs)
• kernel/generic/src/sysinfo/sysinfo.c (modified) (view diffs)
• kernel/generic/src/udebug/udebug.c (modified) (view diffs)
• kernel/generic/src/udebug/udebug_ops.c (modified) (view diffs)
• kernel/test/mm/falloc1.c (modified) (view diffs)
• kernel/test/mm/falloc2.c (modified) (view diffs)
• kernel/test/mm/slab1.c (modified) (view diffs)
• kernel/test/mm/slab2.c (modified) (view diffs)
• kernel/test/synch/semaphore1.c (modified) (view diffs)
• kernel/test/synch/semaphore2.c (modified) (view diffs)
• kernel/test/thread/thread1.c (modified) (view diffs)
• release/Makefile (modified) (view diffs)
• tools/autotool.py (modified) (view diffs)
• tools/dest_build.py (added)
• tools/toolchain.sh (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/Makefile.common (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (view diffs)
• uspace/app/devctl/devctl.c (modified) (view diffs)
• uspace/app/loc/loc.c (modified) (view diffs)
• uspace/app/sportdmp/sportdmp.c (modified) (view diffs)
• uspace/app/tester/mm/common.c (modified) (view diffs)
• uspace/app/tester/mm/mapping1.c (modified) (view diffs)
• uspace/app/usbinfo/Makefile (modified) (view diffs)
• uspace/app/usbinfo/list.c (moved) (moved from uspace/app/lsusb/main.c ) (view diffs)
• uspace/app/usbinfo/main.c (modified) (view diffs)
• uspace/app/usbinfo/usbinfo.h (modified) (view diffs)
• uspace/drv/block/ahci/Makefile (moved) (moved from uspace/app/lsusb/Makefile ) (view diffs)
• uspace/drv/block/ahci/ahci.c (added)
• uspace/drv/block/ahci/ahci.h (added)
• uspace/drv/block/ahci/ahci.ma (added)
• uspace/drv/block/ahci/ahci_hw.h (added)
• uspace/drv/block/ahci/ahci_sata.h (added)
• uspace/drv/bus/isa/isa.c (modified) (view diffs)
• uspace/drv/bus/pci/pciintel/pci.c (modified) (view diffs)
• uspace/drv/bus/pci/pciintel/pci.h (modified) (view diffs)
• uspace/drv/bus/usb/ehci/main.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/endpoint_list.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hc.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hw_struct/hcca.h (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hw_struct/mem_access.h (added)
• uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h (modified) (view diffs)
• uspace/drv/bus/usb/ohci/main.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/ohci.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/ohci_batch.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/ohci_batch.h (modified) (view diffs)
• uspace/drv/bus/usb/ohci/ohci_endpoint.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/ohci_regs.h (modified) (view diffs)
• uspace/drv/bus/usb/ohci/root_hub.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/utils/malloc32.h (modified) (view diffs)
• uspace/drv/bus/usb/uhci/hc.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/hw_struct/queue_head.h (modified) (view diffs)
• uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h (modified) (view diffs)
• uspace/drv/bus/usb/uhci/main.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/transfer_list.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/uhci.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/uhci_batch.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/uhci_batch.h (modified) (view diffs)
• uspace/drv/bus/usb/uhci/utils/malloc32.h (modified) (view diffs)
• uspace/drv/bus/usb/uhcirh/port.c (modified) (view diffs)
• uspace/drv/bus/usb/uhcirh/root_hub.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/generic/hiddev.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/generic/hiddev.h (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/kbd/kbddev.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/kbd/kbddev.h (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.h (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/main.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/mouse/mousedev.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/mouse/mousedev.h (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/multimedia/multimedia.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/multimedia/multimedia.h (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/subdrivers.h (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/usbhid.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/usbhid.h (modified) (view diffs)
• uspace/drv/bus/usb/usbhub/port.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhub/status.h (modified) (view diffs)
• uspace/drv/bus/usb/usbhub/usbhub.c (modified) (view diffs)
• uspace/drv/bus/usb/usbmast/main.c (modified) (view diffs)
• uspace/drv/bus/usb/usbmid/main.c (modified) (view diffs)
• uspace/drv/char/i8042/i8042.c (modified) (view diffs)
• uspace/drv/infrastructure/rootmac/rootmac.c (modified) (view diffs)
• uspace/drv/infrastructure/rootpc/rootpc.c (modified) (view diffs)
• uspace/drv/nic/ne2k/dp8390.c (modified) (view diffs)
• uspace/drv/nic/ne2k/ne2k.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/amd64/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/amd64/include/elf_linux.h (modified) (view diffs)
• uspace/lib/c/arch/arm32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/arm32/src/fibril.S (modified) (view diffs)
• uspace/lib/c/arch/arm32/src/stacktrace_asm.S (modified) (view diffs)
• uspace/lib/c/arch/arm32/src/thread_entry.s (modified) (view diffs)
• uspace/lib/c/arch/ia32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/ia64/Makefile.common (modified) (view diffs)
• uspace/lib/c/arch/ia64/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/ia64/include/fibril.h (modified) (view diffs)
• uspace/lib/c/arch/ia64/include/thread.h (modified) (view diffs)
• uspace/lib/c/arch/mips32/Makefile.common (modified) (view diffs)
• uspace/lib/c/arch/mips32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/mips32eb/Makefile.common (modified) (view diffs)
• uspace/lib/c/arch/mips64/Makefile.common (modified) (view diffs)
• uspace/lib/c/arch/mips64/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/ppc32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/sparc64/_link.ld.in (modified) (view diffs)
• uspace/lib/c/generic/as.c (modified) (view diffs)
• uspace/lib/c/generic/async.c (modified) (view diffs)
• uspace/lib/c/generic/device/ahci.c (added)
• uspace/lib/c/generic/devman.c (modified) (view diffs)
• uspace/lib/c/generic/elf/elf_load.c (modified) (view diffs)
• uspace/lib/c/generic/fibril.c (modified) (view diffs)
• uspace/lib/c/generic/loc.c (modified) (view diffs)
• uspace/lib/c/generic/malloc.c (modified) (view diffs)
• uspace/lib/c/generic/mman.c (modified) (view diffs)
• uspace/lib/c/generic/str.c (modified) (view diffs)
• uspace/lib/c/generic/thread.c (modified) (view diffs)
• uspace/lib/c/include/as.h (modified) (view diffs)
• uspace/lib/c/include/device/ahci.h (added)
• uspace/lib/c/include/devman.h (modified) (view diffs)
• uspace/lib/c/include/fibril.h (modified) (view diffs)
• uspace/lib/c/include/ipc/dev_iface.h (modified) (view diffs)
• uspace/lib/c/include/ipc/devman.h (modified) (view diffs)
• uspace/lib/c/include/ipc/loc.h (modified) (view diffs)
• uspace/lib/c/include/loc.h (modified) (view diffs)
• uspace/lib/c/include/str.h (modified) (view diffs)
• uspace/lib/c/include/sys/mman.h (modified) (view diffs)
• uspace/lib/clui/tinput.c (modified) (view diffs)
• uspace/lib/drv/Makefile (modified) (view diffs)
• uspace/lib/drv/generic/dev_iface.c (modified) (view diffs)
• uspace/lib/drv/generic/remote_ahci.c (added)
• uspace/lib/drv/generic/remote_usb.c (modified) (view diffs)
• uspace/lib/drv/generic/remote_usbhc.c (modified) (view diffs)
• uspace/lib/drv/include/ahci_iface.h (added)
• uspace/lib/drv/include/remote_ahci.h (added)
• uspace/lib/fb/imgmap.c (modified) (view diffs)
• uspace/lib/fb/screenbuffer.c (modified) (view diffs)
• uspace/lib/fs/libfs.c (modified) (view diffs)
• uspace/lib/usbdev/include/usb/dev/usb_device_connection.h (modified) (view diffs)
• uspace/lib/usbdev/src/devdrv.c (modified) (view diffs)
• uspace/lib/usbdev/src/pipes.c (modified) (view diffs)
• uspace/lib/usbdev/src/pipesinit.c (modified) (view diffs)
• uspace/lib/usbdev/src/request.c (modified) (view diffs)
• uspace/lib/usbhid/include/usb/hid/hid_report_items.h (modified) (view diffs)
• uspace/lib/usbhid/include/usb/hid/hidpath.h (modified) (view diffs)
• uspace/lib/usbhid/include/usb/hid/hidtypes.h (modified) (view diffs)
• uspace/lib/usbhid/include/usb/hid/request.h (modified) (view diffs)
• uspace/lib/usbhid/src/hiddescriptor.c (modified) (view diffs)
• uspace/lib/usbhid/src/hidparser.c (modified) (view diffs)
• uspace/lib/usbhid/src/hidpath.c (modified) (view diffs)
• uspace/lib/usbhid/src/hidreport.c (modified) (view diffs)
• uspace/lib/usbhid/src/hidreq.c (modified) (view diffs)
• uspace/lib/usbhost/src/endpoint.c (modified) (view diffs)
• uspace/lib/usbhost/src/usb_device_manager.c (modified) (view diffs)
• uspace/lib/usbhost/src/usb_endpoint_manager.c (modified) (view diffs)
• uspace/lib/usbhost/src/usb_transfer_batch.c (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
• uspace/srv/bd/file_bd/file_bd.c (modified) (view diffs)
• uspace/srv/bd/gxe_bd/gxe_bd.c (modified) (view diffs)
• uspace/srv/bd/part/guid_part/guid_part.c (modified) (view diffs)
• uspace/srv/bd/part/mbr_part/mbr_part.c (modified) (view diffs)
• uspace/srv/bd/rd/rd.c (modified) (view diffs)
• uspace/srv/bd/sata_bd/Makefile (added)
• uspace/srv/bd/sata_bd/sata_bd.c (added)
• uspace/srv/bd/sata_bd/sata_bd.h (added)
• uspace/srv/devman/main.c (modified) (view diffs)
• uspace/srv/hid/console/console.c (modified) (view diffs)
• uspace/srv/hid/fb/fb.c (modified) (view diffs)
• uspace/srv/hid/input/port/ns16550.c (modified) (view diffs)
• uspace/srv/hid/input/port/pl050.c (modified) (view diffs)
• uspace/srv/hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
• uspace/srv/loader/Makefile (modified) (view diffs)
• uspace/srv/loader/interp.S (added)
• uspace/srv/loader/interp.s (deleted)
• uspace/srv/locsrv/locsrv.c (modified) (view diffs)
• uspace/srv/net/tcp/sock.c (modified) (view diffs)
• uspace/srv/net/udp/sock.c (modified) (view diffs)
• uspace/srv/net/udp/udp.c (modified) (view diffs)
• uspace/srv/net/udp/udp_type.h (modified) (view diffs)
• uspace/srv/vfs/vfs.c (modified) (view diffs)
• version (modified) (view diffs)