Changeset aec2ad4 in mainline

Timestamp:

2011-02-04T11:48:33Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

103a3626

Parents:

ba5ab09 (diff), 3597dab (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 from usb/development

Files:

• .bzrignore (modified) (view diffs)
• boot/arch/amd64/Makefile.inc (modified) (view diffs)
• kernel/generic/include/debug.h (modified) (view diffs)
• kernel/generic/include/ipc/ipc.h (modified) (view diffs)
• kernel/generic/include/proc/thread.h (modified) (view diffs)
• kernel/generic/src/console/cmd.c (modified) (view diffs)
• kernel/generic/src/ipc/ipc.c (modified) (view diffs)
• kernel/generic/src/ipc/sysipc.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/synch/waitq.c (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/app/stats/stats.c (modified) (view diffs)
• uspace/app/tasks/Makefile (deleted)
• uspace/app/tasks/tasks.c (deleted)
• uspace/app/top/screen.c (modified) (view diffs)
• uspace/app/usbinfo/dump.c (modified) (view diffs)
• uspace/app/usbinfo/info.c (modified) (view diffs)
• uspace/app/usbinfo/main.c (modified) (view diffs)
• uspace/app/usbinfo/usbinfo.h (modified) (view diffs)
• uspace/doc/doxygroups.h (modified) (view diffs)
• uspace/drv/uhci/Makefile (modified) (view diffs)
• uspace/drv/uhci/main.c (modified) (view diffs)
• uspace/drv/uhci/pci.c (added)
• uspace/drv/uhci/uhci.h (modified) (view diffs)
• uspace/drv/usbhid/Makefile (moved) (moved from uspace/drv/usbkbd/Makefile ) (view diffs)
• uspace/drv/usbhid/conv.c (added)
• uspace/drv/usbhid/conv.h (added)
• uspace/drv/usbhid/descdump.c (moved) (moved from uspace/drv/usbkbd/descdump.c ) (view diffs)
• uspace/drv/usbhid/descdump.h (moved) (moved from uspace/drv/usbkbd/descdump.h ) (view diffs)
• uspace/drv/usbhid/descparser.c (moved) (moved from uspace/drv/usbkbd/descparser.c ) (view diffs)
• uspace/drv/usbhid/descparser.h (moved) (moved from uspace/drv/usbkbd/descparser.h ) (view diffs)
• uspace/drv/usbhid/hid.h (added)
• uspace/drv/usbhid/kbd.h (added)
• uspace/drv/usbhid/layout.h (moved) (moved from uspace/drv/vhc/debug.c ) (view diffs)
• uspace/drv/usbhid/main.c (moved) (moved from uspace/drv/usbkbd/main.c ) (view diffs)
• uspace/drv/usbhid/usbhid.ma (moved) (moved from uspace/drv/usbkbd/usbkbd.ma ) (view diffs)
• uspace/drv/vhc/Makefile (modified) (view diffs)
• uspace/drv/vhc/conndev.c (modified) (view diffs)
• uspace/drv/vhc/connhost.c (modified) (view diffs)
• uspace/drv/vhc/devices.c (modified) (view diffs)
• uspace/drv/vhc/hc.c (modified) (view diffs)
• uspace/drv/vhc/hcd.c (modified) (view diffs)
• uspace/drv/vhc/hub.c (modified) (view diffs)
• uspace/drv/vhc/vhcd.h (modified) (view diffs)
• uspace/lib/c/generic/async.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/ipc.c (modified) (view diffs)
• uspace/lib/c/generic/net/modules.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/ipc/ipc.h (modified) (view diffs)
• uspace/lib/drv/generic/remote_usbhc.c (modified) (view diffs)
• uspace/lib/drv/include/usbhc_iface.h (modified) (view diffs)
• uspace/lib/fs/libfs.c (modified) (view diffs)
• uspace/lib/net/il/il_skel.c (modified) (view diffs)
• uspace/lib/net/nil/nil_skel.c (modified) (view diffs)
• uspace/lib/net/tl/tl_skel.c (modified) (view diffs)
• uspace/lib/usb/Makefile (modified) (view diffs)
• uspace/lib/usb/include/usb/classes/hid.h (modified) (view diffs)
• uspace/lib/usb/include/usb/debug.h (modified) (view diffs)
• uspace/lib/usb/include/usb/pipes.h (added)
• uspace/lib/usb/include/usb/request.h (added)
• uspace/lib/usb/include/usb/usb.h (modified) (view diffs)
• uspace/lib/usb/include/usb/usbdrv.h (modified) (view diffs)
• uspace/lib/usb/src/debug.c (modified) (view diffs)
• uspace/lib/usb/src/hidparser.c (modified) (view diffs)
• uspace/lib/usb/src/pipes.c (added)
• uspace/lib/usb/src/request.c (added)
• uspace/lib/usb/src/usbdrv.c (modified) (view diffs)
• uspace/lib/usbvirt/src/main.c (modified) (view diffs)
• uspace/srv/clip/clip.c (modified) (view diffs)
• uspace/srv/devman/main.c (modified) (view diffs)
• uspace/srv/devmap/devmap.c (modified) (view diffs)
• uspace/srv/hid/adb_mouse/adb_dev.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/fb/main.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/hw/irc/apic/apic.c (modified) (view diffs)
• uspace/srv/hw/irc/fhc/fhc.c (modified) (view diffs)
• uspace/srv/hw/irc/i8259/i8259.c (modified) (view diffs)
• uspace/srv/hw/irc/obio/obio.c (modified) (view diffs)
• uspace/srv/hw/netif/ne2000/ne2000.c (modified) (view diffs)
• uspace/srv/loader/main.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/vfs/vfs.c (modified) (view diffs)
• uspace/srv/vfs/vfs.h (modified) (view diffs)
• uspace/srv/vfs/vfs_file.c (modified) (view diffs)
• uspace/srv/vfs/vfs_ops.c (modified) (view diffs)