Changeset 3f03199 in mainline for uspace/lib

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

Location:

uspace/lib

Files:

• block/block.c (modified) (view diffs)
• c/Makefile (modified) (view diffs)
• c/arch/sparc64/Makefile.common (modified) (view diffs)
• c/generic/adt/hash_table.c (modified) (view diffs)
• c/generic/adt/list.c (modified) (view diffs)
• c/generic/cfg.c (modified) (view diffs)
• c/generic/corecfg.c (added)
• c/generic/ddi.c (modified) (view diffs)
• c/generic/device/hw_res.c (modified) (view diffs)
• c/generic/device/hw_res_parsed.c (modified) (view diffs)
• c/generic/device/pio_window.c (added)
• c/generic/devman.c (modified) (view diffs)
• c/generic/futex.c (modified) (view diffs)
• c/generic/inet.c (modified) (view diffs)
• c/generic/inet/addr.c (modified) (view diffs)
• c/generic/io/asprintf.c (modified) (view diffs)
• c/generic/net/socket_client.c (modified) (view diffs)
• c/generic/pio_trace.c (modified) (view diffs)
• c/generic/time.c (modified) (view diffs)
• c/generic/vfs/vfs.c (modified) (view diffs)
• c/include/adt/list.h (modified) (view diffs)
• c/include/cfg.h (modified) (view diffs)
• c/include/corecfg.h (added)
• c/include/ddi.h (modified) (view diffs)
• c/include/device/hw_res.h (modified) (view diffs)
• c/include/device/hw_res_parsed.h (modified) (view diffs)
• c/include/device/pio_window.h (added)
• c/include/devman.h (modified) (view diffs)
• c/include/inet/addr.h (modified) (view diffs)
• c/include/inet/inet.h (modified) (view diffs)
• c/include/ipc/corecfg.h (added)
• c/include/ipc/dev_iface.h (modified) (view diffs)
• c/include/ipc/devman.h (modified) (view diffs)
• c/include/ipc/services.h (modified) (view diffs)
• c/include/ipc/socket.h (modified) (view diffs)
• c/include/ipc/vfs.h (modified) (view diffs)
• c/include/net/socket.h (modified) (view diffs)
• c/include/net/socket_codes.h (modified) (view diffs)
• c/include/stdio.h (modified) (view diffs)
• c/include/sys/statfs.h (added)
• c/include/vfs/vfs.h (modified) (view diffs)
• draw/drawctx.c (modified) (view diffs)
• drv/Makefile (modified) (view diffs)
• drv/generic/dev_iface.c (modified) (view diffs)
• drv/generic/driver.c (modified) (view diffs)
• drv/generic/interrupt.c (modified) (view diffs)
• drv/generic/remote_pio_window.c (added)
• drv/include/ops/pio_window.h (added)
• drv/include/remote_pio_window.h (added)
• fs/libfs.c (modified) (view diffs)
• fs/libfs.h (modified) (view diffs)
• graph/graph.c (modified) (view diffs)
• gui/connection.c (modified) (view diffs)
• gui/grid.c (modified) (view diffs)
• gui/terminal.c (modified) (view diffs)
• gui/window.c (modified) (view diffs)
• http/Makefile (added)
• http/http.c (added)
• http/http.h (added)
• softfloat/softfloat.c (modified) (view diffs)
• uri/Makefile (added)
• uri/ctype.h (added)
• uri/uri.c (added)
• uri/uri.h (added)
• usbhid/src/hiddescriptor.c (modified) (view diffs)
• usbhid/src/hidparser.c (modified) (view diffs)
• usbhid/src/hidpath.c (modified) (view diffs)
• usbhost/src/ddf_helpers.c (modified) (view diffs)
• usbhost/src/usb_endpoint_manager.c (modified) (view diffs)