Changeset d011038 in mainline for uspace

Timestamp:

2011-03-29T20:12:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8f17503

Parents:

c4fb95d3 (diff), 93ebe4e (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.common (modified) (view diffs)
• app/bdsh/cmds/modules/bdd/bdd.c (modified) (view diffs)
• app/bdsh/cmds/modules/cat/cat.c (modified) (view diffs)
• app/bdsh/cmds/modules/cat/cat.h (modified) (view diffs)
• app/bdsh/cmds/modules/cp/cp.c (modified) (view diffs)
• app/bdsh/cmds/modules/mkfile/mkfile.c (modified) (view diffs)
• app/bdsh/cmds/modules/mount/mount.c (modified) (view diffs)
• app/bdsh/cmds/modules/rm/rm.c (modified) (view diffs)
• app/sbi/Makefile (modified) (view diffs)
• app/sbi/src/builtin.c (modified) (view diffs)
• app/sbi/src/builtin/bi_console.c (moved) (moved from uspace/app/sbi/src/builtin/bi_fun.c ) (view diffs)
• app/sbi/src/builtin/bi_console.h (added)
• app/sbi/src/builtin/bi_task.c (added)
• app/sbi/src/builtin/bi_task.h (moved) (moved from uspace/app/sbi/src/builtin/bi_fun.h ) (view diffs)
• app/sbi/src/imode.c (modified) (view diffs)
• app/sbi/src/intmap.c (modified) (view diffs)
• app/sbi/src/intmap.h (modified) (view diffs)
• app/sbi/src/lex.c (modified) (view diffs)
• app/sbi/src/lex_t.h (modified) (view diffs)
• app/sbi/src/list.c (modified) (view diffs)
• app/sbi/src/list.h (modified) (view diffs)
• app/sbi/src/parse.c (modified) (view diffs)
• app/sbi/src/rdata.c (modified) (view diffs)
• app/sbi/src/rdata.h (modified) (view diffs)
• app/sbi/src/rdata_t.h (modified) (view diffs)
• app/sbi/src/run.c (modified) (view diffs)
• app/sbi/src/run.h (modified) (view diffs)
• app/sbi/src/run_expr.c (modified) (view diffs)
• app/sbi/src/run_expr.h (modified) (view diffs)
• app/sbi/src/stree.c (modified) (view diffs)
• app/sbi/src/stree.h (modified) (view diffs)
• app/sbi/src/stree_t.h (modified) (view diffs)
• app/sbi/src/stype.c (modified) (view diffs)
• app/sbi/src/stype_expr.c (modified) (view diffs)
• app/tester/hw/misc/virtchar1.c (modified) (view diffs)
• dist/src/sysel/demos/arith.sy (modified) (view diffs)
• dist/src/sysel/demos/array.sy (modified) (view diffs)
• dist/src/sysel/demos/autobox.sy (modified) (view diffs)
• dist/src/sysel/demos/count.sy (modified) (view diffs)
• dist/src/sysel/demos/ctor.sy (modified) (view diffs)
• dist/src/sysel/demos/deleg.sy (modified) (view diffs)
• dist/src/sysel/demos/enum.sy (modified) (view diffs)
• dist/src/sysel/demos/except.sy (modified) (view diffs)
• dist/src/sysel/demos/gen.sy (modified) (view diffs)
• dist/src/sysel/demos/hello.sy (modified) (view diffs)
• dist/src/sysel/demos/htxtfile.sy (modified) (view diffs)
• dist/src/sysel/demos/iface.sy (modified) (view diffs)
• dist/src/sysel/demos/inherit.sy (modified) (view diffs)
• dist/src/sysel/demos/list.sy (modified) (view diffs)
• dist/src/sysel/demos/map.sy (modified) (view diffs)
• dist/src/sysel/demos/property.sy (modified) (view diffs)
• dist/src/sysel/demos/string.sy (modified) (view diffs)
• dist/src/sysel/demos/svar.sy (modified) (view diffs)
• dist/src/sysel/demos/switch.sy (added)
• dist/src/sysel/demos/varargs.sy (modified) (view diffs)
• lib/block/libblock.c (modified) (view diffs)
• lib/c/Makefile (modified) (view diffs)
• lib/c/generic/fibril.c (modified) (view diffs)
• lib/c/generic/loader.c (modified) (view diffs)
• lib/c/generic/net/packet.c (modified) (view diffs)
• lib/c/generic/net/socket_client.c (modified) (view diffs)
• lib/c/generic/vfs/vfs.c (modified) (view diffs)
• lib/c/include/adt/generic_char_map.h (modified) (view diffs)
• lib/c/include/adt/generic_field.h (modified) (view diffs)
• lib/c/include/adt/int_map.h (modified) (view diffs)
• lib/c/include/ipc/services.h (modified) (view diffs)
• lib/fs/libfs.c (modified) (view diffs)
• lib/net/tl/socket_core.c (modified) (view diffs)
• lib/net/tl/tl_common.c (modified) (view diffs)
• srv/devman/devman.c (modified) (view diffs)
• srv/devman/main.c (modified) (view diffs)
• srv/devman/util.c (modified) (view diffs)
• srv/devman/util.h (modified) (view diffs)
• srv/devmap/devmap.c (modified) (view diffs)
• srv/fs/fat/fat_ops.c (modified) (view diffs)
• srv/hid/console/gcons.c (modified) (view diffs)
• srv/hid/kbd/Makefile (modified) (view diffs)
• srv/hid/kbd/ctl/pl050.c (deleted)
• srv/hid/kbd/generic/kbd.c (modified) (view diffs)
• srv/hid/kbd/include/kbd.h (modified) (view diffs)
• srv/hid/kbd/port/ns16550.c (modified) (view diffs)
• srv/hid/kbd/port/z8530.c (modified) (view diffs)
• srv/hw/irc/apic/apic.c (modified) (view diffs)
• srv/hw/irc/fhc/fhc.c (modified) (view diffs)
• srv/hw/irc/i8259/i8259.c (modified) (view diffs)
• srv/hw/irc/obio/obio.c (modified) (view diffs)
• srv/hw/netif/ne2000/ne2000.c (modified) (view diffs)
• srv/net/il/arp/arp.c (modified) (view diffs)
• srv/net/il/ip/ip.c (modified) (view diffs)
• srv/net/net/net.c (modified) (view diffs)
• srv/net/nil/eth/eth.c (modified) (view diffs)
• srv/net/tl/tcp/tcp.c (modified) (view diffs)
• srv/net/tl/udp/udp.c (modified) (view diffs)
• srv/vfs/vfs_ops.c (modified) (view diffs)