Changeset 4a7a8d4 in mainline

Timestamp:

2011-05-13T10:31:54Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

aca3489

Parents:

05e21ffc (diff), c372e03 (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

Location:

uspace

Files:

• Makefile (modified) (view diffs)
• Makefile.common (modified) (view diffs)
• app/lsusb/Makefile (modified) (view diffs)
• app/lsusb/main.c (modified) (view diffs)
• app/tester/Makefile (modified) (view diffs)
• app/tester/adt/usbaddrkeep.def (deleted)
• app/tester/tester.c (modified) (view diffs)
• app/tester/tester.h (modified) (view diffs)
• app/usbinfo/Makefile (modified) (view diffs)
• app/usbinfo/dev.c (modified) (view diffs)
• app/usbinfo/info.c (modified) (view diffs)
• app/usbinfo/main.c (modified) (view diffs)
• app/usbinfo/usbinfo.h (modified) (view diffs)
• app/vuhid/Makefile (modified) (view diffs)
• drv/ehci-hcd/Makefile (modified) (view diffs)
• drv/ehci-hcd/hc_iface.c (modified) (view diffs)
• drv/ehci-hcd/pci.c (modified) (view diffs)
• drv/ohci/Makefile (modified) (view diffs)
• drv/ohci/hc.c (modified) (view diffs)
• drv/ohci/hc.h (modified) (view diffs)
• drv/ohci/hw_struct/endpoint_descriptor.h (modified) (view diffs)
• drv/ohci/hw_struct/transfer_descriptor.c (modified) (view diffs)
• drv/ohci/hw_struct/transfer_descriptor.h (modified) (view diffs)
• drv/ohci/iface.c (modified) (view diffs)
• drv/ohci/main.c (modified) (view diffs)
• drv/ohci/ohci.c (modified) (view diffs)
• drv/ohci/ohci.h (modified) (view diffs)
• drv/ohci/pci.c (modified) (view diffs)
• drv/ohci/root_hub.c (modified) (view diffs)
• drv/uhci-hcd/Makefile (modified) (view diffs)
• drv/uhci-hcd/hc.c (modified) (view diffs)
• drv/uhci-hcd/hc.h (modified) (view diffs)
• drv/uhci-hcd/hw_struct/queue_head.h (modified) (view diffs)
• drv/uhci-hcd/hw_struct/transfer_descriptor.c (modified) (view diffs)
• drv/uhci-hcd/iface.c (modified) (view diffs)
• drv/uhci-hcd/main.c (modified) (view diffs)
• drv/uhci-hcd/uhci.c (modified) (view diffs)
• drv/uhci-hcd/uhci.h (modified) (view diffs)
• drv/uhci-rhd/Makefile (modified) (view diffs)
• drv/uhci-rhd/port.c (modified) (view diffs)
• drv/usbflbk/Makefile (modified) (view diffs)
• drv/usbhid/Makefile (modified) (view diffs)
• drv/usbhub/Makefile (modified) (view diffs)
• drv/usbkbd/Makefile (modified) (view diffs)
• drv/usbmast/Makefile (modified) (view diffs)
• drv/usbmast/inquiry.c (added)
• drv/usbmast/main.c (modified) (view diffs)
• drv/usbmast/mast.c (modified) (view diffs)
• drv/usbmast/mast.h (modified) (view diffs)
• drv/usbmid/Makefile (modified) (view diffs)
• drv/usbmouse/Makefile (modified) (view diffs)
• drv/vhc/Makefile (modified) (view diffs)
• drv/vhc/connhost.c (modified) (view diffs)
• lib/drv/generic/remote_usbhc.c (modified) (view diffs)
• lib/drv/include/usb_iface.h (modified) (view diffs)
• lib/drv/include/usbhc_iface.h (modified) (view diffs)
• lib/usb/Makefile (modified) (view diffs)
• lib/usb/include/usb/ddfiface.h (modified) (view diffs)
• lib/usb/include/usb/descriptor.h (modified) (view diffs)
• lib/usb/include/usb/driver.h (added)
• lib/usb/src/ddfiface.c (modified) (view diffs)
• lib/usb/src/driver.c (moved) (moved from uspace/app/tester/adt/usbaddrkeep.c ) (view diffs)
• lib/usb/src/dump.c (modified) (view diffs)
• lib/usbdev/Makefile (added)
• lib/usbdev/include/usb/devdrv.h (moved) (moved from uspace/lib/usb/include/usb/devdrv.h ) (view diffs)
• lib/usbdev/include/usb/devpoll.h (moved) (moved from uspace/lib/usb/include/usb/devpoll.h ) (view diffs)
• lib/usbdev/include/usb/dp.h (moved) (moved from uspace/lib/usb/include/usb/dp.h ) (view diffs)
• lib/usbdev/include/usb/hub.h (moved) (moved from uspace/lib/usb/include/usb/hub.h ) (view diffs)
• lib/usbdev/include/usb/pipes.h (moved) (moved from uspace/lib/usb/include/usb/pipes.h ) (view diffs)
• lib/usbdev/include/usb/recognise.h (moved) (moved from uspace/lib/usb/include/usb/recognise.h ) (view diffs)
• lib/usbdev/include/usb/request.h (moved) (moved from uspace/lib/usb/include/usb/request.h ) (view diffs)
• lib/usbdev/include/usb/usbdevice.h (moved) (moved from uspace/lib/usb/include/usb/usbdevice.h ) (view diffs)
• lib/usbdev/src/altiface.c (moved) (moved from uspace/lib/usb/src/altiface.c ) (view diffs)
• lib/usbdev/src/devdrv.c (moved) (moved from uspace/lib/usb/src/devdrv.c ) (view diffs)
• lib/usbdev/src/devpoll.c (moved) (moved from uspace/lib/usb/src/devpoll.c ) (view diffs)
• lib/usbdev/src/dp.c (moved) (moved from uspace/lib/usb/src/dp.c ) (view diffs)
• lib/usbdev/src/hub.c (moved) (moved from uspace/lib/usb/src/hub.c ) (view diffs)
• lib/usbdev/src/pipepriv.c (moved) (moved from uspace/lib/usb/src/pipepriv.c ) (view diffs)
• lib/usbdev/src/pipepriv.h (moved) (moved from uspace/lib/usb/src/pipepriv.h ) (view diffs)
• lib/usbdev/src/pipes.c (moved) (moved from uspace/lib/usb/src/pipes.c ) (view diffs)
• lib/usbdev/src/pipesinit.c (moved) (moved from uspace/lib/usb/src/pipesinit.c ) (view diffs)
• lib/usbdev/src/pipesio.c (moved) (moved from uspace/lib/usb/src/pipesio.c ) (view diffs)
• lib/usbdev/src/recognise.c (moved) (moved from uspace/lib/usb/src/recognise.c ) (view diffs)
• lib/usbdev/src/request.c (moved) (moved from uspace/lib/usb/src/request.c ) (view diffs)
• lib/usbdev/src/usbdevice.c (moved) (moved from uspace/lib/usb/src/usbdevice.c ) (view diffs)
• lib/usbhid/Makefile (added)
• lib/usbhid/include/usb/classes/hid.h (moved) (moved from uspace/lib/usb/include/usb/classes/hid.h ) (view diffs)
• lib/usbhid/include/usb/classes/hid/iface.h (moved) (moved from uspace/lib/usb/include/usb/classes/hid/iface.h ) (view diffs)
• lib/usbhid/include/usb/classes/hid/utled.h (moved) (moved from uspace/lib/usb/include/usb/classes/hid/utled.h ) (view diffs)
• lib/usbhid/include/usb/classes/hid_report_items.h (moved) (moved from uspace/lib/usb/include/usb/classes/hid_report_items.h ) (view diffs)
• lib/usbhid/include/usb/classes/hiddescriptor.h (moved) (moved from uspace/lib/usb/include/usb/classes/hiddescriptor.h ) (view diffs)
• lib/usbhid/include/usb/classes/hidparser.h (moved) (moved from uspace/lib/usb/include/usb/classes/hidparser.h ) (view diffs)
• lib/usbhid/include/usb/classes/hidpath.h (moved) (moved from uspace/lib/usb/include/usb/classes/hidpath.h ) (view diffs)
• lib/usbhid/include/usb/classes/hidreport.h (moved) (moved from uspace/lib/usb/include/usb/classes/hidreport.h ) (view diffs)
• lib/usbhid/include/usb/classes/hidreq.h (moved) (moved from uspace/lib/usb/include/usb/classes/hidreq.h ) (view diffs)
• lib/usbhid/include/usb/classes/hidtypes.h (moved) (moved from uspace/lib/usb/include/usb/classes/hidtypes.h ) (view diffs)
• lib/usbhid/include/usb/classes/hidut.h (moved) (moved from uspace/lib/usb/include/usb/classes/hidut.h ) (view diffs)
• lib/usbhid/include/usb/classes/hidutkbd.h (moved) (moved from uspace/lib/usb/include/usb/classes/hidutkbd.h ) (view diffs)
• lib/usbhid/src/hiddescriptor.c (moved) (moved from uspace/lib/usb/src/hiddescriptor.c ) (view diffs)
• lib/usbhid/src/hidiface.c (moved) (moved from uspace/lib/usb/src/hidiface.c ) (view diffs)
• lib/usbhid/src/hidparser.c (moved) (moved from uspace/lib/usb/src/hidparser.c ) (view diffs)
• lib/usbhid/src/hidpath.c (moved) (moved from uspace/lib/usb/src/hidpath.c ) (view diffs)
• lib/usbhid/src/hidreport.c (moved) (moved from uspace/lib/usb/src/hidreport.c ) (view diffs)
• lib/usbhid/src/hidreq.c (moved) (moved from uspace/lib/usb/src/hidreq.c ) (view diffs)
• lib/usbhost/Makefile (added)
• lib/usbhost/include/usb/addrkeep.h (moved) (moved from uspace/lib/usb/include/usb/addrkeep.h ) (view diffs)
• lib/usbhost/include/usb/host/batch.h (moved) (moved from uspace/lib/usb/include/usb/host/batch.h ) (view diffs)
• lib/usbhost/include/usb/host/device_keeper.h (moved) (moved from uspace/lib/usb/include/usb/host/device_keeper.h ) (view diffs)
• lib/usbhost/include/usb/host/endpoint.h (moved) (moved from uspace/lib/usb/include/usb/host/endpoint.h ) (view diffs)
• lib/usbhost/include/usb/host/usb_endpoint_manager.h (moved) (moved from uspace/lib/usb/include/usb/host/usb_endpoint_manager.h ) (view diffs)
• lib/usbhost/src/addrkeep.c (moved) (moved from uspace/lib/usb/src/addrkeep.c ) (view diffs)
• lib/usbhost/src/batch.c (moved) (moved from uspace/lib/usb/src/host/batch.c ) (view diffs)
• lib/usbhost/src/device_keeper.c (moved) (moved from uspace/lib/usb/src/host/device_keeper.c ) (view diffs)
• lib/usbhost/src/endpoint.c (moved) (moved from uspace/lib/usb/src/host/endpoint.c ) (view diffs)
• lib/usbhost/src/usb_endpoint_manager.c (moved) (moved from uspace/lib/usb/src/host/usb_endpoint_manager.c ) (view diffs)
• lib/usbvirt/Makefile (modified) (view diffs)