Changeset 00aece0 in mainline for uspace/srv
- Timestamp:
- 2012-02-18T16:47:38Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 4449c6c
- Parents:
- bd5f3b7 (diff), f943dd3 (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:
-
- 63 added
- 15 deleted
- 79 edited
- 22 moved
-
bd/ata_bd/ata_bd.c (modified) (view diffs)
-
bd/ata_bd/ata_hw.h (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)
-
devman/devman.c (modified) (view diffs)
-
devman/devman.h (modified) (view diffs)
-
devman/main.c (modified) (view diffs)
-
fs/cdfs/Makefile (added)
-
fs/cdfs/cdfs.c (added)
-
fs/cdfs/cdfs.h (added)
-
fs/cdfs/cdfs_endian.h (added)
-
fs/cdfs/cdfs_ops.c (added)
-
fs/cdfs/cdfs_ops.h (added)
-
fs/exfat/Makefile (moved) (moved from uspace/srv/net/netif/lo/Makefile ) (view diffs)
-
fs/exfat/exfat.c (added)
-
fs/exfat/exfat.h (added)
-
fs/exfat/exfat_bitmap.c (added)
-
fs/exfat/exfat_bitmap.h (moved) (moved from uspace/drv/bus/usb/uhci/batch.h ) (view diffs)
-
fs/exfat/exfat_dentry.c (added)
-
fs/exfat/exfat_dentry.h (added)
-
fs/exfat/exfat_directory.c (added)
-
fs/exfat/exfat_directory.h (added)
-
fs/exfat/exfat_fat.c (added)
-
fs/exfat/exfat_fat.h (added)
-
fs/exfat/exfat_idx.c (added)
-
fs/exfat/exfat_ops.c (added)
-
fs/ext2fs/ext2fs.c (modified) (view diffs)
-
fs/ext2fs/ext2fs_ops.c (modified) (view diffs)
-
fs/fat/Makefile (modified) (view diffs)
-
fs/fat/fat.c (modified) (view diffs)
-
fs/fat/fat.h (modified) (view diffs)
-
fs/fat/fat_dentry.c (modified) (view diffs)
-
fs/fat/fat_dentry.h (modified) (view diffs)
-
fs/fat/fat_directory.c (added)
-
fs/fat/fat_directory.h (added)
-
fs/fat/fat_fat.c (modified) (view diffs)
-
fs/fat/fat_fat.h (modified) (view diffs)
-
fs/fat/fat_idx.c (modified) (view diffs)
-
fs/fat/fat_ops.c (modified) (view diffs)
-
fs/locfs/locfs.c (modified) (view diffs)
-
fs/locfs/locfs_ops.c (modified) (view diffs)
-
fs/mfs/Makefile (moved) (moved from uspace/srv/hw/netif/ne2000/Makefile ) (view diffs)
-
fs/mfs/mfs.c (added)
-
fs/mfs/mfs.h (added)
-
fs/mfs/mfs_balloc.c (added)
-
fs/mfs/mfs_dentry.c (added)
-
fs/mfs/mfs_inode.c (added)
-
fs/mfs/mfs_ops.c (added)
-
fs/mfs/mfs_rw.c (added)
-
fs/mfs/mfs_utils.c (added)
-
fs/tmpfs/tmpfs.c (modified) (view diffs)
-
fs/tmpfs/tmpfs_ops.c (modified) (view diffs)
-
hid/console/Makefile (modified) (view diffs)
-
hid/console/console.c (modified) (view diffs)
-
hid/console/console.h (modified) (view diffs)
-
hid/console/gcons.c (deleted)
-
hid/console/gfx/anim_1.tga (modified) (view diffs)
-
hid/console/gfx/anim_2.tga (modified) (view diffs)
-
hid/console/gfx/anim_3.tga (modified) (view diffs)
-
hid/console/gfx/anim_4.tga (modified) (view diffs)
-
hid/console/gfx/cons_data.tga (moved) (moved from uspace/srv/hid/console/gfx/cons_has_data.tga ) (view diffs)
-
hid/console/gfx/cons_dis.tga (added)
-
hid/console/gfx/cons_dis_sel.tga (added)
-
hid/console/gfx/cons_kernel.tga (modified) (view diffs)
-
hid/console/gfx/cons_sel.tga (moved) (moved from uspace/srv/hid/console/gfx/cons_selected.tga ) (view diffs)
-
hid/console/keybuffer.c (deleted)
-
hid/fb/Makefile (modified) (view diffs)
-
hid/fb/ctl/serial.c (added)
-
hid/fb/ctl/serial.h (moved) (moved from uspace/srv/hid/fb/msim.h ) (view diffs)
-
hid/fb/ega.c (deleted)
-
hid/fb/fb.c (modified) (view diffs)
-
hid/fb/fb.h (modified) (view diffs)
-
hid/fb/gfx/font-8x16.c (moved) (moved from uspace/srv/hid/fb/font-8x16.c ) (view diffs)
-
hid/fb/gfx/font-8x16.h (moved) (moved from uspace/srv/hid/fb/font-8x16.h ) (view diffs)
-
hid/fb/main.c (deleted)
-
hid/fb/pointer.xbm (deleted)
-
hid/fb/pointer_mask.xbm (deleted)
-
hid/fb/port/ega.c (added)
-
hid/fb/port/ega.h (moved) (moved from uspace/srv/hid/fb/ega.h ) (view diffs)
-
hid/fb/port/kchar.c (moved) (moved from uspace/srv/hid/fb/msim.c ) (view diffs)
-
hid/fb/port/kchar.h (moved) (moved from uspace/srv/hid/fb/main.h ) (view diffs)
-
hid/fb/port/kfb.c (added)
-
hid/fb/port/kfb.h (added)
-
hid/fb/port/niagara.c (moved) (moved from uspace/srv/hid/fb/niagara.c ) (view diffs)
-
hid/fb/port/niagara.h (moved) (moved from uspace/srv/hid/fb/niagara.h ) (view diffs)
-
hid/fb/port/ski.c (moved) (moved from uspace/srv/hid/fb/ski.c ) (view diffs)
-
hid/fb/port/ski.h (moved) (moved from uspace/srv/hid/fb/ski.h ) (view diffs)
-
hid/fb/proto/vt100.c (added)
-
hid/fb/proto/vt100.h (added)
-
hid/fb/serial_console.c (deleted)
-
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/input.h (modified) (view diffs)
-
hid/input/include/mouse.h (modified) (view diffs)
-
hid/input/include/mouse_proto.h (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 (moved) (moved from uspace/drv/bus/usb/uhci/iface.h ) (view diffs)
-
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/s3c24xx_ts.c (modified) (view diffs)
-
hid/s3c24xx_ts/s3c24xx_ts.h (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/char/s3c24xx_uart/s3c24xx_uart.h (modified) (view diffs)
-
hw/irc/apic/apic.c (modified) (view diffs)
-
hw/irc/obio/obio.c (modified) (view diffs)
-
hw/netif/ne2000/ne2000.c (deleted)
-
loc/loc.c (modified) (view diffs)
-
net/cfg/e1k.nic (added)
-
net/cfg/lo.nic (moved) (moved from uspace/srv/net/cfg/lo ) (view diffs)
-
net/cfg/ne2k.nic (moved) (moved from uspace/srv/net/cfg/ne2k ) (view diffs)
-
net/documentation.txt (deleted)
-
net/il/arp/arp.c (modified) (view diffs)
-
net/il/arp/arp.h (modified) (view diffs)
-
net/il/ip/ip.c (modified) (view diffs)
-
net/il/ip/ip.h (modified) (view diffs)
-
net/net/Makefile (modified) (view diffs)
-
net/net/net.c (modified) (view diffs)
-
net/net/net.h (modified) (view diffs)
-
net/net/net_standalone.c (deleted)
-
net/net/packet_server.c (moved) (moved from uspace/lib/packet/generic/packet_server.c ) (view diffs)
-
net/net/packet_server.h (moved) (moved from uspace/lib/packet/include/packet_server.h ) (view diffs)
-
net/netif/lo/lo.c (deleted)
-
net/nil/eth/eth.c (modified) (view diffs)
-
net/nil/eth/eth.h (modified) (view diffs)
-
net/nil/nildummy/nildummy.c (modified) (view diffs)
-
net/nil/nildummy/nildummy.h (modified) (view diffs)
-
net/tl/icmp/icmp.c (modified) (view diffs)
-
net/tl/tcp/Makefile (modified) (view diffs)
-
net/tl/tcp/conn.c (added)
-
net/tl/tcp/conn.h (added)
-
net/tl/tcp/iqueue.c (added)
-
net/tl/tcp/iqueue.h (added)
-
net/tl/tcp/ncsim.c (added)
-
net/tl/tcp/ncsim.h (added)
-
net/tl/tcp/pdu.c (added)
-
net/tl/tcp/pdu.h (added)
-
net/tl/tcp/rqueue.c (added)
-
net/tl/tcp/rqueue.h (added)
-
net/tl/tcp/segment.c (added)
-
net/tl/tcp/segment.h (moved) (moved from uspace/srv/hid/console/keybuffer.h ) (view diffs)
-
net/tl/tcp/seq_no.c (added)
-
net/tl/tcp/seq_no.h (added)
-
net/tl/tcp/sock.c (added)
-
net/tl/tcp/sock.h (added)
-
net/tl/tcp/std.h (added)
-
net/tl/tcp/tcp.c (modified) (view diffs)
-
net/tl/tcp/tcp.h (modified) (view diffs)
-
net/tl/tcp/tcp_header.h (deleted)
-
net/tl/tcp/tcp_type.h (added)
-
net/tl/tcp/test.c (added)
-
net/tl/tcp/test.h (added)
-
net/tl/tcp/tqueue.c (added)
-
net/tl/tcp/tqueue.h (added)
-
net/tl/tcp/ucall.c (added)
-
net/tl/tcp/ucall.h (added)
-
net/tl/udp/udp.c (modified) (view diffs)
-
vfs/vfs.c (modified) (view diffs)
-
vfs/vfs.h (modified) (view diffs)
-
vfs/vfs_ops.c (modified) (view diffs)
-
vfs/vfs_register.c (modified) (view diffs)
Note:
See TracChangeset
for help on using the changeset viewer.
