Changeset 2568c94 in mainline for uspace

Timestamp:

2012-08-17T17:15:19Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1789023

Parents:

4f351432 (diff), 01e397ac (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:

• app/bdsh/input.c (modified) (view diffs)
• app/edit/Makefile (modified) (view diffs)
• app/edit/edit.c (modified) (view diffs)
• app/edit/search.c (added)
• app/edit/search.h (added)
• app/edit/search_impl.h (added)
• app/edit/sheet.c (modified) (view diffs)
• app/edit/sheet.h (modified) (view diffs)
• app/vdemo/Makefile (modified) (view diffs)
• app/vlaunch/Makefile (modified) (view diffs)
• app/vlaunch/vlaunch.c (modified) (view diffs)
• app/vterm/Makefile (modified) (view diffs)
• drv/block/ahci/ahci.c (modified) (view diffs)
• drv/block/ahci/ahci.h (modified) (view diffs)
• drv/bus/isa/isa.c (modified) (view diffs)
• drv/bus/pci/pciintel/pci.c (modified) (view diffs)
• drv/bus/usb/ehci/main.c (modified) (view diffs)
• drv/bus/usb/ehci/res.c (modified) (view diffs)
• drv/bus/usb/ehci/res.h (modified) (view diffs)
• drv/bus/usb/ohci/hc.c (modified) (view diffs)
• drv/bus/usb/ohci/main.c (modified) (view diffs)
• drv/bus/usb/ohci/ohci.c (modified) (view diffs)
• drv/bus/usb/ohci/res.c (modified) (view diffs)
• drv/bus/usb/ohci/res.h (modified) (view diffs)
• drv/bus/usb/uhci/main.c (modified) (view diffs)
• drv/bus/usb/uhci/res.c (modified) (view diffs)
• drv/bus/usb/uhci/res.h (modified) (view diffs)
• drv/bus/usb/uhci/uhci.c (modified) (view diffs)
• drv/bus/usb/uhcirh/main.c (modified) (view diffs)
• drv/bus/usb/uhcirh/port.c (modified) (view diffs)
• drv/bus/usb/usbflbk/main.c (modified) (view diffs)
• drv/bus/usb/usbhid/generic/hiddev.c (modified) (view diffs)
• drv/bus/usb/usbhid/generic/hiddev.h (modified) (view diffs)
• drv/bus/usb/usbhid/kbd/kbddev.c (modified) (view diffs)
• drv/bus/usb/usbhid/main.c (modified) (view diffs)
• drv/bus/usb/usbhid/mouse/mousedev.c (modified) (view diffs)
• drv/bus/usb/usbhid/multimedia/multimedia.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/usbmast/main.c (modified) (view diffs)
• drv/bus/usb/usbmast/scsi_ms.c (modified) (view diffs)
• drv/bus/usb/usbmid/explore.c (modified) (view diffs)
• drv/bus/usb/usbmid/main.c (modified) (view diffs)
• drv/bus/usb/usbmid/usbmid.c (modified) (view diffs)
• drv/bus/usb/vhc/conndev.c (modified) (view diffs)
• drv/bus/usb/vhc/connhost.c (modified) (view diffs)
• drv/bus/usb/vhc/hub.c (modified) (view diffs)
• drv/bus/usb/vhc/main.c (modified) (view diffs)
• drv/char/i8042/i8042.c (modified) (view diffs)
• drv/char/i8042/main.c (modified) (view diffs)
• drv/char/ns8250/ns8250.c (modified) (view diffs)
• drv/char/ps2mouse/main.c (modified) (view diffs)
• drv/char/ps2mouse/ps2mouse.c (modified) (view diffs)
• drv/char/xtkbd/main.c (modified) (view diffs)
• drv/char/xtkbd/xtkbd.c (modified) (view diffs)
• drv/fb/kfb/port.c (modified) (view diffs)
• drv/infrastructure/root/root.c (modified) (view diffs)
• drv/infrastructure/rootmac/rootmac.c (modified) (view diffs)
• drv/infrastructure/rootpc/rootpc.c (modified) (view diffs)
• drv/infrastructure/rootvirt/rootvirt.c (modified) (view diffs)
• drv/nic/e1k/e1k.c (modified) (view diffs)
• drv/nic/ne2k/ne2k.c (modified) (view diffs)
• drv/nic/rtl8139/driver.c (modified) (view diffs)
• drv/test/test1/test1.c (modified) (view diffs)
• drv/test/test2/test2.c (modified) (view diffs)
• drv/test/test3/test3.c (modified) (view diffs)
• lib/c/Makefile (modified) (view diffs)
• lib/c/generic/io/input.c (added)
• lib/c/generic/str.c (modified) (view diffs)
• lib/c/include/io/console.h (modified) (view diffs)
• lib/c/include/io/input.h (added)
• lib/c/include/io/kbd_event.h (added)
• lib/c/include/str.h (modified) (view diffs)
• lib/drv/generic/driver.c (modified) (view diffs)
• lib/drv/generic/interrupt.c (modified) (view diffs)
• lib/drv/generic/private/driver.h (added)
• lib/drv/generic/remote_graph_dev.c (modified) (view diffs)
• lib/drv/include/ddf/driver.h (modified) (view diffs)
• lib/nic/src/nic_driver.c (modified) (view diffs)
• lib/nic/src/nic_impl.c (modified) (view diffs)
• lib/softfloat/generic/softfloat.c (modified) (view diffs)
• lib/softfloat/include/softfloat.h (modified) (view diffs)
• lib/usb/include/usb/hc.h (modified) (view diffs)
• lib/usb/src/ddfiface.c (modified) (view diffs)
• lib/usb/src/hc.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/recognise.c (modified) (view diffs)
• lib/usbhost/include/usb/host/hcd.h (modified) (view diffs)
• srv/hid/compositor/Makefile (modified) (view diffs)
• srv/hid/compositor/compositor.c (modified) (view diffs)
• srv/hid/console/console.c (modified) (view diffs)