- Timestamp:
- 2015-07-28T11:28:14Z (10 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 6accc5cf
- Parents:
- df2bce32 (diff), 47726b5e (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:
-
- 10 added
- 40 deleted
- 94 edited
- 7 moved
-
Makefile (modified) (view diffs)
-
Makefile.common (modified) (view diffs)
-
app/bdsh/cmds/modules/cat/cat.c (modified) (view diffs)
-
app/bdsh/cmds/modules/cmp/cmp.c (modified) (view diffs)
-
app/bdsh/cmds/modules/cp/cp.c (modified) (view diffs)
-
app/bdsh/cmds/modules/ls/ls.c (modified) (view diffs)
-
app/bdsh/cmds/modules/mkdir/mkdir.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/bdsh/cmds/modules/touch/touch.c (modified) (view diffs)
-
app/bdsh/input.c (modified) (view diffs)
-
app/download/main.c (modified) (view diffs)
-
app/netecho/Makefile (deleted)
-
app/netecho/netecho.c (deleted)
-
app/netecho/print_error.c (deleted)
-
app/netecho/print_error.h (deleted)
-
app/netspeed/Makefile (deleted)
-
app/netspeed/netspeed.c (deleted)
-
app/nettest1/Makefile (deleted)
-
app/nettest1/nettest.c (deleted)
-
app/nettest1/nettest1.c (deleted)
-
app/nettest1/print_error.c (deleted)
-
app/nettest1/print_error.h (deleted)
-
app/nettest2/Makefile (deleted)
-
app/nettest2/nettest.c (deleted)
-
app/nettest2/nettest.h (deleted)
-
app/nettest2/nettest2.c (deleted)
-
app/nettest2/print_error.c (deleted)
-
app/nettest2/print_error.h (deleted)
-
app/nettest3/Makefile (deleted)
-
app/nettest3/nettest3.c (deleted)
-
app/nterm/conn.c (modified) (view diffs)
-
app/trace/trace.c (modified) (view diffs)
-
app/websrv/websrv.c (modified) (view diffs)
-
drv/bus/usb/usbhub/usbhub.c (modified) (view diffs)
-
drv/bus/usb/vhc/devconn.c (modified) (view diffs)
-
drv/fb/amdm37x_dispc/amdm37x_dispc.c (modified) (view diffs)
-
lib/c/Makefile (modified) (view diffs)
-
lib/c/generic/adt/char_map.c (deleted)
-
lib/c/generic/adt/dynamic_fifo.c (deleted)
-
lib/c/generic/fibril.c (modified) (view diffs)
-
lib/c/generic/fibril_synch.c (modified) (view diffs)
-
lib/c/generic/getopt.c (modified) (view diffs)
-
lib/c/generic/inet.c (modified) (view diffs)
-
lib/c/generic/inet/addr.c (modified) (view diffs)
-
lib/c/generic/inet/endpoint.c (moved) (moved from uspace/lib/c/include/net/socket_parse.h ) (view diffs)
-
lib/c/generic/inet/tcp.c (added)
-
lib/c/generic/inet/udp.c (added)
-
lib/c/generic/iplink.c (modified) (view diffs)
-
lib/c/generic/irq.c (modified) (view diffs)
-
lib/c/generic/libc.c (modified) (view diffs)
-
lib/c/generic/net/inet.c (deleted)
-
lib/c/generic/net/socket_client.c (deleted)
-
lib/c/generic/net/socket_parse.c (deleted)
-
lib/c/generic/thread.c (modified) (view diffs)
-
lib/c/include/adt/dynamic_fifo.h (deleted)
-
lib/c/include/adt/generic_char_map.h (deleted)
-
lib/c/include/adt/generic_field.h (deleted)
-
lib/c/include/adt/int_map.h (deleted)
-
lib/c/include/async.h (modified) (view diffs)
-
lib/c/include/errno.h (modified) (view diffs)
-
lib/c/include/fibril.h (modified) (view diffs)
-
lib/c/include/fibril_synch.h (modified) (view diffs)
-
lib/c/include/inet/addr.h (modified) (view diffs)
-
lib/c/include/inet/endpoint.h (moved) (moved from uspace/lib/c/include/adt/char_map.h ) (view diffs)
-
lib/c/include/inet/iplink.h (modified) (view diffs)
-
lib/c/include/inet/tcp.h (added)
-
lib/c/include/inet/udp.h (added)
-
lib/c/include/ipc/services.h (modified) (view diffs)
-
lib/c/include/ipc/socket.h (deleted)
-
lib/c/include/ipc/tcp.h (added)
-
lib/c/include/ipc/udp.h (moved) (moved from uspace/lib/c/include/net/ip_protocols.h ) (view diffs)
-
lib/c/include/malloc.h (modified) (view diffs)
-
lib/c/include/mem.h (modified) (view diffs)
-
lib/c/include/net/in.h (deleted)
-
lib/c/include/net/in6.h (deleted)
-
lib/c/include/net/inet.h (deleted)
-
lib/c/include/net/socket.h (deleted)
-
lib/c/include/net/socket_codes.h (deleted)
-
lib/c/include/task.h (modified) (view diffs)
-
lib/drv/generic/interrupt.c (modified) (view diffs)
-
lib/http/include/http/http.h (modified) (view diffs)
-
lib/http/src/http.c (modified) (view diffs)
-
lib/http/src/request.c (modified) (view diffs)
-
lib/ieee80211/src/ieee80211.c (modified) (view diffs)
-
lib/net/include/socket_core.h (deleted)
-
lib/net/tl/socket_core.c (deleted)
-
lib/nettl/Makefile (moved) (moved from uspace/lib/net/Makefile ) (view diffs)
-
lib/nettl/include/nettl/amap.h (added)
-
lib/nettl/include/nettl/portrng.h (moved) (moved from uspace/app/nettest1/nettest.h ) (view diffs)
-
lib/nettl/src/amap.c (added)
-
lib/nettl/src/portrng.c (added)
-
lib/pcut/src/run.c (modified) (view diffs)
-
lib/posix/include/posix/errno.h (modified) (view diffs)
-
lib/posix/include/posix/stdlib.h (modified) (view diffs)
-
lib/posix/include/posix/string.h (modified) (view diffs)
-
lib/posix/source/signal.c (modified) (view diffs)
-
lib/usbdev/src/hub.c (modified) (view diffs)
-
srv/bd/sata_bd/sata_bd.c (modified) (view diffs)
-
srv/hid/remcons/remcons.c (modified) (view diffs)
-
srv/hid/remcons/remcons.h (modified) (view diffs)
-
srv/hid/remcons/user.c (modified) (view diffs)
-
srv/hid/remcons/user.h (modified) (view diffs)
-
srv/hid/rfb/main.c (modified) (view diffs)
-
srv/hid/rfb/rfb.c (modified) (view diffs)
-
srv/hid/rfb/rfb.h (modified) (view diffs)
-
srv/klog/klog.c (modified) (view diffs)
-
srv/net/dhcp/dhcp.c (modified) (view diffs)
-
srv/net/dhcp/transport.c (modified) (view diffs)
-
srv/net/dhcp/transport.h (modified) (view diffs)
-
srv/net/dnsrsrv/transport.c (modified) (view diffs)
-
srv/net/inetsrv/inet_link.c (modified) (view diffs)
-
srv/net/inetsrv/inetsrv.c (modified) (view diffs)
-
srv/net/inetsrv/inetsrv.h (modified) (view diffs)
-
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/tcp/Makefile (modified) (view diffs)
-
srv/net/tcp/conn.c (modified) (view diffs)
-
srv/net/tcp/conn.h (modified) (view diffs)
-
srv/net/tcp/ncsim.c (modified) (view diffs)
-
srv/net/tcp/ncsim.h (modified) (view diffs)
-
srv/net/tcp/pdu.c (modified) (view diffs)
-
srv/net/tcp/pdu.h (modified) (view diffs)
-
srv/net/tcp/rqueue.c (modified) (view diffs)
-
srv/net/tcp/rqueue.h (modified) (view diffs)
-
srv/net/tcp/service.c (added)
-
srv/net/tcp/service.h (moved) (moved from uspace/srv/net/tcp/sock.h ) (view diffs)
-
srv/net/tcp/sock.c (deleted)
-
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/tqueue.h (modified) (view diffs)
-
srv/net/tcp/ucall.c (modified) (view diffs)
-
srv/net/tcp/ucall.h (modified) (view diffs)
-
srv/net/udp/Makefile (modified) (view diffs)
-
srv/net/udp/assoc.c (modified) (view diffs)
-
srv/net/udp/assoc.h (modified) (view diffs)
-
srv/net/udp/msg.c (modified) (view diffs)
-
srv/net/udp/pdu.c (modified) (view diffs)
-
srv/net/udp/pdu.h (modified) (view diffs)
-
srv/net/udp/service.c (added)
-
srv/net/udp/service.h (moved) (moved from uspace/srv/net/udp/sock.h ) (view diffs)
-
srv/net/udp/sock.c (deleted)
-
srv/net/udp/ucall.c (deleted)
-
srv/net/udp/ucall.h (deleted)
-
srv/net/udp/udp.c (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.
