Changeset c2a6983 in mainline for uspace

Timestamp:

2013-10-13T20:59:33Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

12d6c98

Parents:

820104d (diff), 39bcc99 (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/bdsh/cmds/modules/mount/mount.c (modified) (view diffs)
• app/corecfg/Makefile (moved) (moved from uspace/app/ping6/Makefile ) (view diffs)
• app/corecfg/corecfg.c (added)
• app/devctl/devctl.c (modified) (view diffs)
• app/df/Makefile (added)
• app/df/df.c (added)
• app/dnsres/dnsres.c (modified) (view diffs)
• app/download/Makefile (added)
• app/download/main.c (added)
• app/edit/sheet.c (modified) (view diffs)
• app/getterm/getterm.c (modified) (view diffs)
• app/inet/inet.c (modified) (view diffs)
• app/init/init.c (modified) (view diffs)
• app/klog/klog.c (modified) (view diffs)
• app/mixerctl/Makefile (added)
• app/mixerctl/mixerctl.c (added)
• app/netspeed/Makefile (added)
• app/netspeed/netspeed.c (added)
• 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/ping/ping.c (modified) (view diffs)
• app/ping6/ping6.c (deleted)
• app/sportdmp/sportdmp.c (modified) (view diffs)
• app/tester/mm/common.c (modified) (view diffs)
• app/trace/trace.c (modified) (view diffs)
• app/usbinfo/dump.c (modified) (view diffs)
• app/usbinfo/hid.c (modified) (view diffs)
• app/viewer/Makefile (added)
• app/viewer/viewer.c (added)
• app/wavplay/Makefile (added)
• app/wavplay/dplay.c (added)
• app/wavplay/dplay.h (added)
• app/wavplay/drec.c (added)
• app/wavplay/drec.h (added)
• app/wavplay/main.c (added)
• app/wavplay/wave.c (added)
• app/wavplay/wave.h (added)
• dist/logo.tga (added)
• drv/audio/sb16/Makefile (added)
• drv/audio/sb16/ddf_log.h (added)
• drv/audio/sb16/dsp.c (added)
• drv/audio/sb16/dsp.h (added)
• drv/audio/sb16/dsp_commands.h (added)
• drv/audio/sb16/main.c (added)
• drv/audio/sb16/mixer.c (added)
• drv/audio/sb16/mixer.h (added)
• drv/audio/sb16/mixer_iface.c (added)
• drv/audio/sb16/pcm_iface.c (added)
• drv/audio/sb16/registers.h (added)
• drv/audio/sb16/sb16.c (added)
• drv/audio/sb16/sb16.h (added)
• drv/audio/sb16/sb16.ma (added)
• drv/block/ahci/ahci.c (modified) (view diffs)
• drv/block/ata_bd/ata_bd.c (modified) (view diffs)
• drv/block/ata_bd/main.c (modified) (view diffs)
• drv/bus/isa/i8237.c (modified) (view diffs)
• drv/bus/isa/i8237.h (modified) (view diffs)
• drv/bus/isa/isa.c (modified) (view diffs)
• drv/bus/pci/pciintel/pci.c (modified) (view diffs)
• drv/bus/pci/pciintel/pci.h (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/hc.h (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/hc.c (modified) (view diffs)
• drv/bus/usb/uhci/hc.h (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/uhci/utils/malloc32.h (modified) (view diffs)
• drv/bus/usb/uhcirh/main.c (modified) (view diffs)
• drv/bus/usb/uhcirh/root_hub.c (modified) (view diffs)
• drv/bus/usb/uhcirh/root_hub.h (modified) (view diffs)
• drv/bus/usb/usbmid/explore.c (modified) (view diffs)
• drv/bus/usb/usbmid/usbmid.c (modified) (view diffs)
• drv/bus/usb/vhc/transfer.c (modified) (view diffs)
• drv/char/i8042/i8042.c (modified) (view diffs)
• drv/char/i8042/i8042.h (modified) (view diffs)
• drv/char/i8042/main.c (modified) (view diffs)
• drv/fb/amdm37x_dispc/amdm37x_dispc.c (modified) (view diffs)
• drv/fb/kfb/port.c (modified) (view diffs)
• drv/infrastructure/root/root.c (modified) (view diffs)
• drv/infrastructure/rootamdm37x/rootamdm37x.c (modified) (view diffs)
• drv/infrastructure/rootamdm37x/uhh.h (modified) (view diffs)
• drv/infrastructure/rootmac/rootmac.c (modified) (view diffs)
• drv/infrastructure/rootmalta/Makefile (added)
• drv/infrastructure/rootmalta/rootmalta.c (added)
• drv/infrastructure/rootmalta/rootmalta.ma (added)
• drv/infrastructure/rootpc/rootpc.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/nic/rtl8139/driver.h (modified) (view diffs)
• lib/block/block.c (modified) (view diffs)
• lib/block/block.h (modified) (view diffs)
• lib/c/Makefile (modified) (view diffs)
• lib/c/arch/sparc64/Makefile.common (modified) (view diffs)
• lib/c/generic/adt/hash_table.c (modified) (view diffs)
• lib/c/generic/adt/list.c (modified) (view diffs)
• lib/c/generic/async.c (modified) (view diffs)
• lib/c/generic/cfg.c (modified) (view diffs)
• lib/c/generic/corecfg.c (added)
• lib/c/generic/ddi.c (modified) (view diffs)
• lib/c/generic/device/hw_res.c (modified) (view diffs)
• lib/c/generic/device/hw_res_parsed.c (modified) (view diffs)
• lib/c/generic/device/pio_window.c (added)
• lib/c/generic/devman.c (modified) (view diffs)
• lib/c/generic/dhcp.c (added)
• lib/c/generic/dnsr.c (modified) (view diffs)
• lib/c/generic/futex.c (modified) (view diffs)
• lib/c/generic/inet.c (modified) (view diffs)
• lib/c/generic/inet/addr.c (modified) (view diffs)
• lib/c/generic/inetcfg.c (modified) (view diffs)
• lib/c/generic/inetping.c (modified) (view diffs)
• lib/c/generic/inetping6.c (deleted)
• lib/c/generic/io/asprintf.c (modified) (view diffs)
• lib/c/generic/iplink.c (modified) (view diffs)
• lib/c/generic/iplink_srv.c (modified) (view diffs)
• lib/c/generic/net/socket_client.c (modified) (view diffs)
• lib/c/generic/pio_trace.c (modified) (view diffs)
• lib/c/generic/time.c (modified) (view diffs)
• lib/c/generic/vfs/vfs.c (modified) (view diffs)
• lib/c/include/adt/list.h (modified) (view diffs)
• lib/c/include/async.h (modified) (view diffs)
• lib/c/include/cfg.h (modified) (view diffs)
• lib/c/include/corecfg.h (added)
• lib/c/include/ddi.h (modified) (view diffs)
• lib/c/include/device/hw_res.h (modified) (view diffs)
• lib/c/include/device/hw_res_parsed.h (modified) (view diffs)
• lib/c/include/device/pio_window.h (added)
• lib/c/include/devman.h (modified) (view diffs)
• lib/c/include/inet/addr.h (modified) (view diffs)
• lib/c/include/inet/dhcp.h (added)
• lib/c/include/inet/dnsr.h (modified) (view diffs)
• lib/c/include/inet/inet.h (modified) (view diffs)
• lib/c/include/inet/inetcfg.h (modified) (view diffs)
• lib/c/include/inet/inetping.h (modified) (view diffs)
• lib/c/include/inet/iplink.h (modified) (view diffs)
• lib/c/include/inet/iplink_srv.h (modified) (view diffs)
• lib/c/include/ipc/corecfg.h (added)
• lib/c/include/ipc/dev_iface.h (modified) (view diffs)
• lib/c/include/ipc/devman.h (modified) (view diffs)
• lib/c/include/ipc/dhcp.h (added)
• lib/c/include/ipc/inet.h (modified) (view diffs)
• lib/c/include/ipc/services.h (modified) (view diffs)
• lib/c/include/ipc/socket.h (modified) (view diffs)
• lib/c/include/ipc/vfs.h (modified) (view diffs)
• lib/c/include/macros.h (modified) (view diffs)
• lib/c/include/net/ip_codes.h (deleted)
• lib/c/include/net/socket.h (modified) (view diffs)
• lib/c/include/net/socket_codes.h (modified) (view diffs)
• lib/c/include/stdio.h (modified) (view diffs)
• lib/c/include/sys/statfs.h (added)
• lib/c/include/types/inet.h (moved) (moved from uspace/lib/c/include/net/device.h ) (view diffs)
• lib/c/include/types/inetcfg.h (added)
• lib/c/include/types/inetping.h (moved) (moved from uspace/lib/c/include/inet/inetping6.h ) (view diffs)
• lib/c/include/vfs/vfs.h (modified) (view diffs)
• lib/draw/drawctx.c (modified) (view diffs)
• lib/drv/Makefile (modified) (view diffs)
• lib/drv/generic/dev_iface.c (modified) (view diffs)
• lib/drv/generic/driver.c (modified) (view diffs)
• lib/drv/generic/interrupt.c (modified) (view diffs)
• lib/drv/generic/remote_audio_mixer.c (added)
• lib/drv/generic/remote_audio_pcm.c (added)
• lib/drv/generic/remote_hw_res.c (modified) (view diffs)
• lib/drv/generic/remote_pio_window.c (added)
• lib/drv/include/audio_mixer_iface.h (added)
• lib/drv/include/audio_pcm_iface.h (added)
• lib/drv/include/ops/hw_res.h (modified) (view diffs)
• lib/drv/include/ops/pio_window.h (added)
• lib/drv/include/remote_audio_mixer.h (added)
• lib/drv/include/remote_audio_pcm.h (added)
• lib/drv/include/remote_pio_window.h (added)
• lib/ext4/libext4_filesystem.c (modified) (view diffs)
• lib/fs/libfs.c (modified) (view diffs)
• lib/fs/libfs.h (modified) (view diffs)
• lib/graph/graph.c (modified) (view diffs)
• lib/gui/canvas.c (modified) (view diffs)
• lib/gui/canvas.h (modified) (view diffs)
• lib/gui/connection.c (modified) (view diffs)
• lib/gui/grid.c (modified) (view diffs)
• lib/gui/terminal.c (modified) (view diffs)
• lib/gui/window.c (modified) (view diffs)
• lib/hound/Makefile (added)
• lib/hound/include/hound/client.h (added)
• lib/hound/include/hound/protocol.h (added)
• lib/hound/include/hound/server.h (added)
• lib/hound/src/client.c (added)
• lib/hound/src/protocol.c (added)
• lib/http/Makefile (added)
• lib/http/include/http/ctype.h (added)
• lib/http/include/http/errno.h (added)
• lib/http/include/http/http.h (added)
• lib/http/include/http/receive-buffer.h (added)
• lib/http/src/headers.c (added)
• lib/http/src/http.c (added)
• lib/http/src/receive-buffer.c (added)
• lib/http/src/request.c (added)
• lib/http/src/response.c (added)
• lib/net/include/socket_core.h (modified) (view diffs)
• lib/pcm/Makefile (added)
• lib/pcm/include/pcm/format.h (added)
• lib/pcm/include/pcm/sample_format.h (added)
• lib/pcm/src/format.c (added)
• lib/posix/include/posix/time.h (modified) (view diffs)
• lib/posix/source/time.c (modified) (view diffs)
• lib/softfloat/softfloat.c (modified) (view diffs)
• lib/softfloat/softfloat.h (modified) (view diffs)
• lib/uri/Makefile (added)
• lib/uri/ctype.h (added)
• lib/uri/uri.c (added)
• lib/uri/uri.h (added)
• lib/usbdev/src/recognise.c (modified) (view diffs)
• lib/usbhid/src/hiddescriptor.c (modified) (view diffs)
• lib/usbhid/src/hidparser.c (modified) (view diffs)
• lib/usbhid/src/hidpath.c (modified) (view diffs)
• lib/usbhost/src/usb_endpoint_manager.c (modified) (view diffs)
• srv/audio/hound/Makefile (added)
• srv/audio/hound/audio_data.c (added)
• srv/audio/hound/audio_data.h (added)
• srv/audio/hound/audio_device.c (added)
• srv/audio/hound/audio_device.h (added)
• srv/audio/hound/audio_sink.c (added)
• srv/audio/hound/audio_sink.h (added)
• srv/audio/hound/audio_source.c (added)
• srv/audio/hound/audio_source.h (added)
• srv/audio/hound/connection.c (added)
• srv/audio/hound/connection.h (added)
• srv/audio/hound/hound.c (added)
• srv/audio/hound/hound.h (added)
• srv/audio/hound/hound_ctx.c (added)
• srv/audio/hound/hound_ctx.h (added)
• srv/audio/hound/iface.c (added)
• srv/audio/hound/log.h (added)
• srv/audio/hound/main.c (added)
• srv/bd/rd/rd.c (modified) (view diffs)
• srv/devman/Makefile (modified) (view diffs)
• srv/devman/client_conn.c (added)
• srv/devman/client_conn.h (added)
• srv/devman/dev.c (added)
• srv/devman/dev.h (added)
• srv/devman/devman.c (deleted)
• srv/devman/devman.h (modified) (view diffs)
• srv/devman/devtree.c (added)
• srv/devman/devtree.h (added)
• srv/devman/driver.c (added)
• srv/devman/driver.h (added)
• srv/devman/drv_conn.c (added)
• srv/devman/drv_conn.h (added)
• srv/devman/fun.c (added)
• srv/devman/fun.h (added)
• srv/devman/loc.c (added)
• srv/devman/loc.h (added)
• srv/devman/main.c (modified) (view diffs)
• srv/devman/main.h (added)
• srv/devman/match.c (modified) (view diffs)
• srv/devman/match.h (added)
• srv/devman/util.c (modified) (view diffs)
• srv/devman/util.h (modified) (view diffs)
• srv/fs/cdfs/cdfs_ops.c (modified) (view diffs)
• srv/fs/exfat/exfat_idx.c (modified) (view diffs)
• srv/fs/exfat/exfat_ops.c (modified) (view diffs)
• srv/fs/ext4fs/ext4fs_ops.c (modified) (view diffs)
• srv/fs/fat/fat_idx.c (modified) (view diffs)
• srv/fs/fat/fat_ops.c (modified) (view diffs)
• srv/fs/mfs/mfs.h (modified) (view diffs)
• srv/fs/mfs/mfs_balloc.c (modified) (view diffs)
• srv/fs/mfs/mfs_ops.c (modified) (view diffs)
• srv/fs/mfs/mfs_rw.c (modified) (view diffs)
• srv/fs/tmpfs/tmpfs_ops.c (modified) (view diffs)
• srv/fs/udf/udf_ops.c (modified) (view diffs)
• srv/hid/compositor/compositor.c (modified) (view diffs)
• srv/hid/input/input.c (modified) (view diffs)
• srv/hid/input/port/niagara.c (modified) (view diffs)
• srv/hid/output/output.c (modified) (view diffs)
• srv/hid/output/port/ega.c (modified) (view diffs)
• srv/hid/output/port/kchar.c (modified) (view diffs)
• srv/hid/output/port/niagara.c (modified) (view diffs)
• srv/hid/remcons/user.c (modified) (view diffs)
• srv/hid/rfb/Makefile (added)
• srv/hid/rfb/main.c (added)
• srv/hid/rfb/rfb.c (added)
• srv/hid/rfb/rfb.h (added)
• srv/hw/irc/obio/obio.c (modified) (view diffs)
• srv/locsrv/category.c (modified) (view diffs)
• srv/locsrv/locsrv.c (modified) (view diffs)
• srv/logger/logs.c (modified) (view diffs)
• srv/net/dhcp/Makefile (added)
• srv/net/dhcp/dhcp.c (added)
• srv/net/dhcp/dhcp.h (moved) (moved from uspace/srv/net/inetsrv/inetping6.h ) (view diffs)
• srv/net/dhcp/dhcp_std.h (added)
• srv/net/dhcp/main.c (added)
• srv/net/dhcp/transport.c (added)
• srv/net/dhcp/transport.h (added)
• srv/net/dnsrsrv/dns_msg.c (modified) (view diffs)
• srv/net/dnsrsrv/dnsrsrv.c (modified) (view diffs)
• srv/net/dnsrsrv/query.c (modified) (view diffs)
• srv/net/dnsrsrv/query.h (modified) (view diffs)
• srv/net/dnsrsrv/transport.c (modified) (view diffs)
• srv/net/ethip/arp.c (modified) (view diffs)
• srv/net/ethip/atrans.c (modified) (view diffs)
• srv/net/ethip/ethip.c (modified) (view diffs)
• srv/net/ethip/ethip_nic.c (modified) (view diffs)
• srv/net/inetsrv/Makefile (modified) (view diffs)
• srv/net/inetsrv/addrobj.c (modified) (view diffs)
• srv/net/inetsrv/icmp.c (modified) (view diffs)
• srv/net/inetsrv/icmp.h (modified) (view diffs)
• srv/net/inetsrv/icmpv6.c (modified) (view diffs)
• srv/net/inetsrv/icmpv6.h (modified) (view diffs)
• srv/net/inetsrv/inet_link.c (modified) (view diffs)
• srv/net/inetsrv/inet_link.h (modified) (view diffs)
• srv/net/inetsrv/inetcfg.c (modified) (view diffs)
• srv/net/inetsrv/inetping.c (modified) (view diffs)
• srv/net/inetsrv/inetping.h (modified) (view diffs)
• srv/net/inetsrv/inetping6.c (deleted)
• srv/net/inetsrv/inetsrv.c (modified) (view diffs)
• srv/net/inetsrv/inetsrv.h (modified) (view diffs)
• srv/net/inetsrv/ndp.c (modified) (view diffs)
• srv/net/inetsrv/ntrans.c (modified) (view diffs)
• srv/net/inetsrv/pdu.c (modified) (view diffs)
• srv/net/inetsrv/reass.c (modified) (view diffs)
• srv/net/inetsrv/sroute.c (modified) (view diffs)
• srv/net/loopip/loopip.c (modified) (view diffs)
• srv/net/nconfsrv/Makefile (added)
• srv/net/nconfsrv/iplink.c (added)
• srv/net/nconfsrv/iplink.h (added)
• srv/net/nconfsrv/nconfsrv.c (added)
• srv/net/nconfsrv/nconfsrv.h (added)
• srv/net/slip/slip.c (modified) (view diffs)
• srv/net/tcp/conn.c (modified) (view diffs)
• srv/net/tcp/conn.h (modified) (view diffs)
• srv/net/tcp/pdu.c (modified) (view diffs)
• srv/net/tcp/sock.c (modified) (view diffs)
• srv/net/tcp/tcp.c (modified) (view diffs)
• srv/net/tcp/ucall.c (modified) (view diffs)
• srv/net/udp/assoc.c (modified) (view diffs)
• srv/net/udp/assoc.h (modified) (view diffs)
• srv/net/udp/pdu.c (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_inet.c (modified) (view diffs)
• srv/net/udp/udp_type.h (modified) (view diffs)
• srv/ns/service.c (modified) (view diffs)
• srv/ns/task.c (modified) (view diffs)
• srv/taskmon/taskmon.c (modified) (view diffs)
• srv/vfs/vfs.c (modified) (view diffs)
• srv/vfs/vfs.h (modified) (view diffs)
• srv/vfs/vfs_ops.c (modified) (view diffs)
• srv/vfs/vfs_register.c (modified) (view diffs)