Changeset f1d6866 in mainline

Timestamp:

2011-09-18T21:22:59Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

dcc44ca1

Parents:

85ff862 (diff), 45a9cf4 (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

Files:

• boot/Makefile.common (modified) (view diffs)
• kernel/arch/arm32/include/mainpage.h (deleted)
• kernel/arch/arm32/src/ras.c (modified) (view diffs)
• kernel/generic/include/adt/list.h (modified) (view diffs)
• kernel/generic/src/mm/frame.c (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/app/sportdmp/Makefile (added)
• uspace/app/sportdmp/sportdmp.c (added)
• uspace/drv/bus/isa/isa.c (modified) (view diffs)
• uspace/drv/bus/usb/ehci/hc_iface.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/Makefile (modified) (view diffs)
• uspace/drv/bus/usb/ohci/batch.c (deleted)
• uspace/drv/bus/usb/ohci/endpoint_list.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/endpoint_list.h (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hc.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hc.h (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h (modified) (view diffs)
• uspace/drv/bus/usb/ohci/iface.c (deleted)
• uspace/drv/bus/usb/ohci/iface.h (deleted)
• uspace/drv/bus/usb/ohci/ohci.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/ohci_batch.c (added)
• uspace/drv/bus/usb/ohci/ohci_batch.h (moved) (moved from uspace/drv/bus/usb/ohci/batch.h ) (view diffs)
• uspace/drv/bus/usb/ohci/ohci_endpoint.c (moved) (moved from uspace/drv/bus/usb/ohci/hcd_endpoint.c ) (view diffs)
• uspace/drv/bus/usb/ohci/ohci_endpoint.h (moved) (moved from uspace/drv/bus/usb/ohci/hcd_endpoint.h ) (view diffs)
• uspace/drv/bus/usb/ohci/pci.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/root_hub.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/root_hub.h (modified) (view diffs)
• uspace/drv/bus/usb/ohci/utils/malloc32.h (modified) (view diffs)
• uspace/drv/bus/usb/uhci/Makefile (modified) (view diffs)
• uspace/drv/bus/usb/uhci/batch.c (deleted)
• uspace/drv/bus/usb/uhci/batch.h (deleted)
• uspace/drv/bus/usb/uhci/hc.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/hc.h (modified) (view diffs)
• uspace/drv/bus/usb/uhci/hw_struct/link_pointer.h (modified) (view diffs)
• uspace/drv/bus/usb/uhci/hw_struct/queue_head.h (modified) (view diffs)
• uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h (modified) (view diffs)
• uspace/drv/bus/usb/uhci/iface.c (deleted)
• uspace/drv/bus/usb/uhci/iface.h (deleted)
• uspace/drv/bus/usb/uhci/main.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/pci.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/root_hub.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/transfer_list.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/transfer_list.h (modified) (view diffs)
• uspace/drv/bus/usb/uhci/uhci.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/uhci_batch.c (added)
• uspace/drv/bus/usb/uhci/uhci_batch.h (added)
• uspace/drv/bus/usb/uhci/utils/malloc32.h (modified) (view diffs)
• uspace/drv/bus/usb/vhc/connhost.c (modified) (view diffs)
• uspace/drv/bus/usb/vhc/main.c (modified) (view diffs)
• uspace/drv/bus/usb/vhc/vhcd.h (modified) (view diffs)
• uspace/drv/char/ns8250/ns8250.c (modified) (view diffs)
• uspace/lib/c/Makefile (modified) (view diffs)
• uspace/lib/c/generic/adt/hash_table.c (modified) (view diffs)
• uspace/lib/c/generic/as.c (modified) (view diffs)
• uspace/lib/c/generic/cfg.c (added)
• uspace/lib/c/generic/io/io.c (modified) (view diffs)
• uspace/lib/c/generic/ns.c (modified) (view diffs)
• uspace/lib/c/include/adt/list.h (modified) (view diffs)
• uspace/lib/c/include/as.h (modified) (view diffs)
• uspace/lib/c/include/cfg.h (added)
• uspace/lib/c/include/ipc/loc.h (modified) (view diffs)
• uspace/lib/drv/generic/dev_iface.c (modified) (view diffs)
• uspace/lib/drv/generic/driver.c (modified) (view diffs)
• uspace/lib/drv/generic/remote_usbhc.c (modified) (view diffs)
• uspace/lib/drv/include/usbhc_iface.h (modified) (view diffs)
• uspace/lib/usb/include/usb/hc.h (modified) (view diffs)
• uspace/lib/usb/include/usb/usb.h (modified) (view diffs)
• uspace/lib/usbdev/src/pipesinit.c (modified) (view diffs)
• uspace/lib/usbdev/src/pipesio.c (modified) (view diffs)
• uspace/lib/usbhost/Makefile (modified) (view diffs)
• uspace/lib/usbhost/include/usb/host/batch.h (deleted)
• uspace/lib/usbhost/include/usb/host/endpoint.h (modified) (view diffs)
• uspace/lib/usbhost/include/usb/host/hcd.h (added)
• uspace/lib/usbhost/include/usb/host/usb_device_manager.h (moved) (moved from uspace/lib/usbhost/include/usb/host/device_keeper.h ) (view diffs)
• uspace/lib/usbhost/include/usb/host/usb_endpoint_manager.h (modified) (view diffs)
• uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h (added)
• uspace/lib/usbhost/src/endpoint.c (modified) (view diffs)
• uspace/lib/usbhost/src/iface.c (added)
• uspace/lib/usbhost/src/usb_device_manager.c (moved) (moved from uspace/lib/usbhost/src/device_keeper.c ) (view diffs)
• uspace/lib/usbhost/src/usb_endpoint_manager.c (modified) (view diffs)
• uspace/lib/usbhost/src/usb_transfer_batch.c (moved) (moved from uspace/lib/usbhost/src/batch.c ) (view diffs)
• uspace/srv/hid/console/console.c (modified) (view diffs)
• uspace/srv/hid/fb/port/kfb.c (modified) (view diffs)