Changeset 5c90e3e in mainline for uspace

Timestamp:

2012-10-18T22:38:27Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

508fff8

Parents:

b801f2d (diff), 7d248e3 (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/Makefile (modified) (view diffs)
• app/bdsh/cmds/modules/cmp/cmp.c (added)
• app/bdsh/cmds/modules/cmp/cmp.h (added)
• app/bdsh/cmds/modules/cmp/cmp_def.h (added)
• app/bdsh/cmds/modules/cmp/entry.h (added)
• app/bdsh/cmds/modules/modules.h (modified) (view diffs)
• app/bithenge/Makefile (added)
• app/bithenge/Makefile.linux (added)
• app/bithenge/test.c (added)
• app/mkexfat/mkexfat.c (modified) (view diffs)
• app/msim/arch_helenos/input.c (modified) (view diffs)
• app/msim/arch_helenos/misc.c (modified) (view diffs)
• app/tester/float/softfloat1.c (modified) (view diffs)
• app/trace/ipcp.c (modified) (view diffs)
• app/trace/proto.c (modified) (view diffs)
• app/trace/proto.h (modified) (view diffs)
• dist/src/bithenge/basic.bh (added)
• dist/src/bithenge/basic.dat (added)
• dist/src/bithenge/basic.out (added)
• dist/src/bithenge/bits.bh (added)
• dist/src/bithenge/bits.dat (added)
• dist/src/bithenge/bits.out (added)
• dist/src/bithenge/cond.bh (added)
• dist/src/bithenge/cond.dat (added)
• dist/src/bithenge/cond.out (added)
• dist/src/bithenge/expression.bh (added)
• dist/src/bithenge/expression.dat (added)
• dist/src/bithenge/expression.out (added)
• dist/src/bithenge/fat.bh (added)
• dist/src/bithenge/fat.dat (added)
• dist/src/bithenge/fat.out (added)
• dist/src/bithenge/gif/blue_1x1.gif (added)
• dist/src/bithenge/gif/gif.bh (added)
• dist/src/bithenge/gif/helenos.gif (added)
• dist/src/bithenge/gif/loader.gif (added)
• dist/src/bithenge/gif/readme (added)
• dist/src/bithenge/repeat.bh (added)
• dist/src/bithenge/repeat.dat (added)
• dist/src/bithenge/repeat.out (added)
• dist/src/bithenge/test.bdsh (added)
• dist/src/bithenge/test.sh (added)
• dist/src/bithenge/trip.bh (added)
• dist/src/bithenge/trip.dat (added)
• dist/src/bithenge/trip.out (added)
• dist/src/bithenge/usbdesc.bh (added)
• dist/src/bithenge/usbdesc.kbd.dat (added)
• dist/src/bithenge/usbdesc.kbd.out (added)
• lib/bithenge/Makefile (added)
• lib/bithenge/Makefile.linux (added)
• lib/bithenge/include/bithenge/blob.h (added)
• lib/bithenge/include/bithenge/compound.h (added)
• lib/bithenge/include/bithenge/expression.h (added)
• lib/bithenge/include/bithenge/file.h (added)
• lib/bithenge/include/bithenge/os.h (added)
• lib/bithenge/include/bithenge/print.h (added)
• lib/bithenge/include/bithenge/script.h (added)
• lib/bithenge/include/bithenge/sequence.h (added)
• lib/bithenge/include/bithenge/source.h (added)
• lib/bithenge/include/bithenge/transform.h (added)
• lib/bithenge/include/bithenge/tree.h (added)
• lib/bithenge/src/blob.c (added)
• lib/bithenge/src/common.h (added)
• lib/bithenge/src/compound.c (added)
• lib/bithenge/src/expression.c (added)
• lib/bithenge/src/failure.c (added)
• lib/bithenge/src/failure.h (moved) (moved from uspace/lib/c/include/adt/hash_set.h ) (view diffs)
• lib/bithenge/src/file.c (added)
• lib/bithenge/src/helenos/block.c (added)
• lib/bithenge/src/helenos/block.h (added)
• lib/bithenge/src/helenos/common.h (added)
• lib/bithenge/src/linux/common.h (added)
• lib/bithenge/src/print.c (added)
• lib/bithenge/src/script.c (added)
• lib/bithenge/src/sequence.c (added)
• lib/bithenge/src/source.c (added)
• lib/bithenge/src/transform.c (added)
• lib/bithenge/src/tree.c (added)
• lib/block/block.c (modified) (view diffs)
• lib/block/block.h (modified) (view diffs)
• lib/c/Makefile (modified) (view diffs)
• lib/c/generic/adt/hash_set.c (deleted)
• lib/c/generic/adt/hash_table.c (modified) (view diffs)
• lib/c/generic/async.c (modified) (view diffs)
• lib/c/include/adt/hash.h (added)
• lib/c/include/adt/hash_table.h (modified) (view diffs)
• lib/c/include/adt/list.h (modified) (view diffs)
• lib/c/include/macros.h (modified) (view diffs)
• lib/ext4/libext4_crc.c (modified) (view diffs)
• lib/ext4/libext4_filesystem.c (modified) (view diffs)
• lib/ext4/libext4_hash.c (modified) (view diffs)
• lib/nic/include/nic.h (modified) (view diffs)
• lib/nic/include/nic_addr_db.h (modified) (view diffs)
• lib/nic/include/nic_wol_virtues.h (modified) (view diffs)
• lib/nic/src/nic_addr_db.c (modified) (view diffs)
• lib/nic/src/nic_wol_virtues.c (modified) (view diffs)
• lib/posix/Makefile (modified) (view diffs)
• lib/posix/include/posix/assert.h (moved) (moved from uspace/lib/posix/assert.h ) (view diffs)
• lib/posix/include/posix/ctype.h (moved) (moved from uspace/lib/posix/ctype.h ) (view diffs)
• lib/posix/include/posix/errno.h (moved) (moved from uspace/lib/posix/errno.h ) (view diffs)
• lib/posix/include/posix/fcntl.h (moved) (moved from uspace/lib/posix/fcntl.h ) (view diffs)
• lib/posix/include/posix/float.h (moved) (moved from uspace/lib/posix/float.h ) (view diffs)
• lib/posix/include/posix/fnmatch.h (moved) (moved from uspace/lib/posix/fnmatch.h ) (view diffs)
• lib/posix/include/posix/getopt.h (moved) (moved from uspace/lib/posix/getopt.h ) (view diffs)
• lib/posix/include/posix/inttypes.h (moved) (moved from uspace/lib/posix/inttypes.h ) (view diffs)
• lib/posix/include/posix/iso646.h (moved) (moved from uspace/lib/posix/iso646.h ) (view diffs)
• lib/posix/include/posix/limits.h (moved) (moved from uspace/lib/posix/limits.h ) (view diffs)
• lib/posix/include/posix/locale.h (moved) (moved from uspace/lib/posix/locale.h ) (view diffs)
• lib/posix/include/posix/malloc.h (added)
• lib/posix/include/posix/math.h (moved) (moved from uspace/lib/posix/math.h ) (view diffs)
• lib/posix/include/posix/pwd.h (moved) (moved from uspace/lib/posix/pwd.h ) (view diffs)
• lib/posix/include/posix/signal.h (moved) (moved from uspace/lib/posix/signal.h ) (view diffs)
• lib/posix/include/posix/stdarg.h (added)
• lib/posix/include/posix/stdbool.h (moved) (moved from uspace/lib/posix/stdbool.h ) (view diffs)
• lib/posix/include/posix/stddef.h (moved) (moved from uspace/lib/posix/stddef.h ) (view diffs)
• lib/posix/include/posix/stdint.h (moved) (moved from uspace/lib/posix/stdint.h ) (view diffs)
• lib/posix/include/posix/stdio.h (moved) (moved from uspace/lib/posix/stdio.h ) (view diffs)
• lib/posix/include/posix/stdlib.h (moved) (moved from uspace/lib/posix/stdlib.h ) (view diffs)
• lib/posix/include/posix/string.h (moved) (moved from uspace/lib/posix/string.h ) (view diffs)
• lib/posix/include/posix/strings.h (moved) (moved from uspace/lib/posix/strings.h ) (view diffs)
• lib/posix/include/posix/sys/mman.h (moved) (moved from uspace/lib/posix/sys/mman.h ) (view diffs)
• lib/posix/include/posix/sys/stat.h (moved) (moved from uspace/lib/posix/sys/stat.h ) (view diffs)
• lib/posix/include/posix/sys/types.h (moved) (moved from uspace/lib/posix/sys/types.h ) (view diffs)
• lib/posix/include/posix/sys/wait.h (moved) (moved from uspace/lib/posix/sys/wait.h ) (view diffs)
• lib/posix/include/posix/time.h (moved) (moved from uspace/lib/posix/time.h ) (view diffs)
• lib/posix/include/posix/unistd.h (moved) (moved from uspace/lib/posix/unistd.h ) (view diffs)
• lib/posix/source/ctype.c (moved) (moved from uspace/lib/posix/ctype.c ) (view diffs)
• lib/posix/source/errno.c (moved) (moved from uspace/lib/posix/errno.c ) (view diffs)
• lib/posix/source/fcntl.c (moved) (moved from uspace/lib/posix/fcntl.c ) (view diffs)
• lib/posix/source/fnmatch.c (moved) (moved from uspace/lib/posix/fnmatch.c ) (view diffs)
• lib/posix/source/getopt.c (moved) (moved from uspace/lib/posix/getopt.c ) (view diffs)
• lib/posix/source/internal/common.h (moved) (moved from uspace/lib/posix/internal/common.h ) (view diffs)
• lib/posix/source/locale.c (moved) (moved from uspace/lib/posix/locale.c ) (view diffs)
• lib/posix/source/math.c (moved) (moved from uspace/lib/posix/math.c ) (view diffs)
• lib/posix/source/pwd.c (moved) (moved from uspace/lib/posix/pwd.c ) (view diffs)
• lib/posix/source/signal.c (moved) (moved from uspace/lib/posix/signal.c ) (view diffs)
• lib/posix/source/stdio.c (moved) (moved from uspace/lib/posix/stdio.c ) (view diffs)
• lib/posix/source/stdio/scanf.c (moved) (moved from uspace/lib/posix/stdio/scanf.c ) (view diffs)
• lib/posix/source/stdlib.c (moved) (moved from uspace/lib/posix/stdlib.c ) (view diffs)
• lib/posix/source/stdlib/strtol.c (moved) (moved from uspace/lib/posix/stdlib/strtol.c ) (view diffs)
• lib/posix/source/stdlib/strtold.c (moved) (moved from uspace/lib/posix/stdlib/strtold.c ) (view diffs)
• lib/posix/source/string.c (moved) (moved from uspace/lib/posix/string.c ) (view diffs)
• lib/posix/source/strings.c (moved) (moved from uspace/lib/posix/strings.c ) (view diffs)
• lib/posix/source/sys/stat.c (moved) (moved from uspace/lib/posix/sys/stat.c ) (view diffs)
• lib/posix/source/sys/wait.c (moved) (moved from uspace/lib/posix/sys/wait.c ) (view diffs)
• lib/posix/source/time.c (moved) (moved from uspace/lib/posix/time.c ) (view diffs)
• lib/posix/source/unistd.c (moved) (moved from uspace/lib/posix/unistd.c ) (view diffs)
• lib/softfloat/add.c (modified) (view diffs)
• srv/devman/devman.c (modified) (view diffs)
• srv/devman/devman.h (modified) (view diffs)
• srv/fs/cdfs/cdfs_ops.c (modified) (view diffs)
• srv/fs/exfat/exfat.h (modified) (view diffs)
• srv/fs/exfat/exfat_idx.c (modified) (view diffs)
• srv/fs/exfat/exfat_ops.c (modified) (view diffs)
• srv/fs/ext2fs/ext2fs_ops.c (modified) (view diffs)
• srv/fs/ext4fs/ext4fs_ops.c (modified) (view diffs)
• srv/fs/fat/fat.h (modified) (view diffs)
• srv/fs/fat/fat_idx.c (modified) (view diffs)
• srv/fs/locfs/locfs_ops.c (modified) (view diffs)
• srv/fs/mfs/mfs.h (modified) (view diffs)
• srv/fs/mfs/mfs_ops.c (modified) (view diffs)
• srv/fs/tmpfs/tmpfs.h (modified) (view diffs)
• srv/fs/tmpfs/tmpfs_ops.c (modified) (view diffs)
• srv/fs/udf/udf.h (modified) (view diffs)
• srv/fs/udf/udf_idx.c (modified) (view diffs)
• srv/hid/input/gsp.c (modified) (view diffs)
• srv/hid/input/gsp.h (modified) (view diffs)
• srv/logger/logs.c (modified) (view diffs)
• srv/ns/service.c (modified) (view diffs)
• srv/ns/task.c (modified) (view diffs)
• srv/vfs/vfs.h (modified) (view diffs)
• srv/vfs/vfs_node.c (modified) (view diffs)