Changeset 3b5d1535 in mainline

Timestamp:

2011-02-23T10:28:21Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

eb48f61

Parents:

e936e8e (diff), eb1a2f4 (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.common (modified) (view diffs)
• app/taskdump/taskdump.c (modified) (view diffs)
• app/tester/hw/misc/virtchar1.c (modified) (view diffs)
• app/tester/hw/serial/serial1.c (modified) (view diffs)
• drv/isa/isa.c (modified) (view diffs)
• drv/ns8250/ns8250.c (modified) (view diffs)
• drv/pciintel/pci.c (modified) (view diffs)
• drv/pciintel/pci.h (modified) (view diffs)
• drv/root/root.c (modified) (view diffs)
• drv/rootpc/rootpc.c (modified) (view diffs)
• drv/rootvirt/rootvirt.c (modified) (view diffs)
• drv/test1/char.c (modified) (view diffs)
• drv/test1/test1.c (modified) (view diffs)
• drv/test1/test1.h (modified) (view diffs)
• drv/test2/test2.c (modified) (view diffs)
• drv/uhci-hcd/batch.c (modified) (view diffs)
• drv/uhci-hcd/batch.h (modified) (view diffs)
• drv/uhci-hcd/iface.c (modified) (view diffs)
• drv/uhci-hcd/iface.h (modified) (view diffs)
• drv/uhci-hcd/main.c (modified) (view diffs)
• drv/uhci-hcd/pci.c (modified) (view diffs)
• drv/uhci-hcd/pci.h (modified) (view diffs)
• drv/uhci-hcd/root_hub.c (modified) (view diffs)
• drv/uhci-hcd/root_hub.h (modified) (view diffs)
• drv/uhci-hcd/uhci.c (modified) (view diffs)
• drv/uhci-hcd/uhci.h (modified) (view diffs)
• drv/uhci-rhd/main.c (modified) (view diffs)
• drv/uhci-rhd/port.c (modified) (view diffs)
• drv/uhci-rhd/port.h (modified) (view diffs)
• drv/uhci-rhd/root_hub.c (modified) (view diffs)
• drv/uhci-rhd/root_hub.h (modified) (view diffs)
• drv/usbhid/descdump.c (modified) (view diffs)
• drv/usbhid/descparser.c (modified) (view diffs)
• drv/usbhid/hid.h (modified) (view diffs)
• drv/usbhid/main.c (modified) (view diffs)
• drv/usbhub/main.c (modified) (view diffs)
• drv/usbhub/usbhub.c (modified) (view diffs)
• drv/usbhub/usbhub.h (modified) (view diffs)
• drv/usbhub/usbhub_private.h (modified) (view diffs)
• drv/usbhub/utils.c (modified) (view diffs)
• drv/usbmid/main.c (modified) (view diffs)
• drv/usbmid/usbmid.c (modified) (view diffs)
• drv/usbmid/usbmid.h (modified) (view diffs)
• drv/vhc/conn.h (modified) (view diffs)
• drv/vhc/conndev.c (modified) (view diffs)
• drv/vhc/connhost.c (modified) (view diffs)
• drv/vhc/hcd.c (modified) (view diffs)
• drv/vhc/hub.c (modified) (view diffs)
• drv/vhc/hub.h (modified) (view diffs)
• drv/vhc/hub/hub.c (modified) (view diffs)
• drv/vhc/hub/virthub.c (modified) (view diffs)
• lib/block/libblock.c (modified) (view diffs)
• lib/c/Makefile (modified) (view diffs)
• lib/c/generic/devman.c (modified) (view diffs)
• lib/c/generic/fibril.c (modified) (view diffs)
• lib/c/include/devman.h (modified) (view diffs)
• lib/c/include/ipc/devman.h (modified) (view diffs)
• lib/drv/generic/driver.c (modified) (view diffs)
• lib/drv/generic/remote_char_dev.c (modified) (view diffs)
• lib/drv/generic/remote_hw_res.c (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 (moved) (moved from uspace/lib/drv/include/driver.h ) (view diffs)
• lib/drv/include/ddf/interrupt.h (added)
• lib/drv/include/dev_iface.h (modified) (view diffs)
• lib/drv/include/ops/char_dev.h (modified) (view diffs)
• lib/drv/include/ops/hw_res.h (modified) (view diffs)
• lib/drv/include/usb_iface.h (modified) (view diffs)
• lib/drv/include/usbhc_iface.h (modified) (view diffs)
• lib/usb/include/usb/ddfiface.h (modified) (view diffs)
• lib/usb/include/usb/hub.h (modified) (view diffs)
• lib/usb/include/usb/pipes.h (modified) (view diffs)
• lib/usb/include/usb/recognise.h (modified) (view diffs)
• lib/usb/include/usb/usbdevice.h (modified) (view diffs)
• lib/usb/src/ddfiface.c (modified) (view diffs)
• lib/usb/src/hub.c (modified) (view diffs)
• lib/usb/src/pipes.c (modified) (view diffs)
• lib/usb/src/recognise.c (modified) (view diffs)
• lib/usb/src/request.c (modified) (view diffs)
• lib/usb/src/usbdevice.c (modified) (view diffs)
• lib/usbvirt/src/main.c (modified) (view diffs)
• srv/devman/devman.c (modified) (view diffs)
• srv/devman/devman.h (modified) (view diffs)
• srv/devman/main.c (modified) (view diffs)
• srv/devman/match.c (modified) (view diffs)
• srv/fs/devfs/devfs_ops.c (modified) (view diffs)