Changeset a1347a7 in mainline

Timestamp:

2012-01-15T13:51:09Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

bd79281

Parents:

03e0a244 (diff), f302586 (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)
• boot/arch/ia64/Makefile.inc (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/app/init/init.c (modified) (view diffs)
• uspace/drv/bus/isa/isa.c (modified) (view diffs)
• uspace/drv/bus/isa/isa.dev (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/char/i8042/Makefile (moved) (moved from uspace/srv/hw/char/i8042/Makefile ) (view diffs)
• uspace/drv/char/i8042/buffer.h (added)
• uspace/drv/char/i8042/i8042.c (added)
• uspace/drv/char/i8042/i8042.h (added)
• uspace/drv/char/i8042/i8042.ma (added)
• uspace/drv/char/i8042/main.c (added)
• uspace/drv/char/ps2mouse/Makefile (added)
• uspace/drv/char/ps2mouse/chardev.c (added)
• uspace/drv/char/ps2mouse/chardev.h (moved) (moved from uspace/srv/hw/char/i8042/i8042.h ) (view diffs)
• uspace/drv/char/ps2mouse/main.c (added)
• uspace/drv/char/ps2mouse/ps2mouse.c (added)
• uspace/drv/char/ps2mouse/ps2mouse.h (added)
• uspace/drv/char/ps2mouse/ps2mouse.ma (added)
• uspace/drv/char/xtkbd/Makefile (added)
• uspace/drv/char/xtkbd/chardev.c (added)
• uspace/drv/char/xtkbd/chardev.h (added)
• uspace/drv/char/xtkbd/main.c (added)
• uspace/drv/char/xtkbd/xtkbd.c (added)
• uspace/drv/char/xtkbd/xtkbd.h (added)
• uspace/drv/char/xtkbd/xtkbd.ma (added)
• uspace/drv/nic/e1k/e1k.c (modified) (view diffs)
• uspace/drv/nic/lo/lo.c (modified) (view diffs)
• uspace/drv/nic/ne2k/dp8390.c (modified) (view diffs)
• uspace/drv/nic/ne2k/dp8390.h (modified) (view diffs)
• uspace/drv/nic/ne2k/ne2k.c (modified) (view diffs)
• uspace/drv/nic/rtl8139/driver.c (modified) (view diffs)
• uspace/lib/c/generic/async.c (modified) (view diffs)
• uspace/lib/c/generic/device/nic.c (modified) (view diffs)
• uspace/lib/c/generic/devman.c (modified) (view diffs)
• uspace/lib/c/generic/loc.c (modified) (view diffs)
• uspace/lib/c/include/device/nic.h (modified) (view diffs)
• uspace/lib/c/include/devman.h (modified) (view diffs)
• uspace/lib/c/include/loc.h (modified) (view diffs)
• uspace/lib/drv/generic/driver.c (modified) (view diffs)
• uspace/lib/drv/generic/remote_nic.c (modified) (view diffs)
• uspace/lib/drv/include/ops/nic.h (modified) (view diffs)
• uspace/lib/nic/include/nic.h (modified) (view diffs)
• uspace/lib/nic/include/nic_driver.h (modified) (view diffs)
• uspace/lib/nic/include/nic_impl.h (modified) (view diffs)
• uspace/lib/nic/src/nic_driver.c (modified) (view diffs)
• uspace/lib/nic/src/nic_impl.c (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
• uspace/srv/bd/file_bd/file_bd.c (modified) (view diffs)
• uspace/srv/bd/gxe_bd/gxe_bd.c (modified) (view diffs)
• uspace/srv/bd/part/guid_part/guid_part.c (modified) (view diffs)
• uspace/srv/bd/part/mbr_part/mbr_part.c (modified) (view diffs)
• uspace/srv/bd/rd/rd.c (modified) (view diffs)
• uspace/srv/devman/main.c (modified) (view diffs)
• uspace/srv/hid/console/console.c (modified) (view diffs)
• uspace/srv/hid/fb/fb.c (modified) (view diffs)
• uspace/srv/hid/input/Makefile (modified) (view diffs)
• uspace/srv/hid/input/generic/input.c (modified) (view diffs)
• uspace/srv/hid/input/include/mouse.h (modified) (view diffs)
• uspace/srv/hid/input/include/mouse_proto.h (modified) (view diffs)
• uspace/srv/hid/input/port/chardev.c (modified) (view diffs)
• uspace/srv/hid/input/port/chardev_mouse.c (deleted)
• uspace/srv/hid/input/proto/adb.c (modified) (view diffs)
• uspace/srv/hid/input/proto/mousedev.c (modified) (view diffs)
• uspace/srv/hid/input/proto/ps2.c (deleted)
• uspace/srv/hid/remcons/remcons.c (modified) (view diffs)
• uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• uspace/srv/hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
• uspace/srv/hw/char/i8042/i8042.c (deleted)
• uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• uspace/srv/net/nil/eth/eth.c (modified) (view diffs)
• uspace/srv/net/nil/nildummy/nildummy.c (modified) (view diffs)