Changeset 3b3e776 in mainline for uspace/srv

Timestamp:

2010-02-05T10:57:50Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

0358da0

Parents:

3f085132 (diff), b4cbef1 (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:

merged with head

Location:

uspace/srv

Files:

• Makefile.common (moved) (moved from uspace/srv/loader/Makefile.build ) (view diffs)
• bd/ata_bd/Makefile (modified) (view diffs)
• bd/ata_bd/Makefile.build (deleted)
• bd/ata_bd/ata_bd.c (modified) (view diffs)
• bd/ata_bd/ata_bd.h (modified) (view diffs)
• bd/file_bd/Makefile (modified) (view diffs)
• bd/file_bd/Makefile.build (deleted)
• bd/file_bd/file_bd.c (modified) (view diffs)
• bd/gxe_bd/Makefile (modified) (view diffs)
• bd/gxe_bd/Makefile.build (deleted)
• bd/gxe_bd/gxe_bd.c (modified) (view diffs)
• bd/part/guid_part/Makefile (added)
• bd/part/guid_part/gpt.h (added)
• bd/part/guid_part/guid_part.c (added)
• bd/part/mbr_part/Makefile (added)
• bd/part/mbr_part/Makefile.build (moved) (moved from uspace/srv/part/mbr_part/Makefile.build ) (view diffs)
• bd/part/mbr_part/Makefile.common (moved) (moved from uspace/srv/part/mbr_part/Makefile.common ) (view diffs)
• bd/part/mbr_part/mbr_part.c (moved) (moved from uspace/srv/part/mbr_part/mbr_part.c ) (view diffs)
• bd/rd/Makefile (modified) (view diffs)
• bd/rd/Makefile.build (deleted)
• bd/rd/Makefile.common (deleted)
• bd/rd/rd.c (modified) (view diffs)
• clip/Makefile (moved) (moved from uspace/srv/fb/Makefile.common ) (view diffs)
• clip/clip.c (added)
• clip/clip.h (added)
• console/Makefile (deleted)
• console/Makefile.common (deleted)
• dd/Makefile (modified) (view diffs)
• devmap/Makefile (modified) (view diffs)
• devmap/Makefile.build (deleted)
• devmap/Makefile.common (deleted)
• devmap/devmap.c (modified) (view diffs)
• fs/devfs/Makefile (modified) (view diffs)
• fs/devfs/Makefile.build (deleted)
• fs/devfs/Makefile.common (deleted)
• fs/devfs/devfs.c (modified) (view diffs)
• fs/devfs/devfs_ops.c (modified) (view diffs)
• fs/devfs/devfs_ops.h (modified) (view diffs)
• fs/fat/Makefile (modified) (view diffs)
• fs/fat/Makefile.build (deleted)
• fs/fat/Makefile.common (deleted)
• fs/fat/fat.c (modified) (view diffs)
• fs/fat/fat.h (modified) (view diffs)
• 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/tmpfs/Makefile (modified) (view diffs)
• fs/tmpfs/Makefile.build (deleted)
• fs/tmpfs/Makefile.common (deleted)
• fs/tmpfs/tmpfs.c (modified) (view diffs)
• fs/tmpfs/tmpfs.h (modified) (view diffs)
• fs/tmpfs/tmpfs_ops.c (modified) (view diffs)
• hid/adb_mouse/Makefile (added)
• hid/adb_mouse/adb_dev.c (added)
• hid/adb_mouse/adb_dev.h (added)
• hid/adb_mouse/adb_mouse.c (added)
• hid/adb_mouse/adb_mouse.h (added)
• hid/char_mouse/Makefile (moved) (moved from uspace/app/klog/Makefile.common ) (view diffs)
• hid/char_mouse/char_mouse.c (added)
• hid/char_mouse/chardev.c (added)
• hid/char_mouse/include/char_mouse.h (added)
• hid/char_mouse/include/mouse_port.h (added)
• hid/char_mouse/include/mouse_proto.h (added)
• hid/char_mouse/proto/ps2.c (added)
• hid/console/Makefile (moved) (moved from uspace/srv/cir/fhc/Makefile ) (view diffs)
• hid/console/Makefile.build (moved) (moved from uspace/srv/console/Makefile.build ) (view diffs)
• hid/console/Makefile.common (moved) (moved from uspace/srv/bd/gxe_bd/Makefile.common ) (view diffs)
• hid/console/console.c (moved) (moved from uspace/srv/console/console.c ) (view diffs)
• hid/console/console.h (moved) (moved from uspace/srv/console/console.h ) (view diffs)
• hid/console/gcons.c (moved) (moved from uspace/srv/console/gcons.c ) (view diffs)
• hid/console/gcons.h (moved) (moved from uspace/srv/console/gcons.h ) (view diffs)
• hid/console/gfx/anim_1.ppm (moved) (moved from uspace/srv/console/gfx/anim_1.ppm ) (view diffs)
• hid/console/gfx/anim_2.ppm (moved) (moved from uspace/srv/console/gfx/anim_2.ppm ) (view diffs)
• hid/console/gfx/anim_3.ppm (moved) (moved from uspace/srv/console/gfx/anim_3.ppm ) (view diffs)
• hid/console/gfx/anim_4.ppm (moved) (moved from uspace/srv/console/gfx/anim_4.ppm ) (view diffs)
• hid/console/gfx/cons_has_data.ppm (moved) (moved from uspace/srv/console/gfx/cons_has_data.ppm ) (view diffs)
• hid/console/gfx/cons_idle.ppm (moved) (moved from uspace/srv/console/gfx/cons_idle.ppm ) (view diffs)
• hid/console/gfx/cons_kernel.ppm (moved) (moved from uspace/srv/console/gfx/cons_kernel.ppm ) (view diffs)
• hid/console/gfx/cons_selected.ppm (moved) (moved from uspace/srv/console/gfx/cons_selected.ppm ) (view diffs)
• hid/console/gfx/helenos.ppm (moved) (moved from uspace/srv/console/gfx/helenos.ppm ) (view diffs)
• hid/console/gfx/nameic.ppm (moved) (moved from uspace/srv/console/gfx/nameic.ppm ) (view diffs)
• hid/console/keybuffer.c (moved) (moved from uspace/srv/console/keybuffer.c ) (view diffs)
• hid/console/keybuffer.h (moved) (moved from uspace/srv/console/keybuffer.h ) (view diffs)
• hid/console/screenbuffer.c (moved) (moved from uspace/srv/console/screenbuffer.c ) (view diffs)
• hid/console/screenbuffer.h (moved) (moved from uspace/srv/console/screenbuffer.h ) (view diffs)
• hid/fb/Makefile (moved) (moved from uspace/srv/fb/Makefile ) (view diffs)
• hid/fb/Makefile.build (moved) (moved from uspace/srv/fb/Makefile.build ) (view diffs)
• hid/fb/Makefile.common (moved) (moved from uspace/srv/bd/ata_bd/Makefile.common ) (view diffs)
• hid/fb/ega.c (moved) (moved from uspace/srv/fb/ega.c ) (view diffs)
• hid/fb/ega.h (moved) (moved from uspace/srv/fb/ega.h ) (view diffs)
• hid/fb/fb.c (moved) (moved from uspace/srv/fb/fb.c ) (view diffs)
• hid/fb/fb.h (moved) (moved from uspace/srv/fb/fb.h ) (view diffs)
• hid/fb/font-8x16.c (moved) (moved from uspace/srv/fb/font-8x16.c ) (view diffs)
• hid/fb/font-8x16.h (moved) (moved from uspace/srv/fb/font-8x16.h ) (view diffs)
• hid/fb/main.c (moved) (moved from uspace/srv/fb/main.c ) (view diffs)
• hid/fb/main.h (moved) (moved from uspace/srv/fb/main.h ) (view diffs)
• hid/fb/msim.c (moved) (moved from uspace/srv/fb/msim.c ) (view diffs)
• hid/fb/msim.h (moved) (moved from uspace/srv/fb/msim.h ) (view diffs)
• hid/fb/pointer.xbm (moved) (moved from uspace/srv/fb/pointer.xbm ) (view diffs)
• hid/fb/pointer_mask.xbm (moved) (moved from uspace/srv/fb/pointer_mask.xbm ) (view diffs)
• hid/fb/ppm.c (moved) (moved from uspace/srv/fb/ppm.c ) (view diffs)
• hid/fb/ppm.h (moved) (moved from uspace/srv/fb/ppm.h ) (view diffs)
• hid/fb/serial_console.c (moved) (moved from uspace/srv/fb/serial_console.c ) (view diffs)
• hid/fb/serial_console.h (moved) (moved from uspace/srv/fb/serial_console.h ) (view diffs)
• hid/fb/sgcn.c (moved) (moved from uspace/srv/fb/sgcn.c ) (view diffs)
• hid/fb/sgcn.h (moved) (moved from uspace/srv/fb/sgcn.h ) (view diffs)
• hid/fb/ski.c (moved) (moved from uspace/srv/fb/ski.c ) (view diffs)
• hid/fb/ski.h (moved) (moved from uspace/srv/fb/ski.h ) (view diffs)
• hid/kbd/Makefile (moved) (moved from uspace/srv/cir/obio/Makefile ) (view diffs)
• hid/kbd/Makefile.build (moved) (moved from uspace/srv/kbd/Makefile.build ) (view diffs)
• hid/kbd/Makefile.common (moved) (moved from uspace/srv/bd/file_bd/Makefile.common ) (view diffs)
• hid/kbd/ctl/apple.c (added)
• hid/kbd/ctl/gxe_fb.c (moved) (moved from uspace/srv/kbd/ctl/gxe_fb.c ) (view diffs)
• hid/kbd/ctl/pc.c (moved) (moved from uspace/srv/kbd/ctl/pc.c ) (view diffs)
• hid/kbd/ctl/pl050.c (moved) (moved from uspace/srv/kbd/ctl/pl050.c ) (view diffs)
• hid/kbd/ctl/stty.c (moved) (moved from uspace/srv/kbd/ctl/stty.c ) (view diffs)
• hid/kbd/ctl/sun.c (moved) (moved from uspace/srv/kbd/ctl/sun.c ) (view diffs)
• hid/kbd/genarch/gsp.c (moved) (moved from uspace/srv/kbd/genarch/gsp.c ) (view diffs)
• hid/kbd/genarch/stroke.c (moved) (moved from uspace/srv/kbd/genarch/stroke.c ) (view diffs)
• hid/kbd/generic/kbd.c (moved) (moved from uspace/srv/kbd/generic/kbd.c ) (view diffs)
• hid/kbd/include/gsp.h (moved) (moved from uspace/srv/kbd/include/gsp.h ) (view diffs)
• hid/kbd/include/kbd.h (moved) (moved from uspace/srv/kbd/include/kbd.h ) (view diffs)
• hid/kbd/include/kbd_ctl.h (moved) (moved from uspace/srv/kbd/include/kbd_ctl.h ) (view diffs)
• hid/kbd/include/kbd_port.h (moved) (moved from uspace/srv/kbd/include/kbd_port.h ) (view diffs)
• hid/kbd/include/layout.h (moved) (moved from uspace/srv/kbd/include/layout.h ) (view diffs)
• hid/kbd/include/stroke.h (moved) (moved from uspace/srv/kbd/include/stroke.h ) (view diffs)
• hid/kbd/include/sun.h (moved) (moved from uspace/srv/kbd/include/sun.h ) (view diffs)
• hid/kbd/layout/cz.c (moved) (moved from uspace/srv/kbd/layout/cz.c ) (view diffs)
• hid/kbd/layout/us_dvorak.c (moved) (moved from uspace/srv/kbd/layout/us_dvorak.c ) (view diffs)
• hid/kbd/layout/us_qwerty.c (moved) (moved from uspace/srv/kbd/layout/us_qwerty.c ) (view diffs)
• hid/kbd/port/adb.c (added)
• hid/kbd/port/chardev.c (added)
• hid/kbd/port/dummy.c (moved) (moved from uspace/srv/kbd/port/dummy.c ) (view diffs)
• hid/kbd/port/gxemul.c (moved) (moved from uspace/srv/kbd/port/gxemul.c ) (view diffs)
• hid/kbd/port/i8042.h (moved) (moved from uspace/srv/kbd/port/i8042.h ) (view diffs)
• hid/kbd/port/msim.c (moved) (moved from uspace/srv/kbd/port/msim.c ) (view diffs)
• hid/kbd/port/ns16550.c (moved) (moved from uspace/srv/kbd/port/ns16550.c ) (view diffs)
• hid/kbd/port/pl050.c (moved) (moved from uspace/srv/kbd/port/pl050.c ) (view diffs)
• hid/kbd/port/sgcn.c (moved) (moved from uspace/srv/kbd/port/sgcn.c ) (view diffs)
• hid/kbd/port/ski.c (moved) (moved from uspace/srv/kbd/port/ski.c ) (view diffs)
• hid/kbd/port/sun.c (moved) (moved from uspace/srv/kbd/port/sun.c ) (view diffs)
• hid/kbd/port/z8530.c (moved) (moved from uspace/srv/kbd/port/z8530.c ) (view diffs)
• hw/bus/cuda_adb/Makefile (moved) (moved from uspace/lib/softint/Makefile.common ) (view diffs)
• hw/bus/cuda_adb/cuda_adb.c (added)
• hw/bus/cuda_adb/cuda_adb.h (added)
• hw/bus/pci/Makefile (moved) (moved from uspace/app/init/Makefile.common ) (view diffs)
• hw/bus/pci/Makefile.build (moved) (moved from uspace/srv/pci/Makefile.build ) (view diffs)
• hw/bus/pci/Makefile.common (moved) (moved from uspace/srv/pci/Makefile.common ) (view diffs)
• hw/bus/pci/pci.c (added)
• hw/bus/pci/update-ids (added)
• hw/char/i8042/Makefile (moved) (moved from uspace/srv/dd/Makefile.common ) (view diffs)
• hw/char/i8042/i8042.c (added)
• hw/char/i8042/i8042.h (added)
• hw/cir/fhc/Makefile (moved) (moved from uspace/srv/ns/Makefile.common ) (view diffs)
• hw/cir/fhc/Makefile.build (moved) (moved from uspace/srv/cir/fhc/Makefile.build ) (view diffs)
• hw/cir/fhc/Makefile.common (moved) (moved from uspace/srv/cir/fhc/Makefile.common ) (view diffs)
• hw/cir/fhc/fhc.c (moved) (moved from uspace/srv/cir/fhc/fhc.c ) (view diffs)
• hw/cir/obio/Makefile (moved) (moved from uspace/srv/kbd/Makefile.common ) (view diffs)
• hw/cir/obio/Makefile.build (moved) (moved from uspace/srv/cir/obio/Makefile.build ) (view diffs)
• hw/cir/obio/Makefile.common (moved) (moved from uspace/srv/cir/obio/Makefile.common ) (view diffs)
• hw/cir/obio/obio.c (moved) (moved from uspace/srv/cir/obio/obio.c ) (view diffs)
• kbd/Makefile (deleted)
• kbd/port/i8042.c (deleted)
• loader/Makefile (modified) (view diffs)
• loader/Makefile.common (deleted)
• loader/arch/amd64/Makefile.inc (modified) (view diffs)
• loader/arch/arm32/Makefile.inc (modified) (view diffs)
• loader/arch/arm32/arm32.s (modified) (view diffs)
• loader/arch/ia32/Makefile.inc (modified) (view diffs)
• loader/arch/ia64/Makefile.inc (modified) (view diffs)
• loader/arch/mips32/Makefile.inc (modified) (view diffs)
• loader/arch/ppc32/Makefile.inc (modified) (view diffs)
• loader/arch/sparc64/Makefile.inc (modified) (view diffs)
• loader/elf_load.c (modified) (view diffs)
• loader/main.c (modified) (view diffs)
• ns/Makefile (modified) (view diffs)
• ns/Makefile.build (deleted)
• part/mbr_part/Makefile (deleted)
• pci/Makefile (deleted)
• pci/libpci/Makefile (deleted)
• taskmon/Makefile (moved) (moved from uspace/lib/libblock/Makefile.common ) (view diffs)
• taskmon/taskmon.c (added)
• vfs/Makefile (modified) (view diffs)
• vfs/Makefile.build (deleted)
• vfs/Makefile.common (deleted)
• 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)