- Timestamp:
- 2016-07-22T08:24:47Z (9 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- f76d2c2
- Parents:
- 5b18137 (diff), 8351f9a4 (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. - Location:
- uspace
- Files:
-
- 24 added
- 25 deleted
- 141 edited
- 13 moved
-
Makefile (modified) (view diffs)
-
app/bdsh/cmds/modules/mount/mount.c (modified) (view diffs)
-
app/mkbd/main.c (modified) (view diffs)
-
app/usbinfo/Makefile (modified) (view diffs)
-
app/usbinfo/dev.c (deleted)
-
app/usbinfo/hid.c (modified) (view diffs)
-
app/usbinfo/info.c (modified) (view diffs)
-
app/usbinfo/list.c (modified) (view diffs)
-
app/usbinfo/main.c (modified) (view diffs)
-
app/usbinfo/usbinfo.h (modified) (view diffs)
-
app/vuhid/device.c (modified) (view diffs)
-
app/vuhid/hids/bootkbd.c (modified) (view diffs)
-
app/vuhid/main.c (modified) (view diffs)
-
app/vuhid/virthid.h (modified) (view diffs)
-
doc/doxygroups.h (modified) (view diffs)
-
drv/bus/usb/ehci/Makefile (modified) (view diffs)
-
drv/bus/usb/ehci/ehci_batch.c (added)
-
drv/bus/usb/ehci/ehci_batch.h (added)
-
drv/bus/usb/ehci/ehci_endpoint.c (added)
-
drv/bus/usb/ehci/ehci_endpoint.h (moved) (moved from uspace/drv/bus/usb/uhcirh/root_hub.h ) (view diffs)
-
drv/bus/usb/ehci/ehci_regs.h (added)
-
drv/bus/usb/ehci/ehci_rh.c (added)
-
drv/bus/usb/ehci/ehci_rh.h (moved) (moved from uspace/drv/bus/usb/uhci/root_hub.c ) (view diffs)
-
drv/bus/usb/ehci/endpoint_list.c (added)
-
drv/bus/usb/ehci/endpoint_list.h (added)
-
drv/bus/usb/ehci/hc.c (added)
-
drv/bus/usb/ehci/hc.h (added)
-
drv/bus/usb/ehci/hw_struct/fstn.h (moved) (moved from uspace/drv/bus/usb/uhci/uhci.h ) (view diffs)
-
drv/bus/usb/ehci/hw_struct/iso_transfer_descriptor.h (added)
-
drv/bus/usb/ehci/hw_struct/link_pointer.h (moved) (moved from uspace/lib/usb/include/usb/ddfiface.h ) (view diffs)
-
drv/bus/usb/ehci/hw_struct/mem_access.h (moved) (moved from uspace/drv/bus/usb/uhci/res.h ) (view diffs)
-
drv/bus/usb/ehci/hw_struct/queue_head.c (added)
-
drv/bus/usb/ehci/hw_struct/queue_head.h (added)
-
drv/bus/usb/ehci/hw_struct/split_iso_transfer_descriptor.h (added)
-
drv/bus/usb/ehci/hw_struct/transfer_descriptor.c (added)
-
drv/bus/usb/ehci/hw_struct/transfer_descriptor.h (added)
-
drv/bus/usb/ehci/main.c (modified) (view diffs)
-
drv/bus/usb/ehci/res.c (modified) (view diffs)
-
drv/bus/usb/ehci/res.h (modified) (view diffs)
-
drv/bus/usb/ohci/Makefile (modified) (view diffs)
-
drv/bus/usb/ohci/endpoint_list.c (modified) (view diffs)
-
drv/bus/usb/ohci/endpoint_list.h (modified) (view diffs)
-
drv/bus/usb/ohci/hc.c (modified) (view diffs)
-
drv/bus/usb/ohci/hc.h (modified) (view diffs)
-
drv/bus/usb/ohci/hw_struct/completion_codes.h (modified) (view diffs)
-
drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c (modified) (view diffs)
-
drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h (modified) (view diffs)
-
drv/bus/usb/ohci/hw_struct/hcca.h (modified) (view diffs)
-
drv/bus/usb/ohci/hw_struct/iso_transfer_descriptor.h (modified) (view diffs)
-
drv/bus/usb/ohci/hw_struct/mem_access.h (modified) (view diffs)
-
drv/bus/usb/ohci/hw_struct/transfer_descriptor.c (modified) (view diffs)
-
drv/bus/usb/ohci/hw_struct/transfer_descriptor.h (modified) (view diffs)
-
drv/bus/usb/ohci/main.c (modified) (view diffs)
-
drv/bus/usb/ohci/ohci.c (deleted)
-
drv/bus/usb/ohci/ohci.h (deleted)
-
drv/bus/usb/ohci/ohci_batch.c (modified) (view diffs)
-
drv/bus/usb/ohci/ohci_batch.h (modified) (view diffs)
-
drv/bus/usb/ohci/ohci_endpoint.c (modified) (view diffs)
-
drv/bus/usb/ohci/ohci_regs.h (modified) (view diffs)
-
drv/bus/usb/ohci/ohci_rh.c (added)
-
drv/bus/usb/ohci/ohci_rh.h (moved) (moved from uspace/drv/bus/usb/ohci/root_hub.h ) (view diffs)
-
drv/bus/usb/ohci/res.c (deleted)
-
drv/bus/usb/ohci/root_hub.c (deleted)
-
drv/bus/usb/uhci/Makefile (modified) (view diffs)
-
drv/bus/usb/uhci/hc.c (modified) (view diffs)
-
drv/bus/usb/uhci/hc.h (modified) (view diffs)
-
drv/bus/usb/uhci/hw_struct/link_pointer.h (modified) (view diffs)
-
drv/bus/usb/uhci/hw_struct/queue_head.h (modified) (view diffs)
-
drv/bus/usb/uhci/hw_struct/transfer_descriptor.c (modified) (view diffs)
-
drv/bus/usb/uhci/hw_struct/transfer_descriptor.h (modified) (view diffs)
-
drv/bus/usb/uhci/main.c (modified) (view diffs)
-
drv/bus/usb/uhci/res.c (deleted)
-
drv/bus/usb/uhci/transfer_list.c (modified) (view diffs)
-
drv/bus/usb/uhci/transfer_list.h (modified) (view diffs)
-
drv/bus/usb/uhci/uhci.c (deleted)
-
drv/bus/usb/uhci/uhci_batch.c (modified) (view diffs)
-
drv/bus/usb/uhci/uhci_batch.h (modified) (view diffs)
-
drv/bus/usb/uhci/uhci_rh.c (added)
-
drv/bus/usb/uhci/uhci_rh.h (moved) (moved from uspace/drv/bus/usb/uhci/root_hub.h ) (view diffs)
-
drv/bus/usb/uhci/utils/malloc32.h (deleted)
-
drv/bus/usb/uhcirh/Makefile (deleted)
-
drv/bus/usb/uhcirh/main.c (deleted)
-
drv/bus/usb/uhcirh/port.c (deleted)
-
drv/bus/usb/uhcirh/port.h (deleted)
-
drv/bus/usb/uhcirh/root_hub.c (deleted)
-
drv/bus/usb/uhcirh/uhcirh.ma (deleted)
-
drv/bus/usb/usbflbk/main.c (modified) (view diffs)
-
drv/bus/usb/usbhid/blink1/blink1.c (modified) (view diffs)
-
drv/bus/usb/usbhid/generic/hiddev.c (modified) (view diffs)
-
drv/bus/usb/usbhid/kbd/kbddev.c (modified) (view diffs)
-
drv/bus/usb/usbhid/main.c (modified) (view diffs)
-
drv/bus/usb/usbhid/mouse/mousedev.c (modified) (view diffs)
-
drv/bus/usb/usbhid/multimedia/multimedia.c (modified) (view diffs)
-
drv/bus/usb/usbhid/usbhid.c (modified) (view diffs)
-
drv/bus/usb/usbhid/usbhid.h (modified) (view diffs)
-
drv/bus/usb/usbhub/main.c (modified) (view diffs)
-
drv/bus/usb/usbhub/port.c (modified) (view diffs)
-
drv/bus/usb/usbhub/port.h (modified) (view diffs)
-
drv/bus/usb/usbhub/status.h (modified) (view diffs)
-
drv/bus/usb/usbhub/usbhub.c (modified) (view diffs)
-
drv/bus/usb/usbhub/usbhub.h (modified) (view diffs)
-
drv/bus/usb/usbmast/bo_trans.c (modified) (view diffs)
-
drv/bus/usb/usbmast/bo_trans.h (modified) (view diffs)
-
drv/bus/usb/usbmast/main.c (modified) (view diffs)
-
drv/bus/usb/usbmast/scsi_ms.c (modified) (view diffs)
-
drv/bus/usb/usbmast/usbmast.h (modified) (view diffs)
-
drv/bus/usb/usbmid/explore.c (modified) (view diffs)
-
drv/bus/usb/usbmid/main.c (modified) (view diffs)
-
drv/bus/usb/usbmid/usbmid.c (modified) (view diffs)
-
drv/bus/usb/usbmid/usbmid.h (modified) (view diffs)
-
drv/bus/usb/usbmid/usbmid.ma (modified) (view diffs)
-
drv/bus/usb/vhc/Makefile (modified) (view diffs)
-
drv/bus/usb/vhc/conn.h (deleted)
-
drv/bus/usb/vhc/conndev.c (modified) (view diffs)
-
drv/bus/usb/vhc/connhost.c (deleted)
-
drv/bus/usb/vhc/devconn.c (modified) (view diffs)
-
drv/bus/usb/vhc/hub.c (deleted)
-
drv/bus/usb/vhc/hub/virthub.c (modified) (view diffs)
-
drv/bus/usb/vhc/hub/virthub.h (modified) (view diffs)
-
drv/bus/usb/vhc/hub/virthubops.c (modified) (view diffs)
-
drv/bus/usb/vhc/main.c (modified) (view diffs)
-
drv/bus/usb/vhc/transfer.c (modified) (view diffs)
-
drv/bus/usb/vhc/vhcd.h (modified) (view diffs)
-
drv/nic/ar9271/ar9271.c (modified) (view diffs)
-
drv/nic/ar9271/ar9271.h (modified) (view diffs)
-
drv/nic/ar9271/ath_usb.c (modified) (view diffs)
-
drv/nic/ar9271/htc.h (modified) (view diffs)
-
drv/nic/ar9271/hw.c (modified) (view diffs)
-
drv/nic/ar9271/wmi.c (modified) (view diffs)
-
lib/c/generic/l18n/langs.c (modified) (view diffs)
-
lib/c/include/adt/list.h (modified) (view diffs)
-
lib/c/include/l18n/langs.h (modified) (view diffs)
-
lib/c/include/macros.h (modified) (view diffs)
-
lib/drv/generic/driver.c (modified) (view diffs)
-
lib/drv/generic/private/driver.h (modified) (view diffs)
-
lib/drv/generic/remote_usb.c (modified) (view diffs)
-
lib/drv/generic/remote_usbhc.c (modified) (view diffs)
-
lib/drv/include/ddf/driver.h (modified) (view diffs)
-
lib/drv/include/usb_iface.h (modified) (view diffs)
-
lib/drv/include/usbhc_iface.h (modified) (view diffs)
-
lib/scsi/include/scsi/spc.h (modified) (view diffs)
-
lib/usb/Makefile (modified) (view diffs)
-
lib/usb/include/usb/classes/hub.h (modified) (view diffs)
-
lib/usb/include/usb/classes/massstor.h (modified) (view diffs)
-
lib/usb/include/usb/debug.h (modified) (view diffs)
-
lib/usb/include/usb/descriptor.h (modified) (view diffs)
-
lib/usb/include/usb/dev.h (modified) (view diffs)
-
lib/usb/include/usb/hc.h (deleted)
-
lib/usb/include/usb/request.h (added)
-
lib/usb/include/usb/usb.h (modified) (view diffs)
-
lib/usb/src/class.c (modified) (view diffs)
-
lib/usb/src/ddfiface.c (deleted)
-
lib/usb/src/debug.c (modified) (view diffs)
-
lib/usb/src/dev.c (modified) (view diffs)
-
lib/usb/src/dump.c (modified) (view diffs)
-
lib/usb/src/hc.c (deleted)
-
lib/usb/src/usb.c (modified) (view diffs)
-
lib/usbdev/Makefile (modified) (view diffs)
-
lib/usbdev/include/usb/dev/alternate_ifaces.h (moved) (moved from uspace/lib/usbdev/include/usb/dev/hub.h ) (view diffs)
-
lib/usbdev/include/usb/dev/device.h (added)
-
lib/usbdev/include/usb/dev/dp.h (modified) (view diffs)
-
lib/usbdev/include/usb/dev/driver.h (modified) (view diffs)
-
lib/usbdev/include/usb/dev/pipes.h (modified) (view diffs)
-
lib/usbdev/include/usb/dev/poll.h (modified) (view diffs)
-
lib/usbdev/include/usb/dev/recognise.h (modified) (view diffs)
-
lib/usbdev/include/usb/dev/request.h (modified) (view diffs)
-
lib/usbdev/include/usb/dev/usb_device_connection.h (deleted)
-
lib/usbdev/src/altiface.c (modified) (view diffs)
-
lib/usbdev/src/devdrv.c (modified) (view diffs)
-
lib/usbdev/src/devpoll.c (modified) (view diffs)
-
lib/usbdev/src/dp.c (modified) (view diffs)
-
lib/usbdev/src/driver.c (added)
-
lib/usbdev/src/hub.c (deleted)
-
lib/usbdev/src/pipes.c (modified) (view diffs)
-
lib/usbdev/src/pipesinit.c (modified) (view diffs)
-
lib/usbdev/src/recognise.c (modified) (view diffs)
-
lib/usbdev/src/request.c (modified) (view diffs)
-
lib/usbhid/src/hidreport.c (modified) (view diffs)
-
lib/usbhid/src/hidreq.c (modified) (view diffs)
-
lib/usbhost/Makefile (modified) (view diffs)
-
lib/usbhost/include/usb/host/ddf_helpers.h (moved) (moved from uspace/drv/bus/usb/ohci/res.h ) (view diffs)
-
lib/usbhost/include/usb/host/endpoint.h (modified) (view diffs)
-
lib/usbhost/include/usb/host/hcd.h (modified) (view diffs)
-
lib/usbhost/include/usb/host/usb_bus.h (moved) (moved from uspace/lib/usbhost/include/usb/host/usb_endpoint_manager.h ) (view diffs)
-
lib/usbhost/include/usb/host/usb_device_manager.h (deleted)
-
lib/usbhost/include/usb/host/usb_transfer_batch.h (modified) (view diffs)
-
lib/usbhost/include/usb/host/utils/malloc32.h (moved) (moved from uspace/drv/bus/usb/ohci/utils/malloc32.h ) (view diffs)
-
lib/usbhost/src/ddf_helpers.c (added)
-
lib/usbhost/src/endpoint.c (modified) (view diffs)
-
lib/usbhost/src/hcd.c (added)
-
lib/usbhost/src/iface.c (deleted)
-
lib/usbhost/src/usb_bus.c (moved) (moved from uspace/lib/usbhost/src/usb_endpoint_manager.c ) (view diffs)
-
lib/usbhost/src/usb_device_manager.c (deleted)
-
lib/usbhost/src/usb_transfer_batch.c (modified) (view diffs)
-
lib/usbvirt/Makefile (modified) (view diffs)
-
lib/usbvirt/include/usbvirt/device.h (modified) (view diffs)
-
lib/usbvirt/include/usbvirt/virthub_base.h (moved) (moved from uspace/drv/bus/usb/vhc/hub.h ) (view diffs)
-
lib/usbvirt/src/ctrltransfer.c (modified) (view diffs)
-
lib/usbvirt/src/private.h (modified) (view diffs)
-
lib/usbvirt/src/stdreq.c (modified) (view diffs)
-
lib/usbvirt/src/transfer.c (modified) (view diffs)
-
lib/usbvirt/src/virthub_base.c (added)
-
lib/usbvirt/src/virthub_descriptors.c (added)
Note:
See TracChangeset
for help on using the changeset viewer.
