Changeset d1e580a in mainline for uspace

Timestamp:

2012-07-29T03:07:52Z (13 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

10334c2e

Parents:

d7c8e39f (diff), b2ba418 (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 mainline changes

Location:

uspace

Files:

• Makefile (modified) (view diffs)
• app/lsusb/Makefile (deleted)
• app/usbinfo/Makefile (modified) (view diffs)
• app/usbinfo/list.c (moved) (moved from uspace/app/lsusb/main.c ) (view diffs)
• app/usbinfo/main.c (modified) (view diffs)
• app/usbinfo/usbinfo.h (modified) (view diffs)
• drv/block/ahci/ahci.c (modified) (view diffs)
• drv/block/ahci/ahci.h (modified) (view diffs)
• drv/block/ahci/ahci_hw.h (modified) (view diffs)
• drv/bus/pci/pciintel/pci.c (modified) (view diffs)
• drv/bus/pci/pciintel/pci.h (modified) (view diffs)
• drv/bus/usb/ehci/main.c (modified) (view diffs)
• drv/bus/usb/ohci/endpoint_list.c (modified) (view diffs)
• drv/bus/usb/ohci/hc.c (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/mem_access.h (added)
• 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 (modified) (view diffs)
• 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/root_hub.c (modified) (view diffs)
• drv/bus/usb/ohci/utils/malloc32.h (modified) (view diffs)
• drv/bus/usb/uhci/hc.c (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/transfer_list.c (modified) (view diffs)
• drv/bus/usb/uhci/uhci.c (modified) (view diffs)
• drv/bus/usb/uhci/uhci_batch.c (modified) (view diffs)
• drv/bus/usb/uhci/uhci_batch.h (modified) (view diffs)
• drv/bus/usb/uhci/utils/malloc32.h (modified) (view diffs)
• drv/bus/usb/uhcirh/port.c (modified) (view diffs)
• drv/bus/usb/uhcirh/root_hub.c (modified) (view diffs)
• drv/bus/usb/usbhid/generic/hiddev.c (modified) (view diffs)
• drv/bus/usb/usbhid/generic/hiddev.h (modified) (view diffs)
• drv/bus/usb/usbhid/kbd/kbddev.c (modified) (view diffs)
• drv/bus/usb/usbhid/kbd/kbddev.h (modified) (view diffs)
• drv/bus/usb/usbhid/kbd/kbdrepeat.c (modified) (view diffs)
• drv/bus/usb/usbhid/kbd/kbdrepeat.h (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/mouse/mousedev.h (modified) (view diffs)
• drv/bus/usb/usbhid/multimedia/multimedia.c (modified) (view diffs)
• drv/bus/usb/usbhid/multimedia/multimedia.h (modified) (view diffs)
• drv/bus/usb/usbhid/subdrivers.h (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/port.c (modified) (view diffs)
• drv/bus/usb/usbhub/status.h (modified) (view diffs)
• drv/bus/usb/usbhub/usbhub.c (modified) (view diffs)
• drv/bus/usb/usbmid/main.c (modified) (view diffs)
• drv/char/i8042/i8042.c (modified) (view diffs)
• drv/infrastructure/rootmac/rootmac.c (modified) (view diffs)
• drv/infrastructure/rootpc/rootpc.c (modified) (view diffs)
• drv/nic/ne2k/ne2k.c (modified) (view diffs)
• lib/c/arch/ia64/Makefile.common (modified) (view diffs)
• lib/c/generic/malloc.c (modified) (view diffs)
• lib/drv/generic/remote_usb.c (modified) (view diffs)
• lib/drv/generic/remote_usbhc.c (modified) (view diffs)
• lib/usbdev/include/usb/dev/usb_device_connection.h (modified) (view diffs)
• lib/usbdev/src/devdrv.c (modified) (view diffs)
• lib/usbdev/src/pipes.c (modified) (view diffs)
• lib/usbdev/src/pipesinit.c (modified) (view diffs)
• lib/usbdev/src/request.c (modified) (view diffs)
• lib/usbhid/include/usb/hid/hid_report_items.h (modified) (view diffs)
• lib/usbhid/include/usb/hid/hidpath.h (modified) (view diffs)
• lib/usbhid/include/usb/hid/hidtypes.h (modified) (view diffs)
• lib/usbhid/include/usb/hid/request.h (modified) (view diffs)
• lib/usbhid/src/hiddescriptor.c (modified) (view diffs)
• lib/usbhid/src/hidparser.c (modified) (view diffs)
• lib/usbhid/src/hidpath.c (modified) (view diffs)
• lib/usbhid/src/hidreport.c (modified) (view diffs)
• lib/usbhid/src/hidreq.c (modified) (view diffs)
• lib/usbhost/src/endpoint.c (modified) (view diffs)
• lib/usbhost/src/usb_device_manager.c (modified) (view diffs)
• lib/usbhost/src/usb_endpoint_manager.c (modified) (view diffs)
• lib/usbhost/src/usb_transfer_batch.c (modified) (view diffs)
• srv/hid/input/port/ns16550.c (modified) (view diffs)
• srv/hid/input/port/pl050.c (modified) (view diffs)
• srv/hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
• srv/loader/Makefile (modified) (view diffs)
• srv/loader/interp.S (moved) (moved from uspace/srv/loader/interp.s ) (view diffs)