- Timestamp:
- 2013-12-31T07:57:14Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 1b973dc
- Parents:
- 6297465 (diff), 208b5f5 (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:
-
- 103 added
- 9 deleted
- 99 edited
- 7 moved
-
Makefile (modified) (view diffs)
-
Makefile.common (modified) (view diffs)
-
app/dnsres/dnsres.c (modified) (view diffs)
-
app/download/Makefile (modified) (view diffs)
-
app/download/main.c (modified) (view diffs)
-
app/getterm/getterm.c (modified) (view diffs)
-
app/hdisk/Makefile (added)
-
app/hdisk/common.h (added)
-
app/hdisk/func_gpt.c (added)
-
app/hdisk/func_gpt.h (added)
-
app/hdisk/func_mbr.c (added)
-
app/hdisk/func_mbr.h (added)
-
app/hdisk/func_none.c (added)
-
app/hdisk/func_none.h (added)
-
app/hdisk/hdisk.c (added)
-
app/hdisk/hdisk.h (added)
-
app/hdisk/input.c (added)
-
app/hdisk/input.h (added)
-
app/init/init.c (modified) (view diffs)
-
app/netspeed/netspeed.c (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/ping/ping.c (modified) (view diffs)
-
app/ping6/ping6.c (deleted)
-
app/tester/Makefile (modified) (view diffs)
-
app/tester/tester.c (modified) (view diffs)
-
app/tester/tester.h (modified) (view diffs)
-
app/tester/thread/setjmp1.c (added)
-
app/tester/thread/setjmp1.def (added)
-
app/untar/Makefile (added)
-
app/untar/main.c (added)
-
app/untar/tar.c (added)
-
app/untar/tar.h (added)
-
app/viewer/Makefile (added)
-
app/viewer/viewer.c (added)
-
dist/logo.tga (added)
-
dist/src/c/demos/hello/build.gcc (added)
-
dist/src/c/demos/tetris/build.gcc (added)
-
dist/src/c/demos/tetris/screen.c (modified) (view diffs)
-
dist/src/python/demo/hello.py (added)
-
dist/src/python/demo/sintab.py (added)
-
dist/src/python/modules.py (added)
-
drv/block/ata_bd/ata_bd.c (modified) (view diffs)
-
drv/bus/amba/Makefile (added)
-
drv/bus/amba/amba.c (added)
-
drv/bus/amba/amba.ma (added)
-
drv/bus/amba/ambapp.h (added)
-
drv/char/grlib_uart/Makefile (added)
-
drv/char/grlib_uart/cyclic_buffer.h (added)
-
drv/char/grlib_uart/grlib_uart.c (added)
-
drv/char/grlib_uart/grlib_uart.ma (added)
-
drv/infrastructure/rootleon3/Makefile (added)
-
drv/infrastructure/rootleon3/rootleon3.c (added)
-
drv/infrastructure/rootleon3/rootleon3.h (added)
-
drv/infrastructure/rootleon3/rootleon3.ma (added)
-
lib/c/Makefile (modified) (view diffs)
-
lib/c/arch/abs32le/include/libarch/atomic.h (modified) (view diffs)
-
lib/c/arch/amd64/_link.ld.in (modified) (view diffs)
-
lib/c/arch/ia32/Makefile.inc (modified) (view diffs)
-
lib/c/arch/sparc32/Makefile.common (added)
-
lib/c/arch/sparc32/Makefile.inc (added)
-
lib/c/arch/sparc32/_link.ld.in (added)
-
lib/c/arch/sparc32/include/libarch/atomic.h (added)
-
lib/c/arch/sparc32/include/libarch/barrier.h (added)
-
lib/c/arch/sparc32/include/libarch/config.h (added)
-
lib/c/arch/sparc32/include/libarch/context_offset.h (added)
-
lib/c/arch/sparc32/include/libarch/ddi.h (added)
-
lib/c/arch/sparc32/include/libarch/elf.h (added)
-
lib/c/arch/sparc32/include/libarch/elf_linux.h (added)
-
lib/c/arch/sparc32/include/libarch/faddr.h (added)
-
lib/c/arch/sparc32/include/libarch/fibril.h (added)
-
lib/c/arch/sparc32/include/libarch/inttypes.h (added)
-
lib/c/arch/sparc32/include/libarch/istate.h (added)
-
lib/c/arch/sparc32/include/libarch/stack.h (added)
-
lib/c/arch/sparc32/include/libarch/stackarg.h (added)
-
lib/c/arch/sparc32/include/libarch/syscall.h (added)
-
lib/c/arch/sparc32/include/libarch/thread.h (added)
-
lib/c/arch/sparc32/include/libarch/tls.h (added)
-
lib/c/arch/sparc32/include/libarch/types.h (added)
-
lib/c/arch/sparc32/src/entry.s (added)
-
lib/c/arch/sparc32/src/entryjmp.s (added)
-
lib/c/arch/sparc32/src/fibril.S (added)
-
lib/c/arch/sparc32/src/stacktrace.c (added)
-
lib/c/arch/sparc32/src/stacktrace_asm.S (moved) (moved from uspace/lib/c/arch/ia32/src/setjmp.S ) (view diffs)
-
lib/c/arch/sparc32/src/thread_entry.s (added)
-
lib/c/arch/sparc32/src/tls.c (added)
-
lib/c/generic/adt/checksum.c (added)
-
lib/c/generic/dhcp.c (added)
-
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 (deleted)
-
lib/c/generic/iplink.c (modified) (view diffs)
-
lib/c/generic/iplink_srv.c (modified) (view diffs)
-
lib/c/generic/rtld/module.c (modified) (view diffs)
-
lib/c/generic/setjmp.c (added)
-
lib/c/generic/vfs/vfs.c (modified) (view diffs)
-
lib/c/include/adt/checksum.h (moved) (moved from uspace/lib/c/include/net/device.h ) (view diffs)
-
lib/c/include/adt/list.h (modified) (view diffs)
-
lib/c/include/bitops.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/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/dhcp.h (added)
-
lib/c/include/ipc/inet.h (modified) (view diffs)
-
lib/c/include/ipc/services.h (modified) (view diffs)
-
lib/c/include/math.h (added)
-
lib/c/include/net/ip_codes.h (deleted)
-
lib/c/include/setjmp.h (modified) (view diffs)
-
lib/c/include/stdio.h (modified) (view diffs)
-
lib/c/include/types/inetping.h (moved) (moved from uspace/lib/c/include/inet/inetping6.h ) (view diffs)
-
lib/gpt/Makefile (added)
-
lib/gpt/global.c (added)
-
lib/gpt/gpt.h (added)
-
lib/gpt/libgpt.c (added)
-
lib/gpt/libgpt.h (added)
-
lib/gui/canvas.c (modified) (view diffs)
-
lib/gui/canvas.h (modified) (view diffs)
-
lib/gui/window.c (modified) (view diffs)
-
lib/gui/window.h (modified) (view diffs)
-
lib/http/Makefile (modified) (view diffs)
-
lib/http/http.c (deleted)
-
lib/http/include/http/ctype.h (added)
-
lib/http/include/http/errno.h (added)
-
lib/http/include/http/http.h (moved) (moved from uspace/lib/http/http.h ) (view diffs)
-
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/math/Makefile (moved) (moved from uspace/app/ping6/Makefile ) (view diffs)
-
lib/math/src/dummy.c (added)
-
lib/mbr/Makefile (added)
-
lib/mbr/libmbr.c (added)
-
lib/mbr/libmbr.h (added)
-
lib/mbr/mbr.h (added)
-
lib/net/include/socket_core.h (modified) (view diffs)
-
lib/posix/Makefile (modified) (view diffs)
-
lib/posix/include/posix/float.h (modified) (view diffs)
-
lib/posix/include/posix/math.h (modified) (view diffs)
-
lib/posix/include/posix/pthread.h (added)
-
lib/posix/include/posix/setjmp.h (moved) (moved from uspace/lib/c/generic/bitops.c ) (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/time.h (modified) (view diffs)
-
lib/posix/source/internal/common.h (modified) (view diffs)
-
lib/posix/source/math.c (deleted)
-
lib/posix/source/pthread/condvar.c (added)
-
lib/posix/source/pthread/keys.c (added)
-
lib/posix/source/pthread/mutex.c (added)
-
lib/posix/source/pthread/threads.c (added)
-
lib/posix/source/stdlib.c (modified) (view diffs)
-
lib/posix/source/unistd.c (modified) (view diffs)
-
lib/posix/tools/create-redefines.sh (deleted)
-
lib/posix/tools/get-collision-list.sh (deleted)
-
lib/posix/tools/transform-symbols.sh (deleted)
-
lib/softfloat/softfloat.c (modified) (view diffs)
-
lib/softfloat/softfloat.h (modified) (view diffs)
-
lib/softint/Makefile (modified) (view diffs)
-
lib/softint/generic/bits.c (added)
-
lib/softint/generic/shift.c (modified) (view diffs)
-
lib/softint/include/bits.h (added)
-
lib/softint/include/shift.h (modified) (view diffs)
-
srv/fs/ext4fs/Makefile (modified) (view diffs)
-
srv/fs/locfs/Makefile (modified) (view diffs)
-
srv/net/dhcp/Makefile (modified) (view diffs)
-
srv/net/dhcp/dhcp.c (modified) (view diffs)
-
srv/net/dhcp/dhcp.h (moved) (moved from uspace/srv/net/inetsrv/inetping6.h ) (view diffs)
-
srv/net/dhcp/main.c (added)
-
srv/net/dhcp/transport.c (added)
-
srv/net/dhcp/transport.h (added)
-
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/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/pdu.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/ucall.c (modified) (view diffs)
-
srv/net/udp/pdu.c (modified) (view diffs)
Note:
See TracChangeset
for help on using the changeset viewer.
