- Timestamp:
- 2013-08-15T14:20:16Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- bb2a5b2
- Parents:
- f2c19b0 (diff), 2921602 (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. - Location:
- uspace
- Files:
-
- 24 added
- 4 deleted
- 207 edited
- 6 moved
-
Makefile (modified) (view diffs)
-
Makefile.common (modified) (view diffs)
-
app/bdsh/Makefile (modified) (view diffs)
-
app/bdsh/cmds/builtins/batch/batch.c (modified) (view diffs)
-
app/bdsh/cmds/modules/bdd/bdd.c (deleted)
-
app/bdsh/cmds/modules/bdd/bdd.h (deleted)
-
app/bdsh/cmds/modules/bdd/bdd_def.h (deleted)
-
app/bdsh/cmds/modules/bdd/entry.h (deleted)
-
app/bdsh/cmds/modules/cat/cat.c (modified) (view diffs)
-
app/bdsh/cmds/modules/help/help.c (modified) (view diffs)
-
app/bdsh/cmds/modules/modules.h (modified) (view diffs)
-
app/bdsh/cmds/modules/pwd/pwd.c (modified) (view diffs)
-
app/bdsh/cmds/modules/rm/rm.c (modified) (view diffs)
-
app/bdsh/cmds/modules/sleep/sleep.c (modified) (view diffs)
-
app/bdsh/exec.c (modified) (view diffs)
-
app/binutils/intrusive.sh (modified) (view diffs)
-
app/binutils/toolchain.sh (modified) (view diffs)
-
app/blkdump/blkdump.c (modified) (view diffs)
-
app/dnscfg/dnscfg.c (modified) (view diffs)
-
app/dnsres/dnsres.c (modified) (view diffs)
-
app/edit/search_impl.h (modified) (view diffs)
-
app/edit/sheet_impl.h (modified) (view diffs)
-
app/inet/inet.c (modified) (view diffs)
-
app/mkmfs/mkmfs.c (modified) (view diffs)
-
app/netecho/netecho.c (modified) (view diffs)
-
app/nettest1/nettest.c (modified) (view diffs)
-
app/nettest1/nettest.h (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/pcc/config.h (modified) (view diffs)
-
app/ping/ping.c (modified) (view diffs)
-
app/ping6/Makefile (added)
-
app/ping6/ping6.c (added)
-
drv/block/ata_bd/Makefile (added)
-
drv/block/ata_bd/ata_bd.c (moved) (moved from uspace/srv/bd/ata_bd/ata_bd.c ) (view diffs)
-
drv/block/ata_bd/ata_bd.h (moved) (moved from uspace/srv/bd/ata_bd/ata_bd.h ) (view diffs)
-
drv/block/ata_bd/ata_bd.ma (added)
-
drv/block/ata_bd/ata_hw.h (moved) (moved from uspace/srv/bd/ata_bd/ata_hw.h ) (view diffs)
-
drv/block/ata_bd/main.c (added)
-
drv/block/ata_bd/main.h (added)
-
drv/bus/isa/isa.dev (modified) (view diffs)
-
drv/bus/usb/ehci/main.c (modified) (view diffs)
-
drv/bus/usb/ehci/res.c (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/uhci/hc.c (modified) (view diffs)
-
drv/bus/usb/uhci/hc.h (modified) (view diffs)
-
drv/bus/usb/uhci/uhci.c (modified) (view diffs)
-
drv/bus/usb/uhcirh/main.c (modified) (view diffs)
-
drv/bus/usb/uhcirh/port.c (modified) (view diffs)
-
drv/bus/usb/vhc/hub/virthubops.c (modified) (view diffs)
-
drv/char/i8042/i8042.c (modified) (view diffs)
-
drv/char/i8042/main.c (modified) (view diffs)
-
drv/char/ns8250/ns8250.c (modified) (view diffs)
-
drv/char/ps2mouse/main.c (modified) (view diffs)
-
drv/char/ps2mouse/ps2mouse.c (modified) (view diffs)
-
drv/char/xtkbd/main.c (modified) (view diffs)
-
drv/infrastructure/rootamdm37x/rootamdm37x.c (modified) (view diffs)
-
drv/infrastructure/rootamdm37x/uhh.h (modified) (view diffs)
-
drv/nic/rtl8139/driver.c (modified) (view diffs)
-
lib/c/Makefile (modified) (view diffs)
-
lib/c/arch/abs32le/Makefile.common (modified) (view diffs)
-
lib/c/arch/amd64/Makefile.common (modified) (view diffs)
-
lib/c/arch/amd64/src/entry.s (modified) (view diffs)
-
lib/c/arch/amd64/src/entryjmp.s (modified) (view diffs)
-
lib/c/arch/amd64/src/fibril.S (modified) (view diffs)
-
lib/c/arch/amd64/src/thread_entry.s (modified) (view diffs)
-
lib/c/arch/ia32/Makefile.common (modified) (view diffs)
-
lib/c/arch/ia32/include/libarch/fibril.h (modified) (view diffs)
-
lib/c/arch/ia32/src/entry.S (modified) (view diffs)
-
lib/c/arch/ia32/src/entryjmp.s (modified) (view diffs)
-
lib/c/arch/ia32/src/fibril.S (modified) (view diffs)
-
lib/c/arch/ia32/src/setjmp.S (modified) (view diffs)
-
lib/c/arch/ia32/src/thread_entry.s (modified) (view diffs)
-
lib/c/generic/bitops.c (moved) (moved from uspace/srv/net/inetsrv/inet_util.h ) (view diffs)
-
lib/c/generic/devman.c (modified) (view diffs)
-
lib/c/generic/dnsr.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 (added)
-
lib/c/generic/io/io.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/inet.c (modified) (view diffs)
-
lib/c/generic/net/socket_client.c (modified) (view diffs)
-
lib/c/generic/net/socket_parse.c (modified) (view diffs)
-
lib/c/generic/str.c (modified) (view diffs)
-
lib/c/include/bd_srv.h (modified) (view diffs)
-
lib/c/include/bitops.h (modified) (view diffs)
-
lib/c/include/cc.h (added)
-
lib/c/include/inet/addr.h (modified) (view diffs)
-
lib/c/include/inet/dnsr.h (modified) (view diffs)
-
lib/c/include/inet/inetping.h (modified) (view diffs)
-
lib/c/include/inet/inetping6.h (added)
-
lib/c/include/inet/iplink.h (modified) (view diffs)
-
lib/c/include/inet/iplink_srv.h (modified) (view diffs)
-
lib/c/include/io/con_srv.h (modified) (view diffs)
-
lib/c/include/io/verify.h (modified) (view diffs)
-
lib/c/include/ipc/inet.h (modified) (view diffs)
-
lib/c/include/ipc/iplink.h (modified) (view diffs)
-
lib/c/include/ipc/services.h (modified) (view diffs)
-
lib/c/include/mem.h (modified) (view diffs)
-
lib/c/include/net/in.h (modified) (view diffs)
-
lib/c/include/net/in6.h (modified) (view diffs)
-
lib/c/include/net/inet.h (modified) (view diffs)
-
lib/c/include/net/ip_protocols.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/str.h (modified) (view diffs)
-
lib/draw/drawctx.h (modified) (view diffs)
-
lib/gui/connection.h (modified) (view diffs)
-
lib/gui/widget.h (modified) (view diffs)
-
lib/gui/window.h (modified) (view diffs)
-
lib/posix/Makefile (modified) (view diffs)
-
lib/posix/include/posix/ctype.h (modified) (view diffs)
-
lib/posix/include/posix/dirent.h (added)
-
lib/posix/include/posix/fcntl.h (modified) (view diffs)
-
lib/posix/include/posix/fenv.h (added)
-
lib/posix/include/posix/float.h (modified) (view diffs)
-
lib/posix/include/posix/fnmatch.h (modified) (view diffs)
-
lib/posix/include/posix/getopt.h (modified) (view diffs)
-
lib/posix/include/posix/inttypes.h (modified) (view diffs)
-
lib/posix/include/posix/locale.h (modified) (view diffs)
-
lib/posix/include/posix/math.h (modified) (view diffs)
-
lib/posix/include/posix/pwd.h (modified) (view diffs)
-
lib/posix/include/posix/signal.h (modified) (view diffs)
-
lib/posix/include/posix/stddef.h (modified) (view diffs)
-
lib/posix/include/posix/stdint.h (modified) (view diffs)
-
lib/posix/include/posix/stdio.h (modified) (view diffs)
-
lib/posix/include/posix/stdlib.h (modified) (view diffs)
-
lib/posix/include/posix/string.h (modified) (view diffs)
-
lib/posix/include/posix/strings.h (modified) (view diffs)
-
lib/posix/include/posix/sys/mman.h (modified) (view diffs)
-
lib/posix/include/posix/sys/stat.h (modified) (view diffs)
-
lib/posix/include/posix/sys/types.h (modified) (view diffs)
-
lib/posix/include/posix/sys/wait.h (modified) (view diffs)
-
lib/posix/include/posix/time.h (modified) (view diffs)
-
lib/posix/include/posix/ucontext.h (added)
-
lib/posix/include/posix/unistd.h (modified) (view diffs)
-
lib/posix/source/ctype.c (modified) (view diffs)
-
lib/posix/source/errno.c (modified) (view diffs)
-
lib/posix/source/fcntl.c (modified) (view diffs)
-
lib/posix/source/fnmatch.c (modified) (view diffs)
-
lib/posix/source/getopt.c (modified) (view diffs)
-
lib/posix/source/locale.c (modified) (view diffs)
-
lib/posix/source/math.c (modified) (view diffs)
-
lib/posix/source/pwd.c (modified) (view diffs)
-
lib/posix/source/signal.c (modified) (view diffs)
-
lib/posix/source/stdio.c (modified) (view diffs)
-
lib/posix/source/stdio/scanf.c (modified) (view diffs)
-
lib/posix/source/stdlib.c (modified) (view diffs)
-
lib/posix/source/stdlib/strtol.c (modified) (view diffs)
-
lib/posix/source/stdlib/strtold.c (modified) (view diffs)
-
lib/posix/source/string.c (modified) (view diffs)
-
lib/posix/source/strings.c (modified) (view diffs)
-
lib/posix/source/sys/stat.c (modified) (view diffs)
-
lib/posix/source/sys/wait.c (modified) (view diffs)
-
lib/posix/source/time.c (modified) (view diffs)
-
lib/posix/source/unistd.c (modified) (view diffs)
-
lib/posix/tools/create-redefines.sh (added)
-
lib/posix/tools/get-collision-list.sh (added)
-
lib/posix/tools/transform-symbols.sh (added)
-
lib/usb/src/dev.c (modified) (view diffs)
-
lib/usbhid/src/hidiface.c (modified) (view diffs)
-
srv/fs/mfs/mfs_balloc.c (modified) (view diffs)
-
srv/fs/mfs/mfs_dentry.c (modified) (view diffs)
-
srv/fs/mfs/mfs_ops.c (modified) (view diffs)
-
srv/hid/input/port/adb.c (modified) (view diffs)
-
srv/hid/input/port/adb_mouse.c (modified) (view diffs)
-
srv/hid/input/port/chardev.c (modified) (view diffs)
-
srv/hid/isdv4_tablet/isdv4.h (modified) (view diffs)
-
srv/net/dnsrsrv/dns_msg.c (modified) (view diffs)
-
srv/net/dnsrsrv/dns_msg.h (modified) (view diffs)
-
srv/net/dnsrsrv/dns_std.h (modified) (view diffs)
-
srv/net/dnsrsrv/dns_type.h (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/dnsrsrv/transport.h (modified) (view diffs)
-
srv/net/ethip/arp.c (modified) (view diffs)
-
srv/net/ethip/arp.h (modified) (view diffs)
-
srv/net/ethip/atrans.c (modified) (view diffs)
-
srv/net/ethip/atrans.h (modified) (view diffs)
-
srv/net/ethip/ethip.c (modified) (view diffs)
-
srv/net/ethip/ethip.h (modified) (view diffs)
-
srv/net/ethip/ethip_nic.c (modified) (view diffs)
-
srv/net/ethip/ethip_nic.h (modified) (view diffs)
-
srv/net/ethip/pdu.c (modified) (view diffs)
-
srv/net/ethip/pdu.h (modified) (view diffs)
-
srv/net/ethip/std.h (modified) (view diffs)
-
srv/net/inetsrv/Makefile (modified) (view diffs)
-
srv/net/inetsrv/addrobj.c (modified) (view diffs)
-
srv/net/inetsrv/addrobj.h (modified) (view diffs)
-
srv/net/inetsrv/icmp.c (modified) (view diffs)
-
srv/net/inetsrv/icmp_std.h (modified) (view diffs)
-
srv/net/inetsrv/icmpv6.c (added)
-
srv/net/inetsrv/icmpv6.h (moved) (moved from uspace/srv/net/inetsrv/inet_util.c ) (view diffs)
-
srv/net/inetsrv/icmpv6_std.h (added)
-
srv/net/inetsrv/inet_link.c (modified) (view diffs)
-
srv/net/inetsrv/inet_link.h (modified) (view diffs)
-
srv/net/inetsrv/inet_std.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 (added)
-
srv/net/inetsrv/inetping6.h (added)
-
srv/net/inetsrv/inetsrv.c (modified) (view diffs)
-
srv/net/inetsrv/inetsrv.h (modified) (view diffs)
-
srv/net/inetsrv/ndp.c (added)
-
srv/net/inetsrv/ndp.h (added)
-
srv/net/inetsrv/ntrans.c (added)
-
srv/net/inetsrv/ntrans.h (added)
-
srv/net/inetsrv/pdu.c (modified) (view diffs)
-
srv/net/inetsrv/pdu.h (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/slip/Makefile (moved) (moved from uspace/srv/bd/ata_bd/Makefile ) (view diffs)
-
srv/net/slip/slip.c (added)
-
srv/net/tcp/conn.c (modified) (view diffs)
-
srv/net/tcp/ncsim.c (modified) (view diffs)
-
srv/net/tcp/pdu.c (modified) (view diffs)
-
srv/net/tcp/sock.c (modified) (view diffs)
-
srv/net/tcp/std.h (modified) (view diffs)
-
srv/net/tcp/tcp.c (modified) (view diffs)
-
srv/net/tcp/tcp_type.h (modified) (view diffs)
-
srv/net/tcp/test.c (modified) (view diffs)
-
srv/net/tcp/tqueue.c (modified) (view diffs)
-
srv/net/tcp/ucall.c (modified) (view diffs)
-
srv/net/udp/assoc.c (modified) (view diffs)
-
srv/net/udp/pdu.c (modified) (view diffs)
-
srv/net/udp/sock.c (modified) (view diffs)
-
srv/net/udp/std.h (modified) (view diffs)
-
srv/net/udp/udp_inet.c (modified) (view diffs)
-
srv/net/udp/udp_type.h (modified) (view diffs)
Note:
See TracChangeset
for help on using the changeset viewer.
