Changeset 6843a9c in mainline for uspace/lib/c

Timestamp:

2012-06-29T13:02:14Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

Location:

uspace/lib/c

Files:

• Makefile (modified) (view diffs)
• arch/amd64/include/fibril.h (modified) (view diffs)
• arch/arm32/Makefile.common (modified) (view diffs)
• arch/arm32/include/fibril.h (modified) (view diffs)
• arch/arm32/src/eabi.S (modified) (view diffs)
• arch/ia32/include/fibril.h (modified) (view diffs)
• arch/ia64/include/ddi.h (modified) (view diffs)
• arch/ia64/include/fibril.h (modified) (view diffs)
• arch/ia64/include/thread.h (modified) (view diffs)
• arch/mips32/Makefile.inc (modified) (view diffs)
• arch/mips32/include/atomic.h (modified) (view diffs)
• arch/mips32/include/config.h (modified) (view diffs)
• arch/mips32/include/faddr.h (modified) (view diffs)
• arch/mips32/include/fibril.h (modified) (view diffs)
• arch/mips32/include/stack.h (added)
• arch/mips32/src/entry.S (moved) (moved from uspace/lib/c/arch/mips64/src/entry.s ) (view diffs)
• arch/mips32/src/entryjmp.S (moved) (moved from uspace/lib/c/arch/mips64/src/entryjmp.s ) (view diffs)
• arch/mips32/src/fibril.S (modified) (view diffs)
• arch/mips32/src/syscall.c (modified) (view diffs)
• arch/mips32/src/thread_entry.S (moved) (moved from uspace/lib/c/arch/mips64/src/thread_entry.s ) (view diffs)
• arch/mips32eb/Makefile.inc (modified) (view diffs)
• arch/mips32eb/include/stack.h (added)
• arch/mips64/Makefile.inc (modified) (view diffs)
• arch/mips64/include/fibril.h (modified) (view diffs)
• arch/mips64/include/stack.h (added)
• arch/mips64/src/entry.S (moved) (moved from uspace/lib/c/arch/mips32/src/entry.s ) (view diffs)
• arch/mips64/src/entryjmp.S (moved) (moved from uspace/lib/c/arch/mips32/src/entryjmp.s ) (view diffs)
• arch/mips64/src/thread_entry.S (moved) (moved from uspace/lib/c/arch/mips32/src/thread_entry.s ) (view diffs)
• arch/ppc32/include/fibril.h (modified) (view diffs)
• arch/sparc64/include/fibril.h (modified) (view diffs)
• generic/adt/measured_strings.c (deleted)
• generic/as.c (modified) (view diffs)
• generic/async.c (modified) (view diffs)
• generic/ddi.c (modified) (view diffs)
• generic/device/nic.c (modified) (view diffs)
• generic/device/pci.c (added)
• generic/devman.c (modified) (view diffs)
• generic/elf/elf_load.c (modified) (view diffs)
• generic/fibril.c (modified) (view diffs)
• generic/fibril_synch.c (modified) (view diffs)
• generic/inet.c (added)
• generic/inetcfg.c (added)
• generic/inetping.c (added)
• generic/io/printf_core.c (modified) (view diffs)
• generic/ipc.c (modified) (view diffs)
• generic/iplink.c (added)
• generic/iplink_srv.c (added)
• generic/loader.c (modified) (view diffs)
• generic/loc.c (modified) (view diffs)
• generic/malloc.c (modified) (view diffs)
• generic/mman.c (modified) (view diffs)
• generic/net/icmp_api.c (deleted)
• generic/net/modules.c (deleted)
• generic/net/packet.c (deleted)
• generic/net/socket_client.c (modified) (view diffs)
• generic/ns.c (modified) (view diffs)
• generic/private/async.h (modified) (view diffs)
• generic/stacktrace.c (modified) (view diffs)
• generic/stats.c (modified) (view diffs)
• generic/str.c (modified) (view diffs)
• generic/sysinfo.c (modified) (view diffs)
• generic/thread.c (modified) (view diffs)
• generic/time.c (modified) (view diffs)
• generic/vfs/vfs.c (modified) (view diffs)
• include/adt/measured_strings.h (deleted)
• include/as.h (modified) (view diffs)
• include/async.h (modified) (view diffs)
• include/bitops.h (modified) (view diffs)
• include/ddi.h (modified) (view diffs)
• include/device/hw_res.h (modified) (view diffs)
• include/device/hw_res_parsed.h (modified) (view diffs)
• include/device/nic.h (modified) (view diffs)
• include/device/pci.h (moved) (moved from uspace/lib/c/include/ipc/net_net.h ) (view diffs)
• include/devman.h (modified) (view diffs)
• include/errno.h (modified) (view diffs)
• include/fibril.h (modified) (view diffs)
• include/fibril_synch.h (modified) (view diffs)
• include/inet/inet.h (moved) (moved from uspace/lib/net/include/net_hardware.h ) (view diffs)
• include/inet/inetcfg.h (added)
• include/inet/inetping.h (moved) (moved from uspace/srv/hw/char/i8042/i8042.h ) (view diffs)
• include/inet/iplink.h (added)
• include/inet/iplink_srv.h (added)
• include/ipc/devman.h (modified) (view diffs)
• include/ipc/icmp.h (deleted)
• include/ipc/inet.h (moved) (moved from uspace/srv/net/net/packet_server.h ) (view diffs)
• include/ipc/ip.h (deleted)
• include/ipc/ipc.h (modified) (view diffs)
• include/ipc/iplink.h (added)
• include/ipc/loc.h (modified) (view diffs)
• include/ipc/net.h (deleted)
• include/ipc/netif.h (deleted)
• include/ipc/nil.h (deleted)
• include/ipc/packet.h (deleted)
• include/ipc/services.h (modified) (view diffs)
• include/ipc/socket.h (modified) (view diffs)
• include/ipc/vfs.h (modified) (view diffs)
• include/loc.h (modified) (view diffs)
• include/net/device.h (modified) (view diffs)
• include/net/icmp_codes.h (deleted)
• include/net/in.h (modified) (view diffs)
• include/net/packet.h (deleted)
• include/net/packet_header.h (deleted)
• include/nic/eth_phys.h (moved) (moved from uspace/lib/c/include/net/eth_phys.h ) (view diffs)
• include/nic/nic.h (added)
• include/ns.h (modified) (view diffs)
• include/stdarg.h (modified) (view diffs)
• include/stdio.h (modified) (view diffs)
• include/str.h (modified) (view diffs)
• include/sys/mman.h (modified) (view diffs)
• include/sysinfo.h (modified) (view diffs)
• include/unistd.h (modified) (view diffs)
• include/vfs/vfs.h (modified) (view diffs)
• include/vfs/vfs_mtab.h (moved) (moved from uspace/lib/c/include/ipc/tl.h ) (view diffs)