Changeset 52c4264 in mainline
- Timestamp:
- 2012-08-17T12:23:52Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 267f235
- Parents:
- ae2c925 (diff), ad78054 (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. - Files:
-
- 91 added
- 15 deleted
- 153 edited
- 39 moved
-
abi/include/fb/visuals.h (modified) (view diffs)
-
boot/Makefile.common (modified) (view diffs)
-
contrib/arch/uspace/srv/fs/fat/fat.bp (modified) (view diffs)
-
uspace/Makefile (modified) (view diffs)
-
uspace/Makefile.common (modified) (view diffs)
-
uspace/app/bdsh/cmds/modules/bdd/bdd.c (modified) (view diffs)
-
uspace/app/bdsh/input.c (modified) (view diffs)
-
uspace/app/blkdump/blkdump.c (modified) (view diffs)
-
uspace/app/edit/Makefile (modified) (view diffs)
-
uspace/app/edit/edit.c (modified) (view diffs)
-
uspace/app/edit/search.c (added)
-
uspace/app/edit/search.h (added)
-
uspace/app/edit/search_impl.h (added)
-
uspace/app/edit/sheet.c (modified) (view diffs)
-
uspace/app/edit/sheet.h (modified) (view diffs)
-
uspace/app/ext2info/ext2info.c (modified) (view diffs)
-
uspace/app/init/init.c (modified) (view diffs)
-
uspace/app/mkexfat/mkexfat.c (modified) (view diffs)
-
uspace/app/mkfat/mkfat.c (modified) (view diffs)
-
uspace/app/mkmfs/mkmfs.c (modified) (view diffs)
-
uspace/app/vdemo/Makefile (added)
-
uspace/app/vdemo/vdemo.c (added)
-
uspace/app/vlaunch/Makefile (added)
-
uspace/app/vlaunch/vlaunch.c (added)
-
uspace/app/vterm/Makefile (added)
-
uspace/app/vterm/vterm.c (added)
-
uspace/drv/block/ahci/ahci.c (modified) (view diffs)
-
uspace/drv/block/ahci/ahci.h (modified) (view diffs)
-
uspace/drv/bus/isa/isa.c (modified) (view diffs)
-
uspace/drv/bus/pci/pciintel/pci.c (modified) (view diffs)
-
uspace/drv/bus/usb/ehci/main.c (modified) (view diffs)
-
uspace/drv/bus/usb/ehci/res.c (modified) (view diffs)
-
uspace/drv/bus/usb/ehci/res.h (modified) (view diffs)
-
uspace/drv/bus/usb/ohci/hc.c (modified) (view diffs)
-
uspace/drv/bus/usb/ohci/main.c (modified) (view diffs)
-
uspace/drv/bus/usb/ohci/ohci.c (modified) (view diffs)
-
uspace/drv/bus/usb/ohci/res.c (modified) (view diffs)
-
uspace/drv/bus/usb/ohci/res.h (modified) (view diffs)
-
uspace/drv/bus/usb/uhci/main.c (modified) (view diffs)
-
uspace/drv/bus/usb/uhci/res.c (modified) (view diffs)
-
uspace/drv/bus/usb/uhci/res.h (modified) (view diffs)
-
uspace/drv/bus/usb/uhci/uhci.c (modified) (view diffs)
-
uspace/drv/bus/usb/uhcirh/main.c (modified) (view diffs)
-
uspace/drv/bus/usb/uhcirh/port.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbflbk/main.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbhid/generic/hiddev.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbhid/generic/hiddev.h (modified) (view diffs)
-
uspace/drv/bus/usb/usbhid/kbd/kbddev.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbhid/main.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbhid/mouse/mousedev.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbhid/multimedia/multimedia.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbhub/port.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbhub/usbhub.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbmast/main.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbmast/scsi_ms.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbmid/explore.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbmid/main.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbmid/usbmid.c (modified) (view diffs)
-
uspace/drv/bus/usb/vhc/conndev.c (modified) (view diffs)
-
uspace/drv/bus/usb/vhc/connhost.c (modified) (view diffs)
-
uspace/drv/bus/usb/vhc/hub.c (modified) (view diffs)
-
uspace/drv/bus/usb/vhc/main.c (modified) (view diffs)
-
uspace/drv/char/i8042/i8042.c (modified) (view diffs)
-
uspace/drv/char/i8042/main.c (modified) (view diffs)
-
uspace/drv/char/ns8250/ns8250.c (modified) (view diffs)
-
uspace/drv/char/ps2mouse/main.c (modified) (view diffs)
-
uspace/drv/char/ps2mouse/ps2mouse.c (modified) (view diffs)
-
uspace/drv/char/xtkbd/main.c (modified) (view diffs)
-
uspace/drv/char/xtkbd/xtkbd.c (modified) (view diffs)
-
uspace/drv/fb/kfb/Makefile (added)
-
uspace/drv/fb/kfb/kfb.c (added)
-
uspace/drv/fb/kfb/kfb.h (added)
-
uspace/drv/fb/kfb/kfb.ma (added)
-
uspace/drv/fb/kfb/port.c (added)
-
uspace/drv/fb/kfb/port.h (added)
-
uspace/drv/infrastructure/root/root.c (modified) (view diffs)
-
uspace/drv/infrastructure/rootmac/rootmac.c (modified) (view diffs)
-
uspace/drv/infrastructure/rootpc/rootpc.c (modified) (view diffs)
-
uspace/drv/infrastructure/rootvirt/devices.def (modified) (view diffs)
-
uspace/drv/infrastructure/rootvirt/rootvirt.c (modified) (view diffs)
-
uspace/drv/nic/e1k/e1k.c (modified) (view diffs)
-
uspace/drv/nic/ne2k/ne2k.c (modified) (view diffs)
-
uspace/drv/nic/rtl8139/driver.c (modified) (view diffs)
-
uspace/drv/test/test1/test1.c (modified) (view diffs)
-
uspace/drv/test/test2/test2.c (modified) (view diffs)
-
uspace/drv/test/test3/test3.c (modified) (view diffs)
-
uspace/lib/block/Makefile (modified) (view diffs)
-
uspace/lib/block/block.c (moved) (moved from uspace/lib/block/libblock.c ) (view diffs)
-
uspace/lib/block/block.h (moved) (moved from uspace/lib/block/libblock.h ) (view diffs)
-
uspace/lib/c/Makefile (modified) (view diffs)
-
uspace/lib/c/generic/device/graph_dev.c (added)
-
uspace/lib/c/generic/io/chargrid.c (moved) (moved from uspace/lib/fb/screenbuffer.c ) (view diffs)
-
uspace/lib/c/generic/io/output.c (added)
-
uspace/lib/c/generic/io/visualizer.c (added)
-
uspace/lib/c/generic/io/window.c (added)
-
uspace/lib/c/generic/str.c (modified) (view diffs)
-
uspace/lib/c/generic/task.c (modified) (view diffs)
-
uspace/lib/c/include/device/graph_dev.h (added)
-
uspace/lib/c/include/io/charfield.h (moved) (moved from uspace/lib/fb/screenbuffer.h ) (view diffs)
-
uspace/lib/c/include/io/chargrid.h (added)
-
uspace/lib/c/include/io/mode.h (added)
-
uspace/lib/c/include/io/output.h (added)
-
uspace/lib/c/include/io/pixel.h (added)
-
uspace/lib/c/include/io/pixelmap.h (added)
-
uspace/lib/c/include/io/visualizer.h (added)
-
uspace/lib/c/include/io/window.h (added)
-
uspace/lib/c/include/ipc/dev_iface.h (modified) (view diffs)
-
uspace/lib/c/include/ipc/graph.h (added)
-
uspace/lib/c/include/ipc/output.h (added)
-
uspace/lib/c/include/ipc/window.h (added)
-
uspace/lib/c/include/str.h (modified) (view diffs)
-
uspace/lib/c/include/task.h (modified) (view diffs)
-
uspace/lib/clui/tinput.c (modified) (view diffs)
-
uspace/lib/draw/Makefile (added)
-
uspace/lib/draw/codec/tga.c (added)
-
uspace/lib/draw/codec/tga.h (added)
-
uspace/lib/draw/cursor.c (added)
-
uspace/lib/draw/cursor.h (added)
-
uspace/lib/draw/cursor/embedded.c (added)
-
uspace/lib/draw/cursor/embedded.h (added)
-
uspace/lib/draw/drawctx.c (added)
-
uspace/lib/draw/drawctx.h (added)
-
uspace/lib/draw/font.c (added)
-
uspace/lib/draw/font.h (added)
-
uspace/lib/draw/font/embedded.c (added)
-
uspace/lib/draw/font/embedded.h (added)
-
uspace/lib/draw/gfx/cursor-11x18.c (added)
-
uspace/lib/draw/gfx/cursor-11x18.h (added)
-
uspace/lib/draw/gfx/font-8x16.c (moved) (moved from uspace/srv/hid/fb/gfx/font-8x16.c ) (view diffs)
-
uspace/lib/draw/gfx/font-8x16.h (moved) (moved from uspace/srv/hid/fb/gfx/font-8x16.h ) (view diffs)
-
uspace/lib/draw/path.c (added)
-
uspace/lib/draw/path.h (added)
-
uspace/lib/draw/source.c (added)
-
uspace/lib/draw/source.h (added)
-
uspace/lib/draw/surface.c (added)
-
uspace/lib/draw/surface.h (added)
-
uspace/lib/drv/Makefile (modified) (view diffs)
-
uspace/lib/drv/generic/dev_iface.c (modified) (view diffs)
-
uspace/lib/drv/generic/driver.c (modified) (view diffs)
-
uspace/lib/drv/generic/interrupt.c (modified) (view diffs)
-
uspace/lib/drv/generic/private/driver.h (added)
-
uspace/lib/drv/generic/remote_graph_dev.c (added)
-
uspace/lib/drv/include/ddf/driver.h (modified) (view diffs)
-
uspace/lib/drv/include/ops/graph_dev.h (added)
-
uspace/lib/drv/include/remote_graph_dev.h (added)
-
uspace/lib/ext2/libext2_block_group.h (modified) (view diffs)
-
uspace/lib/ext2/libext2_directory.h (modified) (view diffs)
-
uspace/lib/ext2/libext2_filesystem.c (modified) (view diffs)
-
uspace/lib/ext2/libext2_filesystem.h (modified) (view diffs)
-
uspace/lib/ext2/libext2_inode.h (modified) (view diffs)
-
uspace/lib/ext2/libext2_superblock.c (modified) (view diffs)
-
uspace/lib/ext2/libext2_superblock.h (modified) (view diffs)
-
uspace/lib/ext4/libext4_bitmap.c (modified) (view diffs)
-
uspace/lib/ext4/libext4_block_group.h (modified) (view diffs)
-
uspace/lib/ext4/libext4_filesystem.h (modified) (view diffs)
-
uspace/lib/ext4/libext4_inode.c (modified) (view diffs)
-
uspace/lib/ext4/libext4_inode.h (modified) (view diffs)
-
uspace/lib/ext4/libext4_superblock.c (modified) (view diffs)
-
uspace/lib/ext4/libext4_superblock.h (modified) (view diffs)
-
uspace/lib/ext4/libext4_types.h (modified) (view diffs)
-
uspace/lib/fb/fb.c (deleted)
-
uspace/lib/fb/fb.h (deleted)
-
uspace/lib/fb/imgmap.c (deleted)
-
uspace/lib/graph/Makefile (moved) (moved from uspace/lib/fb/Makefile ) (view diffs)
-
uspace/lib/graph/graph.c (added)
-
uspace/lib/graph/graph.h (added)
-
uspace/lib/gui/Makefile (added)
-
uspace/lib/gui/button.c (added)
-
uspace/lib/gui/button.h (added)
-
uspace/lib/gui/connection.c (added)
-
uspace/lib/gui/connection.h (added)
-
uspace/lib/gui/grid.c (added)
-
uspace/lib/gui/grid.h (added)
-
uspace/lib/gui/label.c (added)
-
uspace/lib/gui/label.h (added)
-
uspace/lib/gui/minimal.c (added)
-
uspace/lib/gui/minimal.h (added)
-
uspace/lib/gui/terminal.c (added)
-
uspace/lib/gui/terminal.h (added)
-
uspace/lib/gui/widget.c (added)
-
uspace/lib/gui/widget.h (added)
-
uspace/lib/gui/window.c (added)
-
uspace/lib/gui/window.h (added)
-
uspace/lib/nic/src/nic_driver.c (modified) (view diffs)
-
uspace/lib/nic/src/nic_impl.c (modified) (view diffs)
-
uspace/lib/softfloat/generic/softfloat.c (modified) (view diffs)
-
uspace/lib/softfloat/include/softfloat.h (modified) (view diffs)
-
uspace/lib/softrend/Makefile (added)
-
uspace/lib/softrend/compose.c (added)
-
uspace/lib/softrend/compose.h (added)
-
uspace/lib/softrend/filter.c (added)
-
uspace/lib/softrend/filter.h (added)
-
uspace/lib/softrend/pixconv.c (added)
-
uspace/lib/softrend/pixconv.h (moved) (moved from uspace/lib/fb/imgmap.h ) (view diffs)
-
uspace/lib/softrend/rectangle.c (added)
-
uspace/lib/softrend/rectangle.h (added)
-
uspace/lib/softrend/transform.c (added)
-
uspace/lib/softrend/transform.h (added)
-
uspace/lib/usb/include/usb/hc.h (modified) (view diffs)
-
uspace/lib/usb/src/ddfiface.c (modified) (view diffs)
-
uspace/lib/usb/src/hc.c (modified) (view diffs)
-
uspace/lib/usbdev/src/devdrv.c (modified) (view diffs)
-
uspace/lib/usbdev/src/devpoll.c (modified) (view diffs)
-
uspace/lib/usbdev/src/hub.c (modified) (view diffs)
-
uspace/lib/usbdev/src/recognise.c (modified) (view diffs)
-
uspace/lib/usbhost/include/usb/host/hcd.h (modified) (view diffs)
-
uspace/srv/bd/gxe_bd/gxe_bd.c (modified) (view diffs)
-
uspace/srv/bd/part/guid_part/guid_part.c (modified) (view diffs)
-
uspace/srv/bd/part/mbr_part/mbr_part.c (modified) (view diffs)
-
uspace/srv/bd/sata_bd/sata_bd.c (modified) (view diffs)
-
uspace/srv/fs/cdfs/cdfs_ops.c (modified) (view diffs)
-
uspace/srv/fs/exfat/exfat_bitmap.c (modified) (view diffs)
-
uspace/srv/fs/exfat/exfat_directory.c (modified) (view diffs)
-
uspace/srv/fs/exfat/exfat_fat.c (modified) (view diffs)
-
uspace/srv/fs/exfat/exfat_fat.h (modified) (view diffs)
-
uspace/srv/fs/exfat/exfat_ops.c (modified) (view diffs)
-
uspace/srv/fs/ext2fs/ext2fs_ops.c (modified) (view diffs)
-
uspace/srv/fs/fat/fat_directory.c (modified) (view diffs)
-
uspace/srv/fs/fat/fat_fat.c (modified) (view diffs)
-
uspace/srv/fs/fat/fat_fat.h (modified) (view diffs)
-
uspace/srv/fs/fat/fat_ops.c (modified) (view diffs)
-
uspace/srv/fs/mfs/mfs.h (modified) (view diffs)
-
uspace/srv/fs/tmpfs/tmpfs_dump.c (modified) (view diffs)
-
uspace/srv/hid/compositor/Makefile (added)
-
uspace/srv/hid/compositor/compositor.c (added)
-
uspace/srv/hid/compositor/compositor.h (added)
-
uspace/srv/hid/compositor/gfx/helenos.tga (moved) (moved from uspace/srv/hid/console/gfx/helenos.tga ) (view diffs)
-
uspace/srv/hid/compositor/gfx/nameic.tga (moved) (moved from uspace/srv/hid/console/gfx/nameic.tga ) (view diffs)
-
uspace/srv/hid/console/Makefile (modified) (view diffs)
-
uspace/srv/hid/console/console.c (modified) (view diffs)
-
uspace/srv/hid/console/gfx/anim_1.tga (deleted)
-
uspace/srv/hid/console/gfx/anim_2.tga (deleted)
-
uspace/srv/hid/console/gfx/anim_3.tga (deleted)
-
uspace/srv/hid/console/gfx/anim_4.tga (deleted)
-
uspace/srv/hid/console/gfx/cons_data.tga (deleted)
-
uspace/srv/hid/console/gfx/cons_dis.tga (deleted)
-
uspace/srv/hid/console/gfx/cons_dis_sel.tga (deleted)
-
uspace/srv/hid/console/gfx/cons_idle.tga (deleted)
-
uspace/srv/hid/console/gfx/cons_kernel.tga (deleted)
-
uspace/srv/hid/console/gfx/cons_sel.tga (deleted)
-
uspace/srv/hid/fb/fb.c (deleted)
-
uspace/srv/hid/fb/fb.h (deleted)
-
uspace/srv/hid/input/Makefile (modified) (view diffs)
-
uspace/srv/hid/input/ctl/apple.c (modified) (view diffs)
-
uspace/srv/hid/input/ctl/gxe_fb.c (modified) (view diffs)
-
uspace/srv/hid/input/ctl/kbdev.c (modified) (view diffs)
-
uspace/srv/hid/input/ctl/pc.c (modified) (view diffs)
-
uspace/srv/hid/input/ctl/stty.c (modified) (view diffs)
-
uspace/srv/hid/input/ctl/sun.c (modified) (view diffs)
-
uspace/srv/hid/input/gsp.c (moved) (moved from uspace/srv/hid/input/generic/gsp.c ) (view diffs)
-
uspace/srv/hid/input/gsp.h (moved) (moved from uspace/srv/hid/input/include/gsp.h ) (view diffs)
-
uspace/srv/hid/input/input.c (moved) (moved from uspace/srv/hid/input/generic/input.c ) (view diffs)
-
uspace/srv/hid/input/input.h (moved) (moved from uspace/srv/hid/input/include/input.h ) (view diffs)
-
uspace/srv/hid/input/kbd.h (moved) (moved from uspace/srv/hid/input/include/kbd.h ) (view diffs)
-
uspace/srv/hid/input/kbd_ctl.h (moved) (moved from uspace/srv/hid/input/include/kbd_ctl.h ) (view diffs)
-
uspace/srv/hid/input/kbd_port.h (moved) (moved from uspace/srv/hid/input/include/kbd_port.h ) (view diffs)
-
uspace/srv/hid/input/layout.c (moved) (moved from uspace/srv/hid/input/generic/layout.c ) (view diffs)
-
uspace/srv/hid/input/layout.h (moved) (moved from uspace/srv/hid/input/include/layout.h ) (view diffs)
-
uspace/srv/hid/input/layout/cz.c (modified) (view diffs)
-
uspace/srv/hid/input/layout/us_dvorak.c (modified) (view diffs)
-
uspace/srv/hid/input/layout/us_qwerty.c (modified) (view diffs)
-
uspace/srv/hid/input/mouse.h (moved) (moved from uspace/srv/hid/input/include/mouse.h ) (view diffs)
-
uspace/srv/hid/input/mouse_port.h (moved) (moved from uspace/srv/hid/input/include/mouse_port.h ) (view diffs)
-
uspace/srv/hid/input/mouse_proto.h (moved) (moved from uspace/srv/hid/input/include/mouse_proto.h ) (view diffs)
-
uspace/srv/hid/input/port/adb.c (modified) (view diffs)
-
uspace/srv/hid/input/port/adb_mouse.c (modified) (view diffs)
-
uspace/srv/hid/input/port/chardev.c (modified) (view diffs)
-
uspace/srv/hid/input/port/gxemul.c (modified) (view diffs)
-
uspace/srv/hid/input/port/msim.c (modified) (view diffs)
-
uspace/srv/hid/input/port/niagara.c (modified) (view diffs)
-
uspace/srv/hid/input/port/ns16550.c (modified) (view diffs)
-
uspace/srv/hid/input/port/pl050.c (modified) (view diffs)
-
uspace/srv/hid/input/port/ski.c (modified) (view diffs)
-
uspace/srv/hid/input/proto/adb.c (modified) (view diffs)
-
uspace/srv/hid/input/proto/mousedev.c (modified) (view diffs)
-
uspace/srv/hid/input/stroke.c (moved) (moved from uspace/srv/hid/input/generic/stroke.c ) (view diffs)
-
uspace/srv/hid/input/stroke.h (moved) (moved from uspace/srv/hid/input/include/stroke.h ) (view diffs)
-
uspace/srv/hid/output/Makefile (moved) (moved from uspace/srv/hid/fb/Makefile ) (view diffs)
-
uspace/srv/hid/output/ctl/serial.c (moved) (moved from uspace/srv/hid/fb/ctl/serial.c ) (view diffs)
-
uspace/srv/hid/output/ctl/serial.h (moved) (moved from uspace/srv/hid/fb/ctl/serial.h ) (view diffs)
-
uspace/srv/hid/output/gfx/font-8x16.c (added)
-
uspace/srv/hid/output/gfx/font-8x16.h (added)
-
uspace/srv/hid/output/output.c (added)
-
uspace/srv/hid/output/output.h (added)
-
uspace/srv/hid/output/port/ega.c (moved) (moved from uspace/srv/hid/fb/port/ega.c ) (view diffs)
-
uspace/srv/hid/output/port/ega.h (moved) (moved from uspace/srv/hid/fb/port/ega.h ) (view diffs)
-
uspace/srv/hid/output/port/kchar.c (moved) (moved from uspace/srv/hid/fb/port/kchar.c ) (view diffs)
-
uspace/srv/hid/output/port/kchar.h (moved) (moved from uspace/srv/hid/fb/port/kchar.h ) (view diffs)
-
uspace/srv/hid/output/port/kfb.c (moved) (moved from uspace/srv/hid/fb/port/kfb.c ) (view diffs)
-
uspace/srv/hid/output/port/kfb.h (moved) (moved from uspace/srv/hid/fb/port/kfb.h ) (view diffs)
-
uspace/srv/hid/output/port/niagara.c (moved) (moved from uspace/srv/hid/fb/port/niagara.c ) (view diffs)
-
uspace/srv/hid/output/port/niagara.h (moved) (moved from uspace/srv/hid/fb/port/niagara.h ) (view diffs)
-
uspace/srv/hid/output/port/ski.c (moved) (moved from uspace/srv/hid/fb/port/ski.c ) (view diffs)
-
uspace/srv/hid/output/port/ski.h (moved) (moved from uspace/srv/hid/fb/port/ski.h ) (view diffs)
-
uspace/srv/hid/output/proto/vt100.c (moved) (moved from uspace/srv/hid/fb/proto/vt100.c ) (view diffs)
-
uspace/srv/hid/output/proto/vt100.h (moved) (moved from uspace/srv/hid/fb/proto/vt100.h ) (view diffs)
-
uspace/srv/hid/remcons/remcons.c (modified) (view diffs)
-
uspace/srv/locsrv/locsrv.c (modified) (view diffs)
Note:
See TracChangeset
for help on using the changeset viewer.
