Changeset 3819ce5 in mainline

Timestamp:

2011-12-25T10:05:28Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ecf823a

Parents:

1440eae (diff), 7e1b130 (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 mainline

Location:

uspace

Files:

• app/mkbd/main.c (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)
• drv/bus/isa/Makefile (modified) (view diffs)
• drv/bus/isa/i8237.c (added)
• drv/bus/isa/i8237.h (moved) (moved from uspace/lib/usbdev/src/pipepriv.h ) (view diffs)
• drv/bus/isa/isa.c (modified) (view diffs)
• drv/bus/isa/isa.dev (modified) (view diffs)
• drv/bus/pci/pciintel/pci.c (modified) (view diffs)
• drv/bus/usb/ohci/hc.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/pci.c (modified) (view diffs)
• drv/bus/usb/ohci/root_hub.c (modified) (view diffs)
• drv/bus/usb/uhci/hc.c (modified) (view diffs)
• drv/bus/usb/uhci/pci.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/uhcirh/main.c (modified) (view diffs)
• drv/bus/usb/uhcirh/port.c (modified) (view diffs)
• drv/bus/usb/usbhub/port.c (modified) (view diffs)
• drv/bus/usb/usbhub/usbhub.c (modified) (view diffs)
• drv/bus/usb/usbhub/usbhub.h (modified) (view diffs)
• drv/bus/usb/usbmid/main.c (modified) (view diffs)
• drv/bus/usb/vhc/hub.c (modified) (view diffs)
• drv/infrastructure/rootpc/rootpc.c (modified) (view diffs)
• lib/c/include/device/hw_res.h (modified) (view diffs)
• lib/c/include/device/hw_res_parsed.h (modified) (view diffs)
• lib/drv/include/ops/hw_res.h (modified) (view diffs)
• lib/drv/include/usbhc_iface.h (modified) (view diffs)
• lib/usb/Makefile (modified) (view diffs)
• lib/usb/include/usb/classes/hub.h (modified) (view diffs)
• lib/usb/include/usb/dev.h (added)
• lib/usb/include/usb/hc.h (modified) (view diffs)
• lib/usb/include/usb/usb.h (modified) (view diffs)
• lib/usb/src/ddfiface.c (modified) (view diffs)
• lib/usb/src/dev.c (moved) (moved from uspace/lib/usb/src/resolve.c ) (view diffs)
• lib/usb/src/hc.c (modified) (view diffs)
• lib/usb/src/usb.c (modified) (view diffs)
• lib/usbdev/Makefile (modified) (view diffs)
• lib/usbdev/include/usb/dev/driver.h (modified) (view diffs)
• lib/usbdev/include/usb/dev/hub.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/request.h (modified) (view diffs)
• lib/usbdev/include/usb/dev/usb_device_connection.h (added)
• 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/hub.c (modified) (view diffs)
• lib/usbdev/src/pipepriv.c (deleted)
• lib/usbdev/src/pipes.c (modified) (view diffs)
• lib/usbdev/src/pipesinit.c (modified) (view diffs)
• lib/usbdev/src/pipesio.c (deleted)
• lib/usbdev/src/recognise.c (modified) (view diffs)
• lib/usbhost/include/usb/host/endpoint.h (modified) (view diffs)
• lib/usbhost/include/usb/host/usb_device_manager.h (modified) (view diffs)
• lib/usbhost/include/usb/host/usb_transfer_batch.h (modified) (view diffs)
• lib/usbhost/src/iface.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/net/tl/tcp/conn.c (modified) (view diffs)
• srv/net/tl/tcp/segment.c (modified) (view diffs)
• srv/net/tl/tcp/tcp.c (modified) (view diffs)