Changeset b0f00a9 in mainline for uspace/srv
- Timestamp:
- 2011-11-06T22:21:05Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 898e847
- Parents:
- 2bdf8313 (diff), 7b5f4c9 (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:
-
- 68 added
- 32 deleted
- 75 edited
- 50 moved
-
bd/ata_bd/ata_bd.c (modified) (view diffs)
-
bd/ata_bd/ata_bd.h (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)
-
clip/clip.c (modified) (view diffs)
-
devman/devman.c (modified) (view diffs)
-
devman/devman.h (modified) (view diffs)
-
devman/main.c (modified) (view diffs)
-
devman/match.c (modified) (view diffs)
-
devman/util.c (modified) (view diffs)
-
devman/util.h (modified) (view diffs)
-
devmap/devmap.c (deleted)
-
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/devfs/devfs.c (deleted)
-
fs/devfs/devfs_ops.c (deleted)
-
fs/exfat/Makefile (added)
-
fs/exfat/exfat.c (moved) (moved from uspace/srv/hid/adb_mouse/adb_dev.c ) (view diffs)
-
fs/exfat/exfat.h (added)
-
fs/exfat/exfat_bitmap.c (added)
-
fs/exfat/exfat_bitmap.h (moved) (moved from uspace/srv/fs/devfs/devfs_ops.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/Makefile (added)
-
fs/ext2fs/ext2fs.c (added)
-
fs/ext2fs/ext2fs.h (moved) (moved from uspace/srv/hid/kbd/include/kbd_port.h ) (view diffs)
-
fs/ext2fs/ext2fs_ops.c (added)
-
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/Makefile (moved) (moved from uspace/srv/fs/devfs/Makefile ) (view diffs)
-
fs/locfs/locfs.c (added)
-
fs/locfs/locfs.h (moved) (moved from kernel/test/fpu/sse1_skip.c ) (view diffs)
-
fs/locfs/locfs_ops.c (added)
-
fs/locfs/locfs_ops.h (moved) (moved from uspace/srv/fs/devfs/devfs.h ) (view diffs)
-
fs/mfs/Makefile (added)
-
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.h (modified) (view diffs)
-
fs/tmpfs/tmpfs_dump.c (modified) (view diffs)
-
fs/tmpfs/tmpfs_ops.c (modified) (view diffs)
-
hid/adb_mouse/adb_mouse.c (deleted)
-
hid/char_mouse/char_mouse.c (deleted)
-
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.ppm (deleted)
-
hid/console/gfx/anim_1.tga (added)
-
hid/console/gfx/anim_2.ppm (deleted)
-
hid/console/gfx/anim_2.tga (added)
-
hid/console/gfx/anim_3.ppm (deleted)
-
hid/console/gfx/anim_3.tga (added)
-
hid/console/gfx/anim_4.ppm (deleted)
-
hid/console/gfx/anim_4.tga (added)
-
hid/console/gfx/cons_data.tga (added)
-
hid/console/gfx/cons_dis.tga (added)
-
hid/console/gfx/cons_dis_sel.tga (added)
-
hid/console/gfx/cons_has_data.ppm (deleted)
-
hid/console/gfx/cons_idle.ppm (deleted)
-
hid/console/gfx/cons_idle.tga (added)
-
hid/console/gfx/cons_kernel.ppm (deleted)
-
hid/console/gfx/cons_kernel.tga (added)
-
hid/console/gfx/cons_sel.tga (added)
-
hid/console/gfx/cons_selected.ppm (deleted)
-
hid/console/gfx/helenos.ppm (deleted)
-
hid/console/gfx/helenos.tga (added)
-
hid/console/gfx/nameic.ppm (deleted)
-
hid/console/gfx/nameic.tga (added)
-
hid/console/keybuffer.c (deleted)
-
hid/fb/Makefile (modified) (view diffs)
-
hid/fb/ctl/serial.c (added)
-
hid/fb/ctl/serial.h (added)
-
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 (added)
-
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/ppm.c (deleted)
-
hid/fb/proto/vt100.c (added)
-
hid/fb/proto/vt100.h (added)
-
hid/fb/serial_console.c (deleted)
-
hid/fb/sgcn.c (deleted)
-
hid/input/Makefile (added)
-
hid/input/ctl/apple.c (moved) (moved from uspace/srv/hid/kbd/ctl/apple.c ) (view diffs)
-
hid/input/ctl/gxe_fb.c (moved) (moved from uspace/srv/hid/kbd/ctl/gxe_fb.c ) (view diffs)
-
hid/input/ctl/kbdev.c (added)
-
hid/input/ctl/pc.c (moved) (moved from uspace/srv/hid/kbd/ctl/pc.c ) (view diffs)
-
hid/input/ctl/stty.c (moved) (moved from uspace/srv/hid/kbd/ctl/stty.c ) (view diffs)
-
hid/input/ctl/sun.c (moved) (moved from uspace/srv/hid/kbd/ctl/sun.c ) (view diffs)
-
hid/input/generic/gsp.c (moved) (moved from uspace/srv/hid/kbd/genarch/gsp.c ) (view diffs)
-
hid/input/generic/input.c (added)
-
hid/input/generic/layout.c (added)
-
hid/input/generic/stroke.c (moved) (moved from uspace/srv/hid/kbd/genarch/stroke.c ) (view diffs)
-
hid/input/include/gsp.h (moved) (moved from uspace/srv/hid/kbd/include/gsp.h ) (view diffs)
-
hid/input/include/input.h (moved) (moved from uspace/srv/hid/kbd/include/kbd.h ) (view diffs)
-
hid/input/include/kbd.h (added)
-
hid/input/include/kbd_ctl.h (moved) (moved from uspace/srv/hid/kbd/include/kbd_ctl.h ) (view diffs)
-
hid/input/include/kbd_port.h (added)
-
hid/input/include/layout.h (added)
-
hid/input/include/mouse.h (added)
-
hid/input/include/mouse_port.h (moved) (moved from uspace/srv/hid/char_mouse/include/mouse_port.h ) (view diffs)
-
hid/input/include/mouse_proto.h (moved) (moved from uspace/srv/hid/char_mouse/include/mouse_proto.h ) (view diffs)
-
hid/input/include/stroke.h (moved) (moved from uspace/srv/hid/kbd/include/stroke.h ) (view diffs)
-
hid/input/include/sun.h (moved) (moved from uspace/srv/hid/kbd/include/sun.h ) (view diffs)
-
hid/input/layout/cz.c (moved) (moved from uspace/srv/hid/kbd/layout/cz.c ) (view diffs)
-
hid/input/layout/us_dvorak.c (moved) (moved from uspace/srv/hid/kbd/layout/us_dvorak.c ) (view diffs)
-
hid/input/layout/us_qwerty.c (moved) (moved from uspace/srv/hid/kbd/layout/us_qwerty.c ) (view diffs)
-
hid/input/port/adb.c (moved) (moved from uspace/srv/hid/kbd/port/adb.c ) (view diffs)
-
hid/input/port/adb_mouse.c (moved) (moved from uspace/srv/hid/char_mouse/chardev.c ) (view diffs)
-
hid/input/port/chardev.c (moved) (moved from uspace/srv/hid/kbd/port/chardev.c ) (view diffs)
-
hid/input/port/chardev_mouse.c (added)
-
hid/input/port/dummy.c (moved) (moved from uspace/srv/hid/kbd/port/dummy.c ) (view diffs)
-
hid/input/port/gxemul.c (moved) (moved from uspace/srv/hid/kbd/port/gxemul.c ) (view diffs)
-
hid/input/port/msim.c (moved) (moved from uspace/srv/hid/kbd/port/msim.c ) (view diffs)
-
hid/input/port/niagara.c (moved) (moved from uspace/srv/hid/kbd/port/niagara.c ) (view diffs)
-
hid/input/port/ns16550.c (moved) (moved from uspace/srv/hid/kbd/port/ns16550.c ) (view diffs)
-
hid/input/port/pl050.c (moved) (moved from uspace/srv/hid/kbd/port/pl050.c ) (view diffs)
-
hid/input/port/sgcn.c (moved) (moved from uspace/srv/hid/kbd/port/sgcn.c ) (view diffs)
-
hid/input/port/ski.c (moved) (moved from uspace/srv/hid/kbd/port/ski.c ) (view diffs)
-
hid/input/port/sun.c (moved) (moved from uspace/srv/hid/kbd/port/sun.c ) (view diffs)
-
hid/input/port/z8530.c (moved) (moved from uspace/srv/hid/kbd/port/z8530.c ) (view diffs)
-
hid/input/proto/adb.c (added)
-
hid/input/proto/mousedev.c (added)
-
hid/input/proto/ps2.c (moved) (moved from uspace/srv/hid/char_mouse/proto/ps2.c ) (view diffs)
-
hid/kbd/Makefile (deleted)
-
hid/kbd/generic/kbd.c (deleted)
-
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 (modified) (view diffs)
-
hw/char/i8042/i8042.h (modified) (view diffs)
-
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/fhc/fhc.c (deleted)
-
hw/irc/i8259/i8259.c (modified) (view diffs)
-
hw/irc/obio/obio.c (modified) (view diffs)
-
hw/netif/ne2000/ne2000.c (deleted)
-
loader/Makefile (modified) (view diffs)
-
loader/include/elf.h (deleted)
-
loader/main.c (modified) (view diffs)
-
loc/Makefile (moved) (moved from uspace/srv/devmap/Makefile ) (view diffs)
-
loc/category.c (added)
-
loc/category.h (added)
-
loc/loc.c (added)
-
loc/loc.h (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/tcp.c (modified) (view diffs)
-
net/tl/tcp/tcp.h (modified) (view diffs)
-
net/tl/tcp/tcp_header.h (modified) (view diffs)
-
net/tl/udp/udp.c (modified) (view diffs)
-
net/tl/udp/udp.h (modified) (view diffs)
-
ns/clonable.c (modified) (view diffs)
-
ns/service.c (modified) (view diffs)
-
ns/task.c (modified) (view diffs)
-
taskmon/taskmon.c (modified) (view diffs)
-
vfs/vfs.c (modified) (view diffs)
-
vfs/vfs.h (modified) (view diffs)
-
vfs/vfs_file.c (modified) (view diffs)
-
vfs/vfs_lookup.c (modified) (view diffs)
-
vfs/vfs_node.c (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.
