Viewing all changes in revision 745.
- Committer: Vojtech Horky
- Date: 2011-09-28 15:13:08 UTC
- mfrom: (538.1.714 helenos-mainline)
- Revision ID: vojtechhorky@users.sourceforge.net-20110928151308-2pz4s2w035n48o8a
Merge mainline changes
Conflicts fixed without problems (mostly caused by separating
ABI into /abi/).
Conflicts fixed without problems (mostly caused by separating
ABI into /abi/).
- files added:
- abi
- abi/include
- abi/include/ddi
- abi/include/fb
- abi/include/ipc
- abi/include/mm
- abi/include/proc
- uspace/app/bdsh/cmds/builtins/batch
- uspace/app/binutils
- uspace/app/binutils/bin
- uspace/app/binutils/redist
- uspace/app/cc
- uspace/app/ccom
- uspace/app/cpp
- uspace/app/devctl
- uspace/app/locinfo
- uspace/app/mkmfs
- uspace/app/pcc
- uspace/app/pcc/arch
- uspace/app/pcc/arch/amd64
- uspace/app/pcc/arch/arm
- uspace/app/pcc/arch/arm32
- uspace/app/pcc/arch/hppa
- uspace/app/pcc/arch/i386
- uspace/app/pcc/arch/ia32
- uspace/app/pcc/arch/m16c
- uspace/app/pcc/arch/mips
- uspace/app/pcc/arch/mips32
- uspace/app/pcc/arch/nova
- uspace/app/pcc/arch/pdp10
- uspace/app/pcc/arch/pdp11
- uspace/app/pcc/arch/powerpc
- uspace/app/pcc/arch/ppc32
- uspace/app/pcc/arch/sparc64
- uspace/app/pcc/arch/vax
- uspace/app/pcc/cc
- uspace/app/pcc/cc/cc
- uspace/app/pcc/cc/ccom
- uspace/app/pcc/cc/ccom/arch
- uspace/app/pcc/cc/ccom/arch/amd64
- uspace/app/pcc/cc/ccom/arch/arm32
- uspace/app/pcc/cc/ccom/arch/ia32
- uspace/app/pcc/cc/ccom/arch/mips32
- uspace/app/pcc/cc/ccom/arch/ppc32
- uspace/app/pcc/cc/ccom/mkext
- uspace/app/pcc/cc/cpp
- uspace/app/pcc/cc/cpp/config.h
- uspace/app/pcc/cc/cpp/tests
- uspace/app/pcc/f77
- uspace/app/pcc/f77/f77
- uspace/app/pcc/f77/fcom
- uspace/app/pcc/mip
- uspace/app/pcc/mip/config.h
- uspace/app/pcc/os
- uspace/app/pcc/os/bsd
- uspace/app/pcc/os/darwin
- uspace/app/pcc/os/dragonfly
- uspace/app/pcc/os/freebsd
- uspace/app/pcc/os/helenos
- uspace/app/pcc/os/linux
- uspace/app/pcc/os/midnightbsd
- uspace/app/pcc/os/mirbsd
- uspace/app/pcc/os/netbsd
- uspace/app/pcc/os/nextstep
- uspace/app/pcc/os/none
- uspace/app/pcc/os/openbsd
- uspace/app/pcc/os/sunos
- uspace/app/pcc/os/win32
- uspace/app/sportdmp
- uspace/dist/inc
- uspace/dist/src/c
- uspace/dist/src/c/demos
- uspace/dist/src/c/demos/edit
- uspace/dist/src/c/demos/hello
- uspace/dist/src/c/demos/tetris
- uspace/dist/src/c/demos/top
- uspace/lib/c/arch/abs32le/include/barrier.h
- uspace/lib/c/arch/abs32le/include/context_offset.h
- uspace/lib/c/arch/abs32le/include/elf.h
- uspace/lib/c/arch/amd64/include/barrier.h
- uspace/lib/c/arch/amd64/include/context_offset.h
- uspace/lib/c/arch/amd64/include/elf.h
- uspace/lib/c/arch/arm32/include/barrier.h
- uspace/lib/c/arch/arm32/include/elf.h
- uspace/lib/c/arch/arm32/include/regutils.h
- uspace/lib/c/arch/ia32/include/barrier.h
- uspace/lib/c/arch/ia32/include/context_offset.h
- uspace/lib/c/arch/ia32/include/elf.h
- uspace/lib/c/arch/ia32/include/istate.h
- uspace/lib/c/arch/ia64/include/barrier.h
- uspace/lib/c/arch/ia64/include/elf.h
- uspace/lib/c/arch/ia64/include/register.h
- uspace/lib/c/arch/mips32/include/barrier.h
- uspace/lib/c/arch/mips32/include/context_offset.h
- uspace/lib/c/arch/mips32/include/cp0.h
- uspace/lib/c/arch/mips32/include/elf.h
- uspace/lib/c/arch/mips32/include/regname.h
- uspace/lib/c/arch/mips32eb/include/barrier.h
- uspace/lib/c/arch/mips32eb/include/context_offset.h
- uspace/lib/c/arch/mips32eb/include/cp0.h
- uspace/lib/c/arch/mips32eb/include/elf.h
- uspace/lib/c/arch/mips32eb/include/elf_linux.h
- uspace/lib/c/arch/mips32eb/include/regname.h
- uspace/lib/c/arch/mips64/include/barrier.h
- uspace/lib/c/arch/mips64/include/context_offset.h
- uspace/lib/c/arch/mips64/include/cp0.h
- uspace/lib/c/arch/mips64/include/elf.h
- uspace/lib/c/arch/mips64/include/regname.h
- uspace/lib/c/arch/ppc32/include/barrier.h
- uspace/lib/c/arch/ppc32/include/context_offset.h
- uspace/lib/c/arch/ppc32/include/elf.h
- uspace/lib/c/arch/ppc32/include/msr.h
- uspace/lib/c/arch/sparc64/include/barrier.h
- uspace/lib/c/arch/sparc64/include/context_offset.h
- uspace/lib/c/arch/sparc64/include/elf.h
- uspace/lib/c/arch/sparc64/include/regdef.h
- uspace/lib/c/generic/elf
- uspace/lib/c/include/elf
- uspace/lib/fb
- uspace/lib/fmtutil
- uspace/lib/minix
- uspace/lib/posix
- uspace/lib/posix/internal
- uspace/lib/posix/stdio
- uspace/lib/posix/stdlib
- uspace/lib/posix/sys
- uspace/srv/fs/cdfs
- uspace/srv/fs/exfat
- uspace/srv/fs/mfs
- uspace/srv/hid/fb/ctl
- uspace/srv/hid/fb/gfx
- uspace/srv/hid/fb/port
- uspace/srv/hid/fb/proto
- files removed:
- kernel/arch/arm32/include/mainpage.h
- uspace/app/tester/devs
- uspace/lib/c/generic/rtld/elf_load.c
- uspace/srv/loader/include
- files renamed:
- kernel/generic/include/ddi/ddi_arg.h => abi/include/ddi/arg.h
- kernel/generic/include/lib/elf.h => abi/include/elf.h
- kernel/generic/include/errno.h => abi/include/errno.h
- kernel/genarch/include/fb/visuals.h => abi/include/fb/visuals.h
- kernel/generic/include/ipc/event_types.h => abi/include/ipc/event.h
- kernel/generic/include/ipc/ipc_methods.h => abi/include/ipc/methods.h
- kernel/generic/include/proc/uarg.h => abi/include/proc/uarg.h
- kernel/generic/include/synch/synch.h => abi/include/synch.h
- kernel/generic/include/sysinfo/abi.h => abi/include/sysinfo.h
- kernel/generic/include/udebug/udebug.h => abi/include/udebug.h
- uspace/dist/dev/ => uspace/dist/loc/
- uspace/dist/readme => uspace/dist/textdemo
- uspace/drv/bus/usb/ohci/batch.c => uspace/drv/bus/usb/ohci/ohci_batch.c
- uspace/drv/bus/usb/ohci/batch.h => uspace/drv/bus/usb/ohci/ohci_batch.h
- uspace/drv/bus/usb/ohci/hcd_endpoint.c => uspace/drv/bus/usb/ohci/ohci_endpoint.c
- uspace/drv/bus/usb/ohci/hcd_endpoint.h => uspace/drv/bus/usb/ohci/ohci_endpoint.h
- uspace/drv/bus/usb/uhci/batch.c => uspace/drv/bus/usb/uhci/uhci_batch.c
- uspace/drv/bus/usb/uhci/batch.h => uspace/drv/bus/usb/uhci/uhci_batch.h
- uspace/drv/bus/usb/usbhub/ports.c => uspace/drv/bus/usb/usbhub/port.c
- uspace/drv/bus/usb/usbhub/ports.h => uspace/drv/bus/usb/usbhub/port.h
- uspace/drv/bus/usb/usbhub/port_status.h => uspace/drv/bus/usb/usbhub/status.h
- uspace/drv/bus/usb/usbmast/mast.c => uspace/drv/bus/usb/usbmast/bo_trans.c
- uspace/drv/bus/usb/usbmast/mast.h => uspace/drv/bus/usb/usbmast/bo_trans.h
- uspace/drv/bus/usb/usbmast/cmds.c => uspace/drv/bus/usb/usbmast/cmdw.c
- uspace/drv/bus/usb/usbmast/cmds.h => uspace/drv/bus/usb/usbmast/cmdw.h
- uspace/lib/c/arch/ia32/src/entry.s => uspace/lib/c/arch/ia32/src/entry.S
- uspace/srv/loader/elf_load.c => uspace/lib/c/generic/elf/elf_load.c
- uspace/lib/c/generic/devmap.c => uspace/lib/c/generic/loc.c
- uspace/app/taskdump/include/elf.h => uspace/lib/c/include/elf/elf.h
- uspace/srv/loader/include/elf_load.h => uspace/lib/c/include/elf/elf_load.h
- uspace/lib/c/include/ipc/devmap.h => uspace/lib/c/include/ipc/loc.h
- uspace/lib/c/include/devmap.h => uspace/lib/c/include/loc.h
- uspace/lib/usbhost/include/usb/host/device_keeper.h => uspace/lib/usbhost/include/usb/host/usb_device_manager.h
- uspace/lib/usbhost/include/usb/host/batch.h => uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h
- uspace/lib/usbhost/src/device_keeper.c => uspace/lib/usbhost/src/usb_device_manager.c
- uspace/lib/usbhost/src/batch.c => uspace/lib/usbhost/src/usb_transfer_batch.c
- uspace/srv/fs/devfs/ => uspace/srv/fs/locfs/
- uspace/srv/fs/devfs/devfs.c => uspace/srv/fs/locfs/locfs.c
- uspace/srv/fs/devfs/devfs.h => uspace/srv/fs/locfs/locfs.h
- uspace/srv/fs/devfs/devfs_ops.c => uspace/srv/fs/locfs/locfs_ops.c
- uspace/srv/fs/devfs/devfs_ops.h => uspace/srv/fs/locfs/locfs_ops.h
- uspace/srv/devmap/ => uspace/srv/loc/
- uspace/srv/devmap/devmap.c => uspace/srv/loc/loc.c
- files modified:
- HelenOS.config
- uspace/lib/c/arch/abs32le/include/istate.h
- uspace/lib/c/arch/amd64/include/istate.h
- uspace/lib/c/arch/arm32/include/istate.h
- uspace/lib/c/arch/ia64/include/istate.h
- uspace/lib/c/arch/mips32/include/istate.h
- uspace/lib/c/arch/mips64/include/istate.h
- uspace/lib/c/arch/ppc32/include/istate.h
- uspace/lib/c/arch/sparc64/include/istate.h
expand all
collapse all
added
removed
