Changeset b4b534ac in mainline for uspace/drv

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

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.

Message:

Merge from lp:~jan.vesely/helenos/usb

Location:

uspace/drv

Files:

• bus/usb/ehci/Makefile (modified) (view diffs)
• bus/usb/ehci/ehci_batch.c (added)
• bus/usb/ehci/ehci_batch.h (added)
• bus/usb/ehci/ehci_endpoint.c (added)
• bus/usb/ehci/ehci_endpoint.h (moved) (moved from uspace/drv/bus/usb/uhcirh/root_hub.h ) (view diffs)
• bus/usb/ehci/ehci_regs.h (added)
• bus/usb/ehci/ehci_rh.c (added)
• bus/usb/ehci/ehci_rh.h (moved) (moved from uspace/drv/bus/usb/uhci/root_hub.c ) (view diffs)
• bus/usb/ehci/endpoint_list.c (added)
• bus/usb/ehci/endpoint_list.h (added)
• bus/usb/ehci/hc.c (added)
• bus/usb/ehci/hc.h (added)
• bus/usb/ehci/hw_struct/fstn.h (moved) (moved from uspace/drv/bus/usb/uhci/uhci.h ) (view diffs)
• bus/usb/ehci/hw_struct/iso_transfer_descriptor.h (added)
• bus/usb/ehci/hw_struct/link_pointer.h (moved) (moved from uspace/lib/usb/include/usb/ddfiface.h ) (view diffs)
• bus/usb/ehci/hw_struct/mem_access.h (moved) (moved from uspace/drv/bus/usb/uhci/res.h ) (view diffs)
• bus/usb/ehci/hw_struct/queue_head.c (added)
• bus/usb/ehci/hw_struct/queue_head.h (added)
• bus/usb/ehci/hw_struct/split_iso_transfer_descriptor.h (added)
• bus/usb/ehci/hw_struct/transfer_descriptor.c (added)
• bus/usb/ehci/hw_struct/transfer_descriptor.h (added)
• bus/usb/ehci/main.c (modified) (view diffs)
• bus/usb/ehci/res.c (modified) (view diffs)
• bus/usb/ehci/res.h (modified) (view diffs)
• bus/usb/ohci/Makefile (modified) (view diffs)
• bus/usb/ohci/endpoint_list.c (modified) (view diffs)
• bus/usb/ohci/endpoint_list.h (modified) (view diffs)
• bus/usb/ohci/hc.c (modified) (view diffs)
• bus/usb/ohci/hc.h (modified) (view diffs)
• bus/usb/ohci/hw_struct/completion_codes.h (modified) (view diffs)
• bus/usb/ohci/hw_struct/endpoint_descriptor.c (modified) (view diffs)
• bus/usb/ohci/hw_struct/endpoint_descriptor.h (modified) (view diffs)
• bus/usb/ohci/hw_struct/hcca.h (modified) (view diffs)
• bus/usb/ohci/hw_struct/iso_transfer_descriptor.h (modified) (view diffs)
• bus/usb/ohci/hw_struct/mem_access.h (modified) (view diffs)
• bus/usb/ohci/hw_struct/transfer_descriptor.c (modified) (view diffs)
• bus/usb/ohci/hw_struct/transfer_descriptor.h (modified) (view diffs)
• bus/usb/ohci/main.c (modified) (view diffs)
• bus/usb/ohci/ohci.c (deleted)
• bus/usb/ohci/ohci.h (deleted)
• bus/usb/ohci/ohci_batch.c (modified) (view diffs)
• bus/usb/ohci/ohci_batch.h (modified) (view diffs)
• bus/usb/ohci/ohci_endpoint.c (modified) (view diffs)
• bus/usb/ohci/ohci_regs.h (modified) (view diffs)
• bus/usb/ohci/ohci_rh.c (added)
• bus/usb/ohci/ohci_rh.h (moved) (moved from uspace/drv/bus/usb/ohci/root_hub.h ) (view diffs)
• bus/usb/ohci/res.c (deleted)
• bus/usb/ohci/root_hub.c (deleted)
• bus/usb/uhci/Makefile (modified) (view diffs)
• bus/usb/uhci/hc.c (modified) (view diffs)
• bus/usb/uhci/hc.h (modified) (view diffs)
• bus/usb/uhci/hw_struct/link_pointer.h (modified) (view diffs)
• bus/usb/uhci/hw_struct/queue_head.h (modified) (view diffs)
• bus/usb/uhci/hw_struct/transfer_descriptor.c (modified) (view diffs)
• bus/usb/uhci/hw_struct/transfer_descriptor.h (modified) (view diffs)
• bus/usb/uhci/main.c (modified) (view diffs)
• bus/usb/uhci/res.c (deleted)
• bus/usb/uhci/transfer_list.c (modified) (view diffs)
• bus/usb/uhci/transfer_list.h (modified) (view diffs)
• bus/usb/uhci/uhci.c (deleted)
• bus/usb/uhci/uhci_batch.c (modified) (view diffs)
• bus/usb/uhci/uhci_batch.h (modified) (view diffs)
• bus/usb/uhci/uhci_rh.c (added)
• bus/usb/uhci/uhci_rh.h (moved) (moved from uspace/drv/bus/usb/uhci/root_hub.h ) (view diffs)
• bus/usb/uhci/utils/malloc32.h (deleted)
• bus/usb/uhcirh/Makefile (deleted)
• bus/usb/uhcirh/main.c (deleted)
• bus/usb/uhcirh/port.c (deleted)
• bus/usb/uhcirh/port.h (deleted)
• bus/usb/uhcirh/root_hub.c (deleted)
• bus/usb/uhcirh/uhcirh.ma (deleted)
• bus/usb/usbflbk/main.c (modified) (view diffs)
• bus/usb/usbhid/blink1/blink1.c (modified) (view diffs)
• bus/usb/usbhid/generic/hiddev.c (modified) (view diffs)
• bus/usb/usbhid/kbd/kbddev.c (modified) (view diffs)
• bus/usb/usbhid/main.c (modified) (view diffs)
• bus/usb/usbhid/mouse/mousedev.c (modified) (view diffs)
• bus/usb/usbhid/multimedia/multimedia.c (modified) (view diffs)
• bus/usb/usbhid/usbhid.c (modified) (view diffs)
• bus/usb/usbhid/usbhid.h (modified) (view diffs)
• bus/usb/usbhub/main.c (modified) (view diffs)
• bus/usb/usbhub/port.c (modified) (view diffs)
• bus/usb/usbhub/port.h (modified) (view diffs)
• bus/usb/usbhub/status.h (modified) (view diffs)
• bus/usb/usbhub/usbhub.c (modified) (view diffs)
• bus/usb/usbhub/usbhub.h (modified) (view diffs)
• bus/usb/usbmast/bo_trans.c (modified) (view diffs)
• bus/usb/usbmast/bo_trans.h (modified) (view diffs)
• bus/usb/usbmast/main.c (modified) (view diffs)
• bus/usb/usbmast/scsi_ms.c (modified) (view diffs)
• bus/usb/usbmast/usbmast.h (modified) (view diffs)
• bus/usb/usbmid/explore.c (modified) (view diffs)
• bus/usb/usbmid/main.c (modified) (view diffs)
• bus/usb/usbmid/usbmid.c (modified) (view diffs)
• bus/usb/usbmid/usbmid.h (modified) (view diffs)
• bus/usb/usbmid/usbmid.ma (modified) (view diffs)
• bus/usb/vhc/Makefile (modified) (view diffs)
• bus/usb/vhc/conn.h (deleted)
• bus/usb/vhc/conndev.c (modified) (view diffs)
• bus/usb/vhc/connhost.c (deleted)
• bus/usb/vhc/devconn.c (modified) (view diffs)
• bus/usb/vhc/hub.c (deleted)
• bus/usb/vhc/hub/virthub.c (modified) (view diffs)
• bus/usb/vhc/hub/virthub.h (modified) (view diffs)
• bus/usb/vhc/hub/virthubops.c (modified) (view diffs)
• bus/usb/vhc/main.c (modified) (view diffs)
• bus/usb/vhc/transfer.c (modified) (view diffs)
• bus/usb/vhc/vhcd.h (modified) (view diffs)
• nic/ar9271/ar9271.c (modified) (view diffs)
• nic/ar9271/ar9271.h (modified) (view diffs)
• nic/ar9271/ath_usb.c (modified) (view diffs)
• nic/ar9271/htc.h (modified) (view diffs)
• nic/ar9271/hw.c (modified) (view diffs)
• nic/ar9271/wmi.c (modified) (view diffs)