Changeset 8013637 in mainline for uspace/srv

Timestamp:

2012-07-20T13:51:28Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8fccd42

Parents:

c5bff3c (diff), 7030bc9 (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:

More mainline changes.

Location:

uspace/srv

Files:

• bd/ata_bd/ata_bd.c (modified) (view diffs)
• bd/file_bd/file_bd.c (modified) (view diffs)
• bd/gxe_bd/gxe_bd.c (modified) (view diffs)
• bd/part/guid_part/guid_part.c (modified) (view diffs)
• bd/part/mbr_part/mbr_part.c (modified) (view diffs)
• bd/rd/rd.c (modified) (view diffs)
• bd/sata_bd/Makefile (added)
• bd/sata_bd/sata_bd.c (added)
• bd/sata_bd/sata_bd.h (added)
• clipboard/clipboard.c (modified) (view diffs)
• devman/devman.h (modified) (view diffs)
• devman/main.c (modified) (view diffs)
• fs/fat/fat_dentry.c (modified) (view diffs)
• hid/console/console.c (modified) (view diffs)
• hid/fb/fb.c (modified) (view diffs)
• hid/input/ctl/kbdev.c (modified) (view diffs)
• hid/input/generic/input.c (modified) (view diffs)
• hid/input/port/adb.c (modified) (view diffs)
• hid/input/proto/mousedev.c (modified) (view diffs)
• hid/remcons/remcons.c (modified) (view diffs)
• hid/remcons/telnet.h (modified) (view diffs)
• hid/remcons/user.h (modified) (view diffs)
• hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• loader/main.c (modified) (view diffs)
• locsrv/Makefile (moved) (moved from uspace/srv/loc/Makefile ) (view diffs)
• locsrv/category.c (moved) (moved from uspace/srv/loc/category.c ) (view diffs)
• locsrv/category.h (moved) (moved from uspace/srv/loc/category.h ) (view diffs)
• locsrv/locsrv.c (moved) (moved from uspace/srv/loc/loc.c ) (view diffs)
• locsrv/locsrv.h (moved) (moved from uspace/srv/loc/loc.h ) (view diffs)
• net/ethip/ethip.c (modified) (view diffs)
• net/ethip/ethip_nic.c (modified) (view diffs)
• net/inetsrv/Makefile (moved) (moved from uspace/srv/net/inet/Makefile ) (view diffs)
• net/inetsrv/addrobj.c (moved) (moved from uspace/srv/net/inet/addrobj.c ) (view diffs)
• net/inetsrv/addrobj.h (moved) (moved from uspace/srv/net/inet/addrobj.h ) (view diffs)
• net/inetsrv/icmp.c (moved) (moved from uspace/srv/net/inet/icmp.c ) (view diffs)
• net/inetsrv/icmp.h (moved) (moved from uspace/srv/net/inet/icmp.h ) (view diffs)
• net/inetsrv/icmp_std.h (moved) (moved from uspace/srv/net/inet/icmp_std.h ) (view diffs)
• net/inetsrv/inet_link.c (moved) (moved from uspace/srv/net/inet/inet_link.c ) (view diffs)
• net/inetsrv/inet_link.h (moved) (moved from uspace/srv/net/inet/inet_link.h ) (view diffs)
• net/inetsrv/inet_std.h (moved) (moved from uspace/srv/net/inet/inet_std.h ) (view diffs)
• net/inetsrv/inet_util.c (moved) (moved from uspace/srv/net/inet/inet_util.c ) (view diffs)
• net/inetsrv/inet_util.h (moved) (moved from uspace/srv/net/inet/inet_util.h ) (view diffs)
• net/inetsrv/inetcfg.c (moved) (moved from uspace/srv/net/inet/inetcfg.c ) (view diffs)
• net/inetsrv/inetcfg.h (moved) (moved from uspace/srv/net/inet/inetcfg.h ) (view diffs)
• net/inetsrv/inetping.c (moved) (moved from uspace/srv/net/inet/inetping.c ) (view diffs)
• net/inetsrv/inetping.h (moved) (moved from uspace/srv/net/inet/inetping.h ) (view diffs)
• net/inetsrv/inetsrv.c (moved) (moved from uspace/srv/net/inet/inet.c ) (view diffs)
• net/inetsrv/inetsrv.h (moved) (moved from uspace/srv/net/inet/inet.h ) (view diffs)
• net/inetsrv/pdu.c (moved) (moved from uspace/srv/net/inet/pdu.c ) (view diffs)
• net/inetsrv/pdu.h (moved) (moved from uspace/srv/net/inet/pdu.h ) (view diffs)
• net/inetsrv/reass.c (moved) (moved from uspace/srv/net/inet/reass.c ) (view diffs)
• net/inetsrv/reass.h (moved) (moved from uspace/srv/net/inet/reass.h ) (view diffs)
• net/inetsrv/sroute.c (moved) (moved from uspace/srv/net/inet/sroute.c ) (view diffs)
• net/inetsrv/sroute.h (moved) (moved from uspace/srv/net/inet/sroute.h ) (view diffs)
• net/loopip/loopip.c (modified) (view diffs)
• net/tcp/conn.c (modified) (view diffs)
• net/tcp/ncsim.c (modified) (view diffs)
• net/tcp/ncsim.h (modified) (view diffs)
• net/tcp/rqueue.c (modified) (view diffs)
• net/tcp/rqueue.h (modified) (view diffs)
• net/tcp/segment.c (modified) (view diffs)
• net/tcp/sock.c (modified) (view diffs)
• net/tcp/tcp.c (modified) (view diffs)
• net/tcp/tcp_type.h (modified) (view diffs)
• net/tcp/test.c (modified) (view diffs)
• net/udp/sock.c (modified) (view diffs)
• net/udp/udp.c (modified) (view diffs)
• net/udp/udp_type.h (modified) (view diffs)
• ns/ns.c (modified) (view diffs)
• vfs/vfs.c (modified) (view diffs)