Changeset f2962621 in mainline

Timestamp:

2010-12-17T10:14:01Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6e5dc07

Parents:

9223dc5c (diff), 11658b64 (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 with usb/development

Files:

• boot/arch/ia64/include/types.h (modified) (view diffs)
• boot/arch/ppc32/include/types.h (modified) (view diffs)
• boot/arch/sparc64/include/types.h (modified) (view diffs)
• boot/genarch/include/ofw.h (modified) (view diffs)
• contrib/arch/hadlbppp.py (modified) (view diffs)
• contrib/arch/kernel/kernel.adl (modified) (view diffs)
• contrib/arch/uspace/srv/bd/bd.adl (modified) (view diffs)
• contrib/arch/uspace/srv/console/console.adl (modified) (view diffs)
• contrib/arch/uspace/srv/devmap/devmap.adl (modified) (view diffs)
• contrib/arch/uspace/srv/fb/fb.adl (modified) (view diffs)
• contrib/arch/uspace/srv/kbd/kbd.adl (modified) (view diffs)
• contrib/arch/uspace/srv/loader/loader.adl (modified) (view diffs)
• contrib/arch/uspace/srv/ns/ns.adl (modified) (view diffs)
• contrib/arch/uspace/srv/ns/service.adl (modified) (view diffs)
• contrib/arch/uspace/srv/vfs/vfs.adl (modified) (view diffs)
• contrib/highlight/adl.syntax (modified) (view diffs)
• kernel/arch/abs32le/include/types.h (modified) (view diffs)
• kernel/arch/abs32le/src/abs32le.c (modified) (view diffs)
• kernel/arch/amd64/include/asm.h (modified) (view diffs)
• kernel/arch/amd64/include/proc/thread.h (modified) (view diffs)
• kernel/arch/amd64/include/types.h (modified) (view diffs)
• kernel/arch/amd64/src/amd64.c (modified) (view diffs)
• kernel/arch/amd64/src/debugger.c (modified) (view diffs)
• kernel/arch/arm32/include/types.h (modified) (view diffs)
• kernel/arch/arm32/src/mach/testarm/testarm.c (modified) (view diffs)
• kernel/arch/ia32/include/asm.h (modified) (view diffs)
• kernel/arch/ia32/include/proc/thread.h (modified) (view diffs)
• kernel/arch/ia32/include/types.h (modified) (view diffs)
• kernel/arch/ia32/src/ia32.c (modified) (view diffs)
• kernel/arch/ia64/include/bootinfo.h (modified) (view diffs)
• kernel/arch/ia64/include/types.h (modified) (view diffs)
• kernel/arch/ia64/src/ia64.c (modified) (view diffs)
• kernel/arch/mips32/include/debugger.h (modified) (view diffs)
• kernel/arch/mips32/include/fpu_context.h (modified) (view diffs)
• kernel/arch/mips32/include/types.h (modified) (view diffs)
• kernel/arch/mips32/src/debugger.c (modified) (view diffs)
• kernel/arch/mips32/src/mips32.c (modified) (view diffs)
• kernel/arch/ppc32/include/exception.h (modified) (view diffs)
• kernel/arch/ppc32/include/types.h (modified) (view diffs)
• kernel/arch/sparc64/include/mm/sun4u/tlb.h (modified) (view diffs)
• kernel/arch/sparc64/include/mm/sun4v/tlb.h (modified) (view diffs)
• kernel/arch/sparc64/include/types.h (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/src/acpi/acpi.c (modified) (view diffs)
• kernel/genarch/src/acpi/madt.c (modified) (view diffs)
• kernel/genarch/src/mm/page_ht.c (modified) (view diffs)
• kernel/generic/include/adt/hash_table.h (modified) (view diffs)
• kernel/generic/include/console/console.h (modified) (view diffs)
• kernel/generic/include/console/kconsole.h (modified) (view diffs)
• kernel/generic/include/ddi/ddi.h (modified) (view diffs)
• kernel/generic/include/ddi/device.h (modified) (view diffs)
• kernel/generic/include/ddi/irq.h (modified) (view diffs)
• kernel/generic/include/ipc/event.h (modified) (view diffs)
• kernel/generic/include/ipc/ipc.h (modified) (view diffs)
• kernel/generic/include/ipc/ipcrsc.h (modified) (view diffs)
• kernel/generic/include/ipc/irq.h (modified) (view diffs)
• kernel/generic/include/ipc/sysipc.h (modified) (view diffs)
• kernel/generic/include/mm/as.h (modified) (view diffs)
• kernel/generic/include/mm/frame.h (modified) (view diffs)
• kernel/generic/include/proc/program.h (modified) (view diffs)
• kernel/generic/include/proc/task.h (modified) (view diffs)
• kernel/generic/include/proc/thread.h (modified) (view diffs)
• kernel/generic/include/security/cap.h (modified) (view diffs)
• kernel/generic/include/synch/futex.h (modified) (view diffs)
• kernel/generic/include/synch/smc.h (modified) (view diffs)
• kernel/generic/include/syscall/sysarg64.h (deleted)
• kernel/generic/include/syscall/syscall.h (modified) (view diffs)
• kernel/generic/include/sysinfo/sysinfo.h (modified) (view diffs)
• kernel/generic/include/time/clock.h (modified) (view diffs)
• kernel/generic/include/typedefs.h (modified) (view diffs)
• kernel/generic/include/udebug/udebug.h (modified) (view diffs)
• kernel/generic/include/udebug/udebug_ops.h (modified) (view diffs)
• kernel/generic/src/adt/hash_table.c (modified) (view diffs)
• kernel/generic/src/console/cmd.c (modified) (view diffs)
• kernel/generic/src/console/console.c (modified) (view diffs)
• kernel/generic/src/console/kconsole.c (modified) (view diffs)
• kernel/generic/src/ddi/ddi.c (modified) (view diffs)
• kernel/generic/src/ddi/device.c (modified) (view diffs)
• kernel/generic/src/ddi/irq.c (modified) (view diffs)
• kernel/generic/src/interrupt/interrupt.c (modified) (view diffs)
• kernel/generic/src/ipc/event.c (modified) (view diffs)
• kernel/generic/src/ipc/ipc.c (modified) (view diffs)
• kernel/generic/src/ipc/ipcrsc.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/ipc/sysipc.c (modified) (view diffs)
• kernel/generic/src/lib/memstr.c (modified) (view diffs)
• kernel/generic/src/lib/rd.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/proc/program.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/security/cap.c (modified) (view diffs)
• kernel/generic/src/synch/futex.c (modified) (view diffs)
• kernel/generic/src/synch/smc.c (modified) (view diffs)
• kernel/generic/src/syscall/syscall.c (modified) (view diffs)
• kernel/generic/src/sysinfo/stats.c (modified) (view diffs)
• kernel/generic/src/sysinfo/sysinfo.c (modified) (view diffs)
• kernel/generic/src/time/clock.c (modified) (view diffs)
• kernel/generic/src/udebug/udebug.c (modified) (view diffs)
• kernel/generic/src/udebug/udebug_ipc.c (modified) (view diffs)
• kernel/generic/src/udebug/udebug_ops.c (modified) (view diffs)
• kernel/test/fpu/fpu1_ia64.c (modified) (view diffs)
• kernel/test/fpu/fpu1_x86.c (modified) (view diffs)
• kernel/test/fpu/mips2.c (modified) (view diffs)
• kernel/test/fpu/sse1.c (modified) (view diffs)
• kernel/test/mm/slab1.c (modified) (view diffs)
• kernel/test/print/print2.c (modified) (view diffs)
• uspace/app/edit/edit.c (modified) (view diffs)
• uspace/app/tester/hw/serial/serial1.c (modified) (view diffs)
• uspace/app/tester/ipc/register.c (modified) (view diffs)
• uspace/app/tetris/input.c (modified) (view diffs)
• uspace/app/tetris/screen.c (modified) (view diffs)
• uspace/app/tetris/screen.h (modified) (view diffs)
• uspace/app/top/input.c (modified) (view diffs)
• uspace/app/top/screen.c (modified) (view diffs)
• uspace/app/trace/ipcp.c (modified) (view diffs)
• uspace/app/trace/proto.c (modified) (view diffs)
• uspace/app/trace/trace.c (modified) (view diffs)
• uspace/app/virtusbkbd/Makefile (modified) (view diffs)
• uspace/app/virtusbkbd/stdreq.c (modified) (view diffs)
• uspace/app/virtusbkbd/stdreq.h (modified) (view diffs)
• uspace/app/virtusbkbd/virtusbkbd.c (modified) (view diffs)
• uspace/drv/ns8250/ns8250.c (modified) (view diffs)
• uspace/drv/usbhub/main.c (modified) (view diffs)
• uspace/drv/usbhub/usbhub_private.h (modified) (view diffs)
• uspace/drv/usbhub/utils.c (modified) (view diffs)
• uspace/drv/usbkbd/main.c (modified) (view diffs)
• uspace/drv/vhc/Makefile (modified) (view diffs)
• uspace/drv/vhc/conn.h (modified) (view diffs)
• uspace/drv/vhc/conndev.c (modified) (view diffs)
• uspace/drv/vhc/connhost.c (modified) (view diffs)
• uspace/drv/vhc/debug.c (modified) (view diffs)
• uspace/drv/vhc/devices.c (modified) (view diffs)
• uspace/drv/vhc/hc.c (modified) (view diffs)
• uspace/drv/vhc/hc.h (modified) (view diffs)
• uspace/drv/vhc/hcd.c (modified) (view diffs)
• uspace/drv/vhc/hub.c (modified) (view diffs)
• uspace/drv/vhc/hub.h (modified) (view diffs)
• uspace/drv/vhc/hub/hub.c (added)
• uspace/drv/vhc/hub/hub.h (added)
• uspace/drv/vhc/hub/virthub.c (added)
• uspace/drv/vhc/hub/virthub.h (moved) (moved from uspace/drv/vhc/hubintern.h ) (view diffs)
• uspace/drv/vhc/hub/virthubops.c (added)
• uspace/drv/vhc/hubops.c (deleted)
• uspace/drv/vhc/vhcd.h (modified) (view diffs)
• uspace/lib/block/libblock.c (modified) (view diffs)
• uspace/lib/c/arch/abs32le/include/inttypes.h (modified) (view diffs)
• uspace/lib/c/arch/amd64/include/inttypes.h (modified) (view diffs)
• uspace/lib/c/arch/arm32/include/inttypes.h (modified) (view diffs)
• uspace/lib/c/arch/ia32/include/inttypes.h (modified) (view diffs)
• uspace/lib/c/arch/ia64/include/inttypes.h (modified) (view diffs)
• uspace/lib/c/arch/mips32/include/inttypes.h (modified) (view diffs)
• uspace/lib/c/arch/ppc32/include/inttypes.h (modified) (view diffs)
• uspace/lib/c/arch/sparc64/include/inttypes.h (modified) (view diffs)
• uspace/lib/c/generic/async.c (modified) (view diffs)
• uspace/lib/c/generic/cap.c (modified) (view diffs)
• uspace/lib/c/generic/clipboard.c (modified) (view diffs)
• uspace/lib/c/generic/device/char.c (modified) (view diffs)
• uspace/lib/c/generic/device/hw_res.c (modified) (view diffs)
• uspace/lib/c/generic/devman.c (modified) (view diffs)
• uspace/lib/c/generic/devmap.c (modified) (view diffs)
• uspace/lib/c/generic/event.c (modified) (view diffs)
• uspace/lib/c/generic/io/console.c (modified) (view diffs)
• uspace/lib/c/generic/io/screenbuffer.c (modified) (view diffs)
• uspace/lib/c/generic/ipc.c (modified) (view diffs)
• uspace/lib/c/generic/loader.c (modified) (view diffs)
• uspace/lib/c/generic/net/icmp_api.c (modified) (view diffs)
• uspace/lib/c/generic/net/modules.c (modified) (view diffs)
• uspace/lib/c/generic/net/socket_client.c (modified) (view diffs)
• uspace/lib/c/generic/task.c (modified) (view diffs)
• uspace/lib/c/generic/udebug.c (modified) (view diffs)
• uspace/lib/c/generic/vfs/vfs.c (modified) (view diffs)
• uspace/lib/c/include/async.h (modified) (view diffs)
• uspace/lib/c/include/event.h (modified) (view diffs)
• uspace/lib/c/include/io/console.h (modified) (view diffs)
• uspace/lib/c/include/io/screenbuffer.h (modified) (view diffs)
• uspace/lib/c/include/ipc/devman.h (modified) (view diffs)
• uspace/lib/c/include/ipc/devmap.h (modified) (view diffs)
• uspace/lib/c/include/ipc/ip.h (modified) (view diffs)
• uspace/lib/c/include/ipc/ipc.h (modified) (view diffs)
• uspace/lib/c/include/ipc/net.h (modified) (view diffs)
• uspace/lib/c/include/ipc/socket.h (modified) (view diffs)
• uspace/lib/c/include/libc.h (modified) (view diffs)
• uspace/lib/c/include/net/modules.h (modified) (view diffs)
• uspace/lib/clui/tinput.c (modified) (view diffs)
• uspace/lib/clui/tinput.h (modified) (view diffs)
• uspace/lib/drv/generic/dev_iface.c (modified) (view diffs)
• uspace/lib/drv/generic/driver.c (modified) (view diffs)
• uspace/lib/drv/generic/remote_usbhc.c (modified) (view diffs)
• uspace/lib/drv/include/driver.h (modified) (view diffs)
• uspace/lib/fs/libfs.c (modified) (view diffs)
• uspace/lib/fs/libfs.h (modified) (view diffs)
• uspace/lib/net/generic/generic.c (modified) (view diffs)
• uspace/lib/net/generic/packet_remote.c (modified) (view diffs)
• uspace/lib/net/il/arp_remote.c (modified) (view diffs)
• uspace/lib/net/il/ip_remote.c (modified) (view diffs)
• uspace/lib/net/netif/netif_local.c (modified) (view diffs)
• uspace/lib/net/netif/netif_remote.c (modified) (view diffs)
• uspace/lib/net/tl/icmp_remote.c (modified) (view diffs)
• uspace/lib/packet/generic/packet_server.c (modified) (view diffs)
• uspace/lib/usb/include/usb/classes/hid.h (modified) (view diffs)
• uspace/lib/usb/include/usb/usb.h (modified) (view diffs)
• uspace/lib/usb/src/usbdrv.c (modified) (view diffs)
• uspace/lib/usbvirt/Makefile (modified) (view diffs)
• uspace/lib/usbvirt/ctrlpipe.c (deleted)
• uspace/lib/usbvirt/include/usbvirt/device.h (moved) (moved from uspace/lib/usbvirt/device.h ) (view diffs)
• uspace/lib/usbvirt/include/usbvirt/hub.h (moved) (moved from uspace/lib/usbvirt/hub.h ) (view diffs)
• uspace/lib/usbvirt/src/callback.c (moved) (moved from uspace/lib/usbvirt/callback.c ) (view diffs)
• uspace/lib/usbvirt/src/ctrlpipe.c (added)
• uspace/lib/usbvirt/src/debug.c (moved) (moved from uspace/lib/usbvirt/debug.c ) (view diffs)
• uspace/lib/usbvirt/src/main.c (moved) (moved from uspace/lib/usbvirt/main.c ) (view diffs)
• uspace/lib/usbvirt/src/private.h (moved) (moved from uspace/lib/usbvirt/private.h ) (view diffs)
• uspace/lib/usbvirt/src/stdreq.c (moved) (moved from uspace/lib/usbvirt/stdreq.c ) (view diffs)
• uspace/lib/usbvirt/src/transaction.c (moved) (moved from uspace/lib/usbvirt/transaction.c ) (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/clip/clip.c (modified) (view diffs)
• uspace/srv/devman/devman.c (modified) (view diffs)
• uspace/srv/devman/devman.h (modified) (view diffs)
• uspace/srv/devman/main.c (modified) (view diffs)
• uspace/srv/devmap/devmap.c (modified) (view diffs)
• uspace/srv/fs/devfs/devfs.c (modified) (view diffs)
• uspace/srv/fs/devfs/devfs_ops.c (modified) (view diffs)
• uspace/srv/fs/fat/fat.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_ops.c (modified) (view diffs)
• uspace/srv/fs/tmpfs/tmpfs.c (modified) (view diffs)
• uspace/srv/hid/adb_mouse/adb_dev.c (modified) (view diffs)
• uspace/srv/hid/adb_mouse/adb_mouse.c (modified) (view diffs)
• uspace/srv/hid/char_mouse/char_mouse.c (modified) (view diffs)
• uspace/srv/hid/char_mouse/chardev.c (modified) (view diffs)
• uspace/srv/hid/console/console.c (modified) (view diffs)
• uspace/srv/hid/console/gcons.c (modified) (view diffs)
• uspace/srv/hid/fb/ega.c (modified) (view diffs)
• uspace/srv/hid/fb/fb.c (modified) (view diffs)
• uspace/srv/hid/fb/main.c (modified) (view diffs)
• uspace/srv/hid/fb/serial_console.c (modified) (view diffs)
• uspace/srv/hid/fb/serial_console.h (modified) (view diffs)
• uspace/srv/hid/kbd/generic/kbd.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/adb.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/chardev.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/ns16550.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/z8530.c (modified) (view diffs)
• uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• uspace/srv/hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
• uspace/srv/hw/char/i8042/i8042.c (modified) (view diffs)
• uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• uspace/srv/hw/cir/fhc/fhc.c (modified) (view diffs)
• uspace/srv/hw/cir/obio/obio.c (modified) (view diffs)
• uspace/srv/hw/netif/dp8390/dp8390_module.c (modified) (view diffs)
• uspace/srv/loader/main.c (modified) (view diffs)
• uspace/srv/net/il/arp/arp.c (modified) (view diffs)
• uspace/srv/net/il/arp/arp_module.c (modified) (view diffs)
• uspace/srv/net/il/ip/ip.c (modified) (view diffs)
• uspace/srv/net/il/ip/ip_module.c (modified) (view diffs)
• uspace/srv/net/net/net.c (modified) (view diffs)
• uspace/srv/net/netif/lo/lo.c (modified) (view diffs)
• uspace/srv/net/nil/eth/eth.c (modified) (view diffs)
• uspace/srv/net/nil/eth/eth_module.c (modified) (view diffs)
• uspace/srv/net/nil/nildummy/nildummy.c (modified) (view diffs)
• uspace/srv/net/nil/nildummy/nildummy_module.c (modified) (view diffs)
• uspace/srv/net/tl/icmp/icmp.c (modified) (view diffs)
• uspace/srv/net/tl/icmp/icmp_module.c (modified) (view diffs)
• uspace/srv/net/tl/tcp/tcp.c (modified) (view diffs)
• uspace/srv/net/tl/tcp/tcp_module.c (modified) (view diffs)
• uspace/srv/net/tl/udp/udp.c (modified) (view diffs)
• uspace/srv/net/tl/udp/udp_module.c (modified) (view diffs)
• uspace/srv/ns/clonable.c (modified) (view diffs)
• uspace/srv/ns/clonable.h (modified) (view diffs)
• uspace/srv/ns/ns.c (modified) (view diffs)
• uspace/srv/ns/service.c (modified) (view diffs)
• uspace/srv/ns/service.h (modified) (view diffs)
• uspace/srv/ns/task.c (modified) (view diffs)
• uspace/srv/vfs/vfs.c (modified) (view diffs)
• uspace/srv/vfs/vfs.h (modified) (view diffs)
• uspace/srv/vfs/vfs_lookup.c (modified) (view diffs)
• uspace/srv/vfs/vfs_node.c (modified) (view diffs)
• uspace/srv/vfs/vfs_ops.c (modified) (view diffs)
• uspace/srv/vfs/vfs_register.c (modified) (view diffs)