Changeset 20a3465 in mainline

Timestamp:

2011-10-30T19:50:54Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3ce78580, 48902fa

Parents:

4c3ad56 (diff), 45bf63c (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/arch/amd64/Makefile.inc (modified) (view diffs)
• kernel/arch/ia64/src/ia64.c (modified) (view diffs)
• kernel/arch/ia64/src/start.S (modified) (view diffs)
• kernel/genarch/src/acpi/madt.c (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/cp/cp.c (modified) (view diffs)
• uspace/app/mkbd/main.c (modified) (view diffs)
• uspace/app/usbinfo/desctree.c (modified) (view diffs)
• uspace/app/usbinfo/dump.c (modified) (view diffs)
• uspace/app/usbinfo/hid.c (modified) (view diffs)
• uspace/app/usbinfo/info.c (modified) (view diffs)
• uspace/app/usbinfo/usbinfo.h (modified) (view diffs)
• uspace/doc/doxygroups.h (modified) (view diffs)
• 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/endpoint_descriptor.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.h (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hw_struct/hcca.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/ohci.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/ohci_batch.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/ohci_endpoint.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/ohci_endpoint.h (modified) (view diffs)
• uspace/drv/bus/usb/ohci/ohci_regs.h (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/hc.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/uhci.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/uhci_batch.c (modified) (view diffs)
• uspace/drv/bus/usb/usbflbk/main.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/generic/hiddev.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/generic/hiddev.h (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/kbd/conv.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/kbd/kbddev.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/kbd/kbddev.h (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/kbd/kbdrepeat.h (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/main.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/mouse/mousedev.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/mouse/mousedev.h (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/multimedia/multimedia.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/subdrivers.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/subdrivers.h (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/usbhid.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhid/usbhid.h (modified) (view diffs)
• uspace/drv/bus/usb/usbhub/main.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhub/port.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhub/port.h (modified) (view diffs)
• uspace/drv/bus/usb/usbhub/usbhub.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhub/usbhub.h (modified) (view diffs)
• uspace/drv/bus/usb/usbmast/main.c (modified) (view diffs)
• uspace/drv/bus/usb/usbmast/usbmast.h (modified) (view diffs)
• uspace/drv/bus/usb/usbmid/dump.c (modified) (view diffs)
• uspace/drv/bus/usb/usbmid/explore.c (modified) (view diffs)
• uspace/drv/bus/usb/usbmid/main.c (modified) (view diffs)
• uspace/drv/bus/usb/usbmid/usbmid.c (modified) (view diffs)
• uspace/drv/bus/usb/usbmid/usbmid.h (modified) (view diffs)
• uspace/drv/bus/usb/usbmouse/Makefile (deleted)
• uspace/drv/bus/usb/usbmouse/init.c (deleted)
• uspace/drv/bus/usb/usbmouse/main.c (deleted)
• uspace/drv/bus/usb/usbmouse/mouse.c (deleted)
• uspace/drv/bus/usb/usbmouse/mouse.h (deleted)
• uspace/drv/bus/usb/usbmouse/usbmouse.ma (deleted)
• uspace/drv/bus/usb/vhc/connhost.c (modified) (view diffs)
• uspace/lib/c/generic/str.c (modified) (view diffs)
• uspace/lib/c/include/str.h (modified) (view diffs)
• uspace/lib/usbdev/include/usb/dev/dp.h (modified) (view diffs)
• uspace/lib/usbdev/include/usb/dev/driver.h (modified) (view diffs)
• uspace/lib/usbdev/include/usb/dev/pipes.h (modified) (view diffs)
• uspace/lib/usbdev/src/altiface.c (modified) (view diffs)
• uspace/lib/usbdev/src/devdrv.c (modified) (view diffs)
• uspace/lib/usbdev/src/dp.c (modified) (view diffs)
• uspace/lib/usbdev/src/pipesinit.c (modified) (view diffs)
• uspace/lib/usbdev/src/request.c (modified) (view diffs)
• uspace/lib/usbhid/include/usb/hid/hiddescriptor.h (modified) (view diffs)
• uspace/lib/usbhid/src/hiddescriptor.c (modified) (view diffs)
• uspace/lib/usbhid/src/hidparser.c (modified) (view diffs)
• uspace/lib/usbhid/src/hidreport.c (modified) (view diffs)
• uspace/lib/usbhost/include/usb/host/endpoint.h (modified) (view diffs)
• uspace/lib/usbhost/include/usb/host/hcd.h (modified) (view diffs)
• uspace/lib/usbhost/include/usb/host/usb_device_manager.h (modified) (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 (modified) (view diffs)
• uspace/lib/usbhost/src/endpoint.c (modified) (view diffs)
• uspace/lib/usbhost/src/iface.c (modified) (view diffs)
• uspace/lib/usbhost/src/usb_device_manager.c (modified) (view diffs)
• uspace/lib/usbhost/src/usb_endpoint_manager.c (modified) (view diffs)
• uspace/lib/usbhost/src/usb_transfer_batch.c (modified) (view diffs)
• uspace/srv/hw/irc/apic/apic.c (modified) (view diffs)
• uspace/srv/loc/loc.c (modified) (view diffs)