Changeset 6843a9c in mainline for uspace/srv
- Timestamp:
- 2012-06-29T13:02:14Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 722912e
- Parents:
- ba72f2b (diff), 0bbd13e (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/srv
- Files:
-
- 75 added
- 27 deleted
- 56 edited
- 20 moved
-
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)
-
clipboard/Makefile (moved) (moved from uspace/srv/clip/Makefile ) (view diffs)
-
clipboard/clip.h (moved) (moved from uspace/srv/clip/clip.h ) (view diffs)
-
clipboard/clipboard.c (moved) (moved from uspace/srv/clip/clip.c ) (view diffs)
-
devman/devman.c (modified) (view diffs)
-
devman/devman.h (modified) (view diffs)
-
devman/main.c (modified) (view diffs)
-
fs/exfat/exfat_bitmap.c (modified) (view diffs)
-
fs/exfat/exfat_bitmap.h (modified) (view diffs)
-
fs/exfat/exfat_dentry.c (modified) (view diffs)
-
fs/exfat/exfat_dentry.h (modified) (view diffs)
-
fs/exfat/exfat_directory.c (modified) (view diffs)
-
fs/exfat/exfat_fat.c (modified) (view diffs)
-
fs/exfat/exfat_ops.c (modified) (view diffs)
-
fs/fat/fat_dentry.c (modified) (view diffs)
-
fs/fat/fat_directory.c (modified) (view diffs)
-
fs/mfs/mfs.h (modified) (view diffs)
-
fs/mfs/mfs_balloc.c (modified) (view diffs)
-
fs/mfs/mfs_dentry.c (modified) (view diffs)
-
fs/mfs/mfs_inode.c (modified) (view diffs)
-
fs/mfs/mfs_ops.c (modified) (view diffs)
-
fs/mfs/mfs_rw.c (modified) (view diffs)
-
hid/console/console.c (modified) (view diffs)
-
hid/fb/fb.c (modified) (view diffs)
-
hid/fb/port/ega.c (modified) (view diffs)
-
hid/fb/port/kchar.c (modified) (view diffs)
-
hid/fb/port/kfb.c (modified) (view diffs)
-
hid/fb/port/niagara.c (modified) (view diffs)
-
hid/input/Makefile (modified) (view diffs)
-
hid/input/ctl/kbdev.c (modified) (view diffs)
-
hid/input/generic/input.c (modified) (view diffs)
-
hid/input/include/mouse.h (modified) (view diffs)
-
hid/input/include/mouse_proto.h (modified) (view diffs)
-
hid/input/port/adb.c (modified) (view diffs)
-
hid/input/port/chardev.c (modified) (view diffs)
-
hid/input/port/chardev_mouse.c (deleted)
-
hid/input/port/gxemul.c (modified) (view diffs)
-
hid/input/port/msim.c (modified) (view diffs)
-
hid/input/port/niagara.c (modified) (view diffs)
-
hid/input/port/ns16550.c (modified) (view diffs)
-
hid/input/port/pl050.c (modified) (view diffs)
-
hid/input/proto/adb.c (modified) (view diffs)
-
hid/input/proto/mousedev.c (modified) (view diffs)
-
hid/input/proto/ps2.c (deleted)
-
hid/remcons/Makefile (added)
-
hid/remcons/remcons.c (added)
-
hid/remcons/remcons.h (added)
-
hid/remcons/telnet.h (moved) (moved from uspace/lib/usbdev/src/pipepriv.h ) (view diffs)
-
hid/remcons/user.c (added)
-
hid/remcons/user.h (added)
-
hid/s3c24xx_ts/Makefile (modified) (view diffs)
-
hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
-
hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
-
hw/bus/cuda_adb/cuda_adb.h (modified) (view diffs)
-
hw/char/i8042/i8042.c (deleted)
-
hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
-
hw/irc/apic/apic.c (modified) (view diffs)
-
hw/irc/obio/obio.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/cfg/general (deleted)
-
net/cfg/lo.nic (deleted)
-
net/cfg/ne2k.nic (deleted)
-
net/ethip/Makefile (added)
-
net/ethip/arp.c (added)
-
net/ethip/arp.h (added)
-
net/ethip/atrans.c (added)
-
net/ethip/atrans.h (moved) (moved from uspace/lib/net/include/icmp_client.h ) (view diffs)
-
net/ethip/ethip.c (added)
-
net/ethip/ethip.h (added)
-
net/ethip/ethip_nic.c (added)
-
net/ethip/ethip_nic.h (added)
-
net/ethip/pdu.c (added)
-
net/ethip/pdu.h (added)
-
net/ethip/std.h (added)
-
net/il/arp/Makefile (deleted)
-
net/il/arp/arp.c (deleted)
-
net/il/arp/arp.h (deleted)
-
net/il/ip/Makefile (deleted)
-
net/il/ip/ip.c (deleted)
-
net/il/ip/ip.h (deleted)
-
net/inetsrv/Makefile (added)
-
net/inetsrv/addrobj.c (added)
-
net/inetsrv/addrobj.h (added)
-
net/inetsrv/icmp.c (added)
-
net/inetsrv/icmp.h (added)
-
net/inetsrv/icmp_std.h (moved) (moved from uspace/lib/c/include/net/icmp_api.h ) (view diffs)
-
net/inetsrv/inet_link.c (added)
-
net/inetsrv/inet_link.h (added)
-
net/inetsrv/inet_std.h (added)
-
net/inetsrv/inet_util.c (added)
-
net/inetsrv/inet_util.h (added)
-
net/inetsrv/inetcfg.c (added)
-
net/inetsrv/inetcfg.h (added)
-
net/inetsrv/inetping.c (added)
-
net/inetsrv/inetping.h (added)
-
net/inetsrv/inetsrv.c (added)
-
net/inetsrv/inetsrv.h (added)
-
net/inetsrv/pdu.c (added)
-
net/inetsrv/pdu.h (added)
-
net/inetsrv/reass.c (added)
-
net/inetsrv/reass.h (added)
-
net/inetsrv/sroute.c (added)
-
net/inetsrv/sroute.h (added)
-
net/loopip/Makefile (added)
-
net/loopip/loopip.c (added)
-
net/net/Makefile (deleted)
-
net/net/net.c (deleted)
-
net/net/net.h (deleted)
-
net/net/packet_server.c (deleted)
-
net/nil/eth/Makefile (deleted)
-
net/nil/eth/eth.c (deleted)
-
net/nil/eth/eth.h (deleted)
-
net/nil/nildummy/Makefile (deleted)
-
net/nil/nildummy/nildummy.c (deleted)
-
net/nil/nildummy/nildummy.h (deleted)
-
net/tcp/Makefile (moved) (moved from uspace/srv/net/tl/tcp/Makefile ) (view diffs)
-
net/tcp/conn.c (added)
-
net/tcp/conn.h (added)
-
net/tcp/iqueue.c (added)
-
net/tcp/iqueue.h (added)
-
net/tcp/ncsim.c (added)
-
net/tcp/ncsim.h (added)
-
net/tcp/pdu.c (added)
-
net/tcp/pdu.h (added)
-
net/tcp/rqueue.c (added)
-
net/tcp/rqueue.h (added)
-
net/tcp/segment.c (added)
-
net/tcp/segment.h (moved) (moved from uspace/lib/net/include/ethernet_protocols.h ) (view diffs)
-
net/tcp/seq_no.c (added)
-
net/tcp/seq_no.h (moved) (moved from uspace/lib/net/include/il_remote.h ) (view diffs)
-
net/tcp/sock.c (added)
-
net/tcp/sock.h (moved) (moved from kernel/arch/ia32/include/drivers/vesa.h ) (view diffs)
-
net/tcp/std.h (added)
-
net/tcp/tcp.c (added)
-
net/tcp/tcp.h (moved) (moved from uspace/lib/c/include/net/icmp_common.h ) (view diffs)
-
net/tcp/tcp_header.h (moved) (moved from uspace/srv/net/tl/tcp/tcp_header.h ) (view diffs)
-
net/tcp/tcp_type.h (added)
-
net/tcp/test.c (added)
-
net/tcp/test.h (added)
-
net/tcp/tqueue.c (added)
-
net/tcp/tqueue.h (added)
-
net/tcp/ucall.c (added)
-
net/tcp/ucall.h (added)
-
net/tl/icmp/Makefile (deleted)
-
net/tl/icmp/icmp.c (deleted)
-
net/tl/tcp/tcp.c (deleted)
-
net/tl/tcp/tcp.h (deleted)
-
net/tl/udp/udp.c (deleted)
-
net/udp/Makefile (moved) (moved from uspace/srv/net/tl/udp/Makefile ) (view diffs)
-
net/udp/assoc.c (added)
-
net/udp/assoc.h (moved) (moved from uspace/lib/net/include/ethernet_lsap.h ) (view diffs)
-
net/udp/msg.c (added)
-
net/udp/msg.h (added)
-
net/udp/pdu.c (added)
-
net/udp/pdu.h (added)
-
net/udp/sock.c (added)
-
net/udp/sock.h (added)
-
net/udp/std.h (added)
-
net/udp/ucall.c (added)
-
net/udp/ucall.h (added)
-
net/udp/udp.c (moved) (moved from uspace/srv/net/tl/udp/udp.h ) (view diffs)
-
net/udp/udp_inet.c (added)
-
net/udp/udp_inet.h (added)
-
net/udp/udp_type.h (added)
-
ns/ns.c (modified) (view diffs)
-
vfs/vfs.c (modified) (view diffs)
-
vfs/vfs.h (modified) (view diffs)
-
vfs/vfs_ops.c (modified) (view diffs)
Note:
See TracChangeset
for help on using the changeset viewer.
