Changeset 192565b in mainline for uspace

Timestamp:

2013-05-27T13:18:13Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f2c19b0

Parents:

d120133 (diff), c90aed4 (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)
• app/bdsh/cmds/modules/cat/cat.c (modified) (view diffs)
• app/bdsh/cmds/modules/cmp/cmp.c (modified) (view diffs)
• app/bdsh/cmds/modules/cp/cp.c (modified) (view diffs)
• app/bdsh/cmds/modules/ls/ls.c (modified) (view diffs)
• app/bdsh/cmds/modules/sleep/sleep.c (modified) (view diffs)
• app/bnchmark/bnchmark.c (modified) (view diffs)
• app/dnscfg/Makefile (added)
• app/dnscfg/dnscfg.c (added)
• app/dnsres/Makefile (added)
• app/dnsres/dnsres.c (added)
• app/edit/edit.c (modified) (view diffs)
• app/inet/inet.c (modified) (view diffs)
• app/init/init.c (modified) (view diffs)
• app/mkbd/main.c (modified) (view diffs)
• app/msim/arch_helenos/input.c (modified) (view diffs)
• app/nettest1/nettest1.c (modified) (view diffs)
• app/nettest2/nettest2.c (modified) (view diffs)
• app/nettest3/nettest3.c (modified) (view diffs)
• app/nterm/conn.c (modified) (view diffs)
• app/nterm/nterm.c (modified) (view diffs)
• app/ping/ping.c (modified) (view diffs)
• app/taskdump/symtab.c (modified) (view diffs)
• app/tester/ipc/starve.c (modified) (view diffs)
• app/tetris/scores.c (modified) (view diffs)
• app/tetris/screen.c (modified) (view diffs)
• app/top/screen.c (modified) (view diffs)
• app/trace/ipc_desc.c (modified) (view diffs)
• app/trace/ipc_desc.h (modified) (view diffs)
• app/trace/ipcp.c (modified) (view diffs)
• app/trace/syscalls.c (modified) (view diffs)
• app/trace/syscalls.h (modified) (view diffs)
• app/trace/trace.c (modified) (view diffs)
• app/vdemo/vdemo.c (modified) (view diffs)
• app/vlaunch/Makefile (modified) (view diffs)
• app/vlaunch/gfx/helenos.tga (added)
• app/vlaunch/vlaunch.c (modified) (view diffs)
• dist/src/c/demos/tetris/scores.c (modified) (view diffs)
• dist/src/c/demos/top/screen.c (modified) (view diffs)
• drv/block/ahci/ahci.c (modified) (view diffs)
• drv/bus/pci/pciintel/pci.c (modified) (view diffs)
• drv/bus/pci/pciintel/pci.h (modified) (view diffs)
• drv/bus/pci/pciintel/pci_regs.h (modified) (view diffs)
• drv/bus/usb/ohci/hc.c (modified) (view diffs)
• drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c (modified) (view diffs)
• drv/bus/usb/ohci/hw_struct/hcca.h (modified) (view diffs)
• drv/bus/usb/ohci/hw_struct/transfer_descriptor.c (modified) (view diffs)
• drv/bus/usb/uhci/uhci_batch.c (modified) (view diffs)
• drv/bus/usb/usbhub/port.c (modified) (view diffs)
• drv/bus/usb/usbmast/scsi_ms.c (modified) (view diffs)
• drv/char/i8042/buffer.h (modified) (view diffs)
• drv/char/ns8250/ns8250.c (modified) (view diffs)
• drv/nic/e1k/e1k.c (modified) (view diffs)
• drv/nic/ne2k/dp8390.c (modified) (view diffs)
• drv/nic/rtl8139/driver.c (modified) (view diffs)
• lib/bithenge/src/blob.c (modified) (view diffs)
• lib/c/Makefile (modified) (view diffs)
• lib/c/arch/ia32/src/setjmp.S (modified) (view diffs)
• lib/c/generic/adt/hash_table.c (modified) (view diffs)
• lib/c/generic/async.c (modified) (view diffs)
• lib/c/generic/device/hw_res_parsed.c (modified) (view diffs)
• lib/c/generic/dnsr.c (added)
• lib/c/generic/inet/addr.c (added)
• lib/c/generic/io/con_srv.c (modified) (view diffs)
• lib/c/generic/io/console.c (modified) (view diffs)
• lib/c/generic/mem.c (modified) (view diffs)
• lib/c/generic/net/inet.c (modified) (view diffs)
• lib/c/generic/net/socket_client.c (modified) (view diffs)
• lib/c/include/device/hw_res_parsed.h (modified) (view diffs)
• lib/c/include/inet/addr.h (added)
• lib/c/include/inet/dnsr.h (added)
• lib/c/include/inet/inet.h (modified) (view diffs)
• lib/c/include/inet/inetcfg.h (modified) (view diffs)
• lib/c/include/io/con_srv.h (modified) (view diffs)
• lib/c/include/io/cons_event.h (added)
• lib/c/include/io/console.h (modified) (view diffs)
• lib/c/include/io/pos_event.h (added)
• lib/c/include/io/window.h (modified) (view diffs)
• lib/c/include/ipc/dnsr.h (added)
• lib/c/include/ipc/services.h (modified) (view diffs)
• lib/c/include/mem.h (modified) (view diffs)
• lib/c/include/setjmp.h (modified) (view diffs)
• lib/c/include/sys/types.h (modified) (view diffs)
• lib/clui/tinput.c (modified) (view diffs)
• lib/clui/tinput.h (modified) (view diffs)
• lib/drv/generic/remote_nic.c (modified) (view diffs)
• lib/ext4/libext4_directory.c (modified) (view diffs)
• lib/gui/Makefile (modified) (view diffs)
• lib/gui/canvas.c (added)
• lib/gui/canvas.h (added)
• lib/gui/grid.c (modified) (view diffs)
• lib/gui/grid.h (modified) (view diffs)
• lib/gui/terminal.c (modified) (view diffs)
• lib/gui/window.c (modified) (view diffs)
• lib/nic/src/nic_addr_db.c (modified) (view diffs)
• lib/nic/src/nic_driver.c (modified) (view diffs)
• lib/nic/src/nic_impl.c (modified) (view diffs)
• lib/nic/src/nic_rx_control.c (modified) (view diffs)
• lib/nic/src/nic_wol_virtues.c (modified) (view diffs)
• lib/posix/include/posix/fcntl.h (modified) (view diffs)
• lib/posix/include/posix/float.h (modified) (view diffs)
• lib/posix/include/posix/limits.h (modified) (view diffs)
• lib/posix/include/posix/math.h (modified) (view diffs)
• lib/posix/include/posix/stdio.h (modified) (view diffs)
• lib/posix/source/math.c (modified) (view diffs)
• lib/posix/source/strings.c (modified) (view diffs)
• lib/usb/src/debug.c (modified) (view diffs)
• srv/devman/main.c (modified) (view diffs)
• srv/fs/cdfs/cdfs_ops.c (modified) (view diffs)
• srv/fs/fat/fat_dentry.c (modified) (view diffs)
• srv/fs/fat/fat_dentry.h (modified) (view diffs)
• srv/fs/fat/fat_directory.c (modified) (view diffs)
• srv/fs/fat/fat_ops.c (modified) (view diffs)
• srv/fs/mfs/mfs_dentry.c (modified) (view diffs)
• srv/fs/mfs/mfs_ops.c (modified) (view diffs)
• srv/fs/udf/udf_volume.c (modified) (view diffs)
• srv/hid/compositor/Makefile (modified) (view diffs)
• srv/hid/compositor/compositor.c (modified) (view diffs)
• srv/hid/compositor/gfx/helenos.tga (deleted)
• srv/hid/console/console.c (modified) (view diffs)
• srv/hid/remcons/remcons.c (modified) (view diffs)
• srv/net/dnsrsrv/Makefile (added)
• srv/net/dnsrsrv/dns_msg.c (added)
• srv/net/dnsrsrv/dns_msg.h (added)
• srv/net/dnsrsrv/dns_std.h (added)
• srv/net/dnsrsrv/dns_type.h (added)
• srv/net/dnsrsrv/dnsrsrv.c (added)
• srv/net/dnsrsrv/query.c (added)
• srv/net/dnsrsrv/query.h (moved) (moved from kernel/genarch/include/genarch/fb/logo-196x66.h ) (view diffs)
• srv/net/dnsrsrv/transport.c (added)
• srv/net/dnsrsrv/transport.h (added)
• srv/net/ethip/ethip.c (modified) (view diffs)
• srv/net/inetsrv/addrobj.c (modified) (view diffs)
• srv/net/inetsrv/inet_link.c (modified) (view diffs)
• srv/net/inetsrv/inetsrv.c (modified) (view diffs)
• srv/net/inetsrv/inetsrv.h (modified) (view diffs)
• srv/net/udp/assoc.c (modified) (view diffs)
• srv/net/udp/assoc.h (modified) (view diffs)
• srv/net/udp/sock.c (modified) (view diffs)
• srv/net/udp/ucall.c (modified) (view diffs)
• srv/net/udp/ucall.h (modified) (view diffs)
• srv/net/udp/udp_type.h (modified) (view diffs)
• srv/ns/task.c (modified) (view diffs)