Changeset b4ca0a9c in mainline for uspace

Timestamp:

2012-07-10T11:53:50Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1e01a35

Parents:

a33706e (diff), 33fc3ae (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:

• Makefile (modified) (view diffs)
• Makefile.common (modified) (view diffs)
• app/devctl/devctl.c (modified) (view diffs)
• app/killall/killall.c (modified) (view diffs)
• app/loc/loc.c (modified) (view diffs)
• app/msim/Makefile (added)
• app/msim/Makefile.msim.src (added)
• app/msim/arch_helenos/helenos.h (added)
• app/msim/arch_helenos/input.c (added)
• app/msim/arch_helenos/misc.c (added)
• app/msim/config.h.msim (added)
• app/nettest1/nettest1.c (modified) (view diffs)
• app/nettest2/nettest2.c (modified) (view diffs)
• app/sbi/src/mytypes.h (modified) (view diffs)
• app/sysinfo/sysinfo.c (modified) (view diffs)
• app/tester/hw/misc/virtchar1.c (modified) (view diffs)
• app/tester/mm/common.c (modified) (view diffs)
• app/tester/mm/mapping1.c (modified) (view diffs)
• app/trace/proto.h (modified) (view diffs)
• app/websrv/websrv.c (modified) (view diffs)
• drv/bus/isa/isa.c (modified) (view diffs)
• drv/bus/usb/ehci/res.c (modified) (view diffs)
• drv/bus/usb/ohci/utils/malloc32.h (modified) (view diffs)
• drv/bus/usb/uhci/res.c (modified) (view diffs)
• drv/bus/usb/uhci/utils/malloc32.h (modified) (view diffs)
• drv/bus/usb/usbmast/main.c (modified) (view diffs)
• lib/c/arch/ia64/include/fibril.h (modified) (view diffs)
• lib/c/arch/ia64/include/thread.h (modified) (view diffs)
• lib/c/generic/as.c (modified) (view diffs)
• lib/c/generic/async.c (modified) (view diffs)
• lib/c/generic/devman.c (modified) (view diffs)
• lib/c/generic/elf/elf_load.c (modified) (view diffs)
• lib/c/generic/fibril.c (modified) (view diffs)
• lib/c/generic/inet.c (modified) (view diffs)
• lib/c/generic/inetcfg.c (modified) (view diffs)
• lib/c/generic/inetping.c (modified) (view diffs)
• lib/c/generic/iplink.c (modified) (view diffs)
• lib/c/generic/loc.c (modified) (view diffs)
• lib/c/generic/malloc.c (modified) (view diffs)
• lib/c/generic/mman.c (modified) (view diffs)
• lib/c/generic/net/socket_client.c (modified) (view diffs)
• lib/c/generic/stacktrace.c (modified) (view diffs)
• lib/c/generic/stats.c (modified) (view diffs)
• lib/c/generic/sysinfo.c (modified) (view diffs)
• lib/c/generic/thread.c (modified) (view diffs)
• lib/c/generic/time.c (modified) (view diffs)
• lib/c/include/as.h (modified) (view diffs)
• lib/c/include/devman.h (modified) (view diffs)
• lib/c/include/errno.h (modified) (view diffs)
• lib/c/include/fibril.h (modified) (view diffs)
• lib/c/include/ipc/devman.h (modified) (view diffs)
• lib/c/include/ipc/loc.h (modified) (view diffs)
• lib/c/include/loc.h (modified) (view diffs)
• lib/c/include/stdarg.h (modified) (view diffs)
• lib/c/include/stdio.h (modified) (view diffs)
• lib/c/include/sys/mman.h (modified) (view diffs)
• lib/clui/tinput.h (modified) (view diffs)
• lib/drv/generic/driver.c (modified) (view diffs)
• lib/drv/generic/interrupt.c (modified) (view diffs)
• lib/drv/generic/log.c (modified) (view diffs)
• lib/drv/generic/logbuf.c (modified) (view diffs)
• lib/drv/include/ddf/driver.h (modified) (view diffs)
• lib/drv/include/ddf/interrupt.h (modified) (view diffs)
• lib/drv/include/ops/hw_res.h (modified) (view diffs)
• lib/drv/include/ops/nic.h (modified) (view diffs)
• lib/fb/imgmap.c (modified) (view diffs)
• lib/fb/screenbuffer.c (modified) (view diffs)
• lib/fs/libfs.c (modified) (view diffs)
• lib/nic/include/nic.h (modified) (view diffs)
• lib/nic/include/nic_impl.h (modified) (view diffs)
• lib/nic/src/nic_driver.c (modified) (view diffs)
• lib/posix/Makefile (modified) (view diffs)
• lib/posix/errno.h (modified) (view diffs)
• lib/posix/getopt.c (added)
• lib/posix/getopt.h (added)
• lib/posix/pwd.c (modified) (view diffs)
• lib/posix/stdbool.h (modified) (view diffs)
• lib/posix/stdio.h (modified) (view diffs)
• lib/posix/time.c (modified) (view diffs)
• lib/posix/unistd.c (modified) (view diffs)
• lib/posix/unistd.h (modified) (view diffs)
• lib/usb/include/usb/ddfiface.h (modified) (view diffs)
• lib/usb/include/usb/debug.h (modified) (view diffs)
• lib/usb/src/ddfiface.c (modified) (view diffs)
• lib/usb/src/hc.c (modified) (view diffs)
• lib/usbdev/include/usb/dev/driver.h (modified) (view diffs)
• lib/usbdev/include/usb/dev/hub.h (modified) (view diffs)
• lib/usbdev/include/usb/dev/recognise.h (modified) (view diffs)
• lib/usbdev/src/altiface.c (modified) (view diffs)
• lib/usbdev/src/hub.c (modified) (view diffs)
• lib/usbdev/src/recognise.c (modified) (view diffs)
• lib/usbhid/src/hidiface.c (modified) (view diffs)
• lib/usbhost/include/usb/host/hcd.h (modified) (view diffs)
• lib/usbhost/include/usb/host/usb_transfer_batch.h (modified) (view diffs)
• lib/usbhost/src/iface.c (modified) (view diffs)
• lib/usbvirt/src/device.c (modified) (view diffs)
• srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
• srv/bd/file_bd/file_bd.c (modified) (view diffs)
• srv/bd/gxe_bd/gxe_bd.c (modified) (view diffs)
• srv/bd/part/guid_part/guid_part.c (modified) (view diffs)
• srv/bd/part/mbr_part/mbr_part.c (modified) (view diffs)
• srv/bd/rd/rd.c (modified) (view diffs)
• srv/clipboard/clipboard.c (modified) (view diffs)
• srv/devman/devman.h (modified) (view diffs)
• srv/devman/main.c (modified) (view diffs)
• srv/fs/fat/fat_dentry.c (modified) (view diffs)
• srv/hid/console/console.c (modified) (view diffs)
• srv/hid/fb/fb.c (modified) (view diffs)
• srv/hid/input/ctl/kbdev.c (modified) (view diffs)
• srv/hid/input/generic/input.c (modified) (view diffs)
• srv/hid/input/port/adb.c (modified) (view diffs)
• srv/hid/input/proto/mousedev.c (modified) (view diffs)
• srv/hid/remcons/remcons.c (modified) (view diffs)
• srv/hid/remcons/telnet.h (modified) (view diffs)
• srv/hid/remcons/user.h (modified) (view diffs)
• srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• srv/loader/main.c (modified) (view diffs)
• srv/locsrv/locsrv.c (modified) (view diffs)
• srv/locsrv/locsrv.h (modified) (view diffs)
• srv/net/ethip/ethip.c (modified) (view diffs)
• srv/net/ethip/ethip_nic.c (modified) (view diffs)
• srv/net/inetsrv/inetsrv.c (modified) (view diffs)
• srv/net/loopip/loopip.c (modified) (view diffs)
• srv/net/tcp/sock.c (modified) (view diffs)
• srv/net/udp/sock.c (modified) (view diffs)
• srv/net/udp/udp.c (modified) (view diffs)
• srv/net/udp/udp_type.h (modified) (view diffs)
• srv/ns/ns.c (modified) (view diffs)
• srv/vfs/vfs.c (modified) (view diffs)