Changeset e1dbcbc in mainline for uspace/drv

Timestamp:

2011-04-29T13:43:01Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a81a1d09

Parents:

380e0364 (diff), f19f1b7 (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 development/ changes

Location:

uspace/drv

Files:

• ehci-hcd/main.c (modified) (view diffs)
• ehci-hcd/pci.c (modified) (view diffs)
• isa/isa.c (modified) (view diffs)
• ohci/Makefile (modified) (view diffs)
• ohci/batch.c (modified) (view diffs)
• ohci/batch.h (modified) (view diffs)
• ohci/endpoint_list.c (moved) (moved from uspace/drv/ohci/transfer_list.c ) (view diffs)
• ohci/endpoint_list.h (moved) (moved from uspace/drv/ohci/transfer_list.h ) (view diffs)
• ohci/hc.c (modified) (view diffs)
• ohci/hc.h (modified) (view diffs)
• ohci/hcd_endpoint.c (added)
• ohci/hcd_endpoint.h (moved) (moved from uspace/drv/vhc/devices.h ) (view diffs)
• ohci/hw_struct/endpoint_descriptor.c (modified) (view diffs)
• ohci/hw_struct/endpoint_descriptor.h (modified) (view diffs)
• ohci/hw_struct/hcca.h (modified) (view diffs)
• ohci/hw_struct/transfer_descriptor.c (modified) (view diffs)
• ohci/hw_struct/transfer_descriptor.h (modified) (view diffs)
• ohci/iface.c (modified) (view diffs)
• ohci/ohci.c (modified) (view diffs)
• ohci/ohci.ma (modified) (view diffs)
• ohci/ohci_regs.h (modified) (view diffs)
• ohci/pci.c (modified) (view diffs)
• ohci/root_hub.c (modified) (view diffs)
• ohci/root_hub.h (modified) (view diffs)
• ohci/utils/malloc32.h (modified) (view diffs)
• uhci-hcd/batch.c (modified) (view diffs)
• uhci-hcd/batch.h (modified) (view diffs)
• uhci-hcd/hc.c (modified) (view diffs)
• uhci-hcd/hc.h (modified) (view diffs)
• uhci-hcd/hw_struct/queue_head.h (modified) (view diffs)
• uhci-hcd/hw_struct/transfer_descriptor.c (modified) (view diffs)
• uhci-hcd/hw_struct/transfer_descriptor.h (modified) (view diffs)
• uhci-hcd/iface.c (modified) (view diffs)
• uhci-hcd/main.c (modified) (view diffs)
• uhci-hcd/pci.c (modified) (view diffs)
• uhci-hcd/root_hub.c (modified) (view diffs)
• uhci-hcd/root_hub.h (modified) (view diffs)
• uhci-hcd/transfer_list.c (modified) (view diffs)
• uhci-hcd/transfer_list.h (modified) (view diffs)
• uhci-hcd/uhci-hcd.ma (modified) (view diffs)
• uhci-hcd/uhci.c (modified) (view diffs)
• uhci-hcd/uhci.h (modified) (view diffs)
• uhci-rhd/main.c (modified) (view diffs)
• uhci-rhd/port.c (modified) (view diffs)
• uhci-rhd/port.h (modified) (view diffs)
• uhci-rhd/root_hub.c (modified) (view diffs)
• uhci-rhd/root_hub.h (modified) (view diffs)
• usbflbk/main.c (modified) (view diffs)
• usbhid/Makefile (modified) (view diffs)
• usbhid/generic/hiddev.c (modified) (view diffs)
• usbhid/generic/hiddev.h (modified) (view diffs)
• usbhid/kbd/conv.c (modified) (view diffs)
• usbhid/kbd/conv.h (modified) (view diffs)
• usbhid/kbd/kbddev.c (modified) (view diffs)
• usbhid/kbd/kbddev.h (modified) (view diffs)
• usbhid/kbd/kbdrepeat.h (modified) (view diffs)
• usbhid/layout.h (modified) (view diffs)
• usbhid/lgtch-ultrax/keymap.c (added)
• usbhid/lgtch-ultrax/keymap.h (added)
• usbhid/lgtch-ultrax/lgtch-ultrax.c (added)
• usbhid/lgtch-ultrax/lgtch-ultrax.h (added)
• usbhid/main.c (modified) (view diffs)
• usbhid/mouse/mousedev.c (added)
• usbhid/mouse/mousedev.h (moved) (moved from uspace/lib/usbvirt/src/debug.c ) (view diffs)
• usbhid/subdrivers.c (added)
• usbhid/subdrivers.h (added)
• usbhid/usbhid.c (modified) (view diffs)
• usbhid/usbhid.h (modified) (view diffs)
• usbhid/usbhid.ma (modified) (view diffs)
• usbhub/main.c (modified) (view diffs)
• usbhub/ports.c (modified) (view diffs)
• usbhub/usbhub.c (modified) (view diffs)
• usbhub/usbhub_private.h (modified) (view diffs)
• usbhub/utils.c (modified) (view diffs)
• usbkbd/kbddev.c (modified) (view diffs)
• usbkbd/kbddev.h (modified) (view diffs)
• usbkbd/main.c (modified) (view diffs)
• usbmid/main.c (modified) (view diffs)
• usbmouse/init.c (modified) (view diffs)
• usbmouse/main.c (modified) (view diffs)
• vhc/Makefile (modified) (view diffs)
• vhc/conn.h (modified) (view diffs)
• vhc/conndev.c (modified) (view diffs)
• vhc/connhost.c (modified) (view diffs)
• vhc/devconn.c (added)
• vhc/devices.c (deleted)
• vhc/hc.c (deleted)
• vhc/hc.h (deleted)
• vhc/hub.c (modified) (view diffs)
• vhc/hub.h (modified) (view diffs)
• vhc/hub/hub.c (modified) (view diffs)
• vhc/hub/hub.h (modified) (view diffs)
• vhc/hub/virthub.c (modified) (view diffs)
• vhc/hub/virthub.h (modified) (view diffs)
• vhc/hub/virthubops.c (modified) (view diffs)
• vhc/main.c (moved) (moved from uspace/drv/vhc/hcd.c ) (view diffs)
• vhc/transfer.c (added)
• vhc/vhcd.h (modified) (view diffs)