- Timestamp:
- 2013-03-10T14:56:21Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 05bab88
- Parents:
- ea906c29 (diff), 2277e03 (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
- Files:
-
- 29 added
- 15 deleted
- 265 edited
- 6 moved
-
Makefile (modified) (view diffs)
-
Makefile.common (modified) (view diffs)
-
app/bdsh/compl.c (modified) (view diffs)
-
app/bdsh/input.c (modified) (view diffs)
-
app/edit/edit.c (modified) (view diffs)
-
app/edit/sheet.h (modified) (view diffs)
-
app/ext2info/ext2info.c (deleted)
-
app/init/init.c (modified) (view diffs)
-
app/klog/Makefile (modified) (view diffs)
-
app/klog/klog.c (modified) (view diffs)
-
app/mkbd/main.c (modified) (view diffs)
-
app/mkexfat/exfat.h (modified) (view diffs)
-
app/mkexfat/mkexfat.c (modified) (view diffs)
-
app/nettest2/nettest2.c (modified) (view diffs)
-
app/nterm/conn.c (modified) (view diffs)
-
app/nterm/nterm.c (modified) (view diffs)
-
app/ping/ping.c (modified) (view diffs)
-
app/stats/stats.c (modified) (view diffs)
-
app/taskdump/taskdump.c (modified) (view diffs)
-
app/tester/Makefile (modified) (view diffs)
-
app/tester/ext2/ext2_1.c (deleted)
-
app/tester/ext2/ext2_1.def (deleted)
-
app/tester/float/softfloat1.c (modified) (view diffs)
-
app/tester/mm/common.c (modified) (view diffs)
-
app/tester/mm/common.h (modified) (view diffs)
-
app/tester/mm/mapping1.c (modified) (view diffs)
-
app/tester/print/print5.def (modified) (view diffs)
-
app/tester/print/print6.c (added)
-
app/tester/print/print6.def (added)
-
app/tester/tester.c (modified) (view diffs)
-
app/tester/tester.h (modified) (view diffs)
-
app/tetris/screen.c (modified) (view diffs)
-
app/tetris/screen.h (modified) (view diffs)
-
app/trace/trace.c (modified) (view diffs)
-
app/usbinfo/desctree.c (modified) (view diffs)
-
app/usbinfo/dump.c (modified) (view diffs)
-
app/usbinfo/list.c (modified) (view diffs)
-
app/usbinfo/main.c (modified) (view diffs)
-
app/vdemo/vdemo.c (modified) (view diffs)
-
app/vlaunch/vlaunch.c (modified) (view diffs)
-
app/vterm/vterm.c (modified) (view diffs)
-
app/websrv/websrv.c (modified) (view diffs)
-
dist/src/c/demos/edit/edit.c (modified) (view diffs)
-
dist/src/c/demos/edit/sheet.h (modified) (view diffs)
-
dist/src/c/demos/tetris/screen.c (modified) (view diffs)
-
dist/src/c/demos/tetris/screen.h (modified) (view diffs)
-
drv/bus/isa/i8237.c (modified) (view diffs)
-
drv/bus/isa/isa.c (modified) (view diffs)
-
drv/bus/pci/pciintel/pci.c (modified) (view diffs)
-
drv/bus/usb/ehci/ehci.ma (modified) (view diffs)
-
drv/bus/usb/ohci/hw_struct/transfer_descriptor.h (modified) (view diffs)
-
drv/bus/usb/ohci/ohci.ma (modified) (view diffs)
-
drv/bus/usb/ohci/ohci_regs.h (modified) (view diffs)
-
drv/bus/usb/uhci/hc.c (modified) (view diffs)
-
drv/bus/usb/uhci/hc.h (modified) (view diffs)
-
drv/bus/usb/uhcirh/port.c (modified) (view diffs)
-
drv/bus/usb/usbhid/generic/hiddev.c (modified) (view diffs)
-
drv/bus/usb/usbhid/usbhid.h (modified) (view diffs)
-
drv/bus/usb/usbhub/port.c (modified) (view diffs)
-
drv/bus/usb/usbhub/status.h (modified) (view diffs)
-
drv/bus/usb/usbhub/usbhub.c (modified) (view diffs)
-
drv/bus/usb/usbmast/bo_trans.c (modified) (view diffs)
-
drv/char/i8042/i8042.c (modified) (view diffs)
-
drv/char/ns8250/ns8250.c (modified) (view diffs)
-
drv/char/ps2mouse/ps2mouse.c (modified) (view diffs)
-
drv/fb/amdm37x_dispc/Makefile (moved) (moved from uspace/srv/fs/ext2fs/Makefile ) (view diffs)
-
drv/fb/amdm37x_dispc/amdm37x_dispc.c (added)
-
drv/fb/amdm37x_dispc/amdm37x_dispc.h (added)
-
drv/fb/amdm37x_dispc/amdm37x_dispc.ma (added)
-
drv/fb/amdm37x_dispc/amdm37x_dispc_regs.h (added)
-
drv/fb/amdm37x_dispc/main.c (added)
-
drv/fb/kfb/port.c (modified) (view diffs)
-
drv/infrastructure/root/root.c (modified) (view diffs)
-
drv/infrastructure/rootamdm37x/Makefile (moved) (moved from uspace/app/ext2info/Makefile ) (view diffs)
-
drv/infrastructure/rootamdm37x/amdm37x.c (added)
-
drv/infrastructure/rootamdm37x/amdm37x.h (added)
-
drv/infrastructure/rootamdm37x/cm/clock_control.h (added)
-
drv/infrastructure/rootamdm37x/cm/core.h (added)
-
drv/infrastructure/rootamdm37x/cm/iva2.h (added)
-
drv/infrastructure/rootamdm37x/cm/mpu.h (added)
-
drv/infrastructure/rootamdm37x/cm/usbhost.h (moved) (moved from kernel/arch/arm32/include/arch/mach/testarm/testarm.h ) (view diffs)
-
drv/infrastructure/rootamdm37x/prm/clock_control.h (moved) (moved from uspace/srv/fs/ext2fs/ext2fs.c ) (view diffs)
-
drv/infrastructure/rootamdm37x/prm/global_reg.h (added)
-
drv/infrastructure/rootamdm37x/prm/usbhost.h (added)
-
drv/infrastructure/rootamdm37x/rootamdm37x.c (added)
-
drv/infrastructure/rootamdm37x/rootamdm37x.ma (added)
-
drv/infrastructure/rootamdm37x/uhh.h (added)
-
drv/infrastructure/rootamdm37x/usbtll.h (added)
-
drv/infrastructure/rootpc/rootpc.c (modified) (view diffs)
-
drv/nic/e1k/e1k.c (modified) (view diffs)
-
drv/nic/ne2k/dp8390.c (modified) (view diffs)
-
drv/nic/rtl8139/defs.h (modified) (view diffs)
-
drv/nic/rtl8139/driver.c (modified) (view diffs)
-
drv/time/cmos-rtc/cmos-rtc.c (modified) (view diffs)
-
lib/bithenge/src/helenos/common.h (modified) (view diffs)
-
lib/c/Makefile (modified) (view diffs)
-
lib/c/arch/abs32le/include/libarch/atomic.h (modified) (view diffs)
-
lib/c/arch/abs32le/include/libarch/ddi.h (modified) (view diffs)
-
lib/c/arch/abs32le/src/entryjmp.c (modified) (view diffs)
-
lib/c/arch/abs32le/src/fibril.c (modified) (view diffs)
-
lib/c/arch/abs32le/src/stacktrace.c (modified) (view diffs)
-
lib/c/arch/abs32le/src/tls.c (modified) (view diffs)
-
lib/c/arch/amd64/src/stacktrace.c (modified) (view diffs)
-
lib/c/arch/amd64/src/tls.c (modified) (view diffs)
-
lib/c/arch/arm32/Makefile.common (modified) (view diffs)
-
lib/c/arch/arm32/include/libarch/atomic.h (modified) (view diffs)
-
lib/c/arch/arm32/include/libarch/cp15.h (added)
-
lib/c/arch/arm32/include/libarch/ddi.h (modified) (view diffs)
-
lib/c/arch/arm32/src/stacktrace.c (modified) (view diffs)
-
lib/c/arch/arm32/src/tls.c (modified) (view diffs)
-
lib/c/arch/ia32/include/libarch/ddi.h (modified) (view diffs)
-
lib/c/arch/ia32/src/stacktrace.c (modified) (view diffs)
-
lib/c/arch/ia32/src/tls.c (modified) (view diffs)
-
lib/c/arch/ia64/include/libarch/ddi.h (modified) (view diffs)
-
lib/c/arch/ia64/src/ddi.c (modified) (view diffs)
-
lib/c/arch/ia64/src/stacktrace.c (modified) (view diffs)
-
lib/c/arch/ia64/src/tls.c (modified) (view diffs)
-
lib/c/arch/mips32/include/libarch/ddi.h (modified) (view diffs)
-
lib/c/arch/mips32/src/stacktrace.c (modified) (view diffs)
-
lib/c/arch/mips32/src/tls.c (modified) (view diffs)
-
lib/c/arch/mips64/include/libarch/ddi.h (modified) (view diffs)
-
lib/c/arch/mips64/src/stacktrace.c (modified) (view diffs)
-
lib/c/arch/mips64/src/tls.c (modified) (view diffs)
-
lib/c/arch/ppc32/include/libarch/ddi.h (modified) (view diffs)
-
lib/c/arch/ppc32/src/stacktrace.c (modified) (view diffs)
-
lib/c/arch/ppc32/src/tls.c (modified) (view diffs)
-
lib/c/arch/sparc64/include/libarch/ddi.h (modified) (view diffs)
-
lib/c/arch/sparc64/src/stacktrace.c (modified) (view diffs)
-
lib/c/arch/sparc64/src/tls.c (modified) (view diffs)
-
lib/c/generic/adt/list.c (modified) (view diffs)
-
lib/c/generic/async.c (modified) (view diffs)
-
lib/c/generic/ddi.c (modified) (view diffs)
-
lib/c/generic/devman.c (modified) (view diffs)
-
lib/c/generic/double_to_str.c (added)
-
lib/c/generic/fibril.c (modified) (view diffs)
-
lib/c/generic/ieee_double.c (added)
-
lib/c/generic/io/chargrid.c (modified) (view diffs)
-
lib/c/generic/io/io.c (modified) (view diffs)
-
lib/c/generic/io/klog.c (modified) (view diffs)
-
lib/c/generic/io/printf_core.c (modified) (view diffs)
-
lib/c/generic/io/window.c (modified) (view diffs)
-
lib/c/generic/loc.c (modified) (view diffs)
-
lib/c/generic/malloc.c (modified) (view diffs)
-
lib/c/generic/pio_trace.c (added)
-
lib/c/generic/power_of_ten.c (added)
-
lib/c/generic/private/async.h (modified) (view diffs)
-
lib/c/generic/private/power_of_ten.h (added)
-
lib/c/generic/stack.c (added)
-
lib/c/generic/stdlib.c (modified) (view diffs)
-
lib/c/generic/sysinfo.c (modified) (view diffs)
-
lib/c/generic/thread.c (modified) (view diffs)
-
lib/c/generic/time.c (modified) (view diffs)
-
lib/c/generic/tls.c (modified) (view diffs)
-
lib/c/include/adt/hash_table.h (modified) (view diffs)
-
lib/c/include/async.h (modified) (view diffs)
-
lib/c/include/atomicdflt.h (modified) (view diffs)
-
lib/c/include/bd_srv.h (modified) (view diffs)
-
lib/c/include/cfg.h (modified) (view diffs)
-
lib/c/include/ddi.h (modified) (view diffs)
-
lib/c/include/device/hw_res.h (modified) (view diffs)
-
lib/c/include/devman.h (modified) (view diffs)
-
lib/c/include/double_to_str.h (added)
-
lib/c/include/fibril_synch.h (modified) (view diffs)
-
lib/c/include/ieee_double.h (added)
-
lib/c/include/inet/iplink_srv.h (modified) (view diffs)
-
lib/c/include/io/charfield.h (modified) (view diffs)
-
lib/c/include/io/con_srv.h (modified) (view diffs)
-
lib/c/include/io/console.h (modified) (view diffs)
-
lib/c/include/io/klog.h (modified) (view diffs)
-
lib/c/include/io/pixel.h (modified) (view diffs)
-
lib/c/include/io/pixelmap.h (modified) (view diffs)
-
lib/c/include/io/window.h (modified) (view diffs)
-
lib/c/include/ipc/vfs.h (modified) (view diffs)
-
lib/c/include/loc.h (modified) (view diffs)
-
lib/c/include/macros.h (modified) (view diffs)
-
lib/c/include/nic/nic.h (modified) (view diffs)
-
lib/c/include/rtld/dynamic.h (modified) (view diffs)
-
lib/c/include/sort.h (modified) (view diffs)
-
lib/c/include/stack.h (moved) (moved from uspace/lib/c/include/bool.h ) (view diffs)
-
lib/c/include/stacktrace.h (modified) (view diffs)
-
lib/c/include/stats.h (modified) (view diffs)
-
lib/c/include/stdbool.h (moved) (moved from uspace/lib/posix/include/posix/stdbool.h ) (view diffs)
-
lib/c/include/stdio.h (modified) (view diffs)
-
lib/c/include/str.h (modified) (view diffs)
-
lib/c/include/sys/stat.h (modified) (view diffs)
-
lib/c/include/sysinfo.h (modified) (view diffs)
-
lib/c/include/tls.h (modified) (view diffs)
-
lib/clui/tinput.c (modified) (view diffs)
-
lib/draw/codec/tga.c (modified) (view diffs)
-
lib/draw/drawctx.c (modified) (view diffs)
-
lib/draw/drawctx.h (modified) (view diffs)
-
lib/draw/path.c (modified) (view diffs)
-
lib/draw/source.c (modified) (view diffs)
-
lib/draw/source.h (modified) (view diffs)
-
lib/draw/surface.c (modified) (view diffs)
-
lib/draw/surface.h (modified) (view diffs)
-
lib/drv/generic/driver.c (modified) (view diffs)
-
lib/drv/include/ddf/log.h (modified) (view diffs)
-
lib/drv/include/usbhc_iface.h (modified) (view diffs)
-
lib/ext2/Makefile (deleted)
-
lib/ext2/libext2_block_group.c (deleted)
-
lib/ext2/libext2_block_group.h (deleted)
-
lib/ext2/libext2_directory.c (deleted)
-
lib/ext2/libext2_directory.h (deleted)
-
lib/ext2/libext2_filesystem.c (deleted)
-
lib/ext2/libext2_filesystem.h (deleted)
-
lib/ext2/libext2_inode.c (deleted)
-
lib/ext2/libext2_inode.h (deleted)
-
lib/ext2/libext2_superblock.c (deleted)
-
lib/ext2/libext2_superblock.h (deleted)
-
lib/ext4/libext4_block_group.c (modified) (view diffs)
-
lib/ext4/libext4_block_group.h (modified) (view diffs)
-
lib/ext4/libext4_directory.c (modified) (view diffs)
-
lib/ext4/libext4_directory.h (modified) (view diffs)
-
lib/ext4/libext4_filesystem.c (modified) (view diffs)
-
lib/ext4/libext4_filesystem.h (modified) (view diffs)
-
lib/ext4/libext4_inode.c (modified) (view diffs)
-
lib/ext4/libext4_inode.h (modified) (view diffs)
-
lib/ext4/libext4_superblock.c (modified) (view diffs)
-
lib/ext4/libext4_superblock.h (modified) (view diffs)
-
lib/ext4/libext4_types.h (modified) (view diffs)
-
lib/graph/graph.h (modified) (view diffs)
-
lib/gui/minimal.h (modified) (view diffs)
-
lib/gui/terminal.c (modified) (view diffs)
-
lib/gui/window.c (modified) (view diffs)
-
lib/gui/window.h (modified) (view diffs)
-
lib/nic/src/nic_addr_db.c (modified) (view diffs)
-
lib/nic/src/nic_rx_control.c (modified) (view diffs)
-
lib/posix/source/fnmatch.c (modified) (view diffs)
-
lib/posix/source/pwd.c (modified) (view diffs)
-
lib/posix/source/stdio.c (modified) (view diffs)
-
lib/posix/source/stdio/scanf.c (modified) (view diffs)
-
lib/posix/source/stdlib/strtold.c (modified) (view diffs)
-
lib/posix/source/time.c (modified) (view diffs)
-
lib/softfloat/common.c (modified) (view diffs)
-
lib/softrend/filter.c (modified) (view diffs)
-
lib/softrend/filter.h (modified) (view diffs)
-
lib/softrend/pixconv.h (modified) (view diffs)
-
lib/softrend/rectangle.h (modified) (view diffs)
-
lib/softrend/transform.c (modified) (view diffs)
-
lib/softrend/transform.h (modified) (view diffs)
-
lib/usb/include/usb/hc.h (modified) (view diffs)
-
lib/usb/include/usb/usb.h (modified) (view diffs)
-
lib/usbdev/include/usb/dev/request.h (modified) (view diffs)
-
lib/usbdev/src/dp.c (modified) (view diffs)
-
lib/usbhost/include/usb/host/endpoint.h (modified) (view diffs)
-
lib/usbhost/src/usb_endpoint_manager.c (modified) (view diffs)
-
lib/usbvirt/include/usbvirt/ipc.h (modified) (view diffs)
-
srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
-
srv/bd/file_bd/file_bd.c (modified) (view diffs)
-
srv/bd/gxe_bd/gxe_bd.c (modified) (view diffs)
-
srv/bd/part/guid_part/guid_part.c (modified) (view diffs)
-
srv/bd/part/mbr_part/mbr_part.c (modified) (view diffs)
-
srv/bd/rd/rd.c (modified) (view diffs)
-
srv/clipboard/clipboard.c (modified) (view diffs)
-
srv/devman/devman.h (modified) (view diffs)
-
srv/devman/main.c (modified) (view diffs)
-
srv/fs/cdfs/cdfs_ops.c (modified) (view diffs)
-
srv/fs/cdfs/cdfs_ops.h (modified) (view diffs)
-
srv/fs/exfat/exfat.h (modified) (view diffs)
-
srv/fs/exfat/exfat_dentry.h (modified) (view diffs)
-
srv/fs/ext2fs/ext2fs_ops.c (deleted)
-
srv/fs/ext4fs/ext4fs_ops.c (modified) (view diffs)
-
srv/fs/fat/fat.h (modified) (view diffs)
-
srv/fs/fat/fat_dentry.h (modified) (view diffs)
-
srv/fs/locfs/locfs_ops.c (modified) (view diffs)
-
srv/fs/locfs/locfs_ops.h (modified) (view diffs)
-
srv/fs/tmpfs/tmpfs.h (modified) (view diffs)
-
srv/fs/udf/udf.h (modified) (view diffs)
-
srv/fs/udf/udf_cksum.h (modified) (view diffs)
-
srv/fs/udf/udf_idx.c (modified) (view diffs)
-
srv/fs/udf/udf_osta.h (modified) (view diffs)
-
srv/fs/udf/udf_types.h (modified) (view diffs)
-
srv/hid/compositor/compositor.c (modified) (view diffs)
-
srv/hid/compositor/compositor.h (modified) (view diffs)
-
srv/hid/input/Makefile (modified) (view diffs)
-
srv/hid/input/ctl/kbdev.c (modified) (view diffs)
-
srv/hid/input/input.c (modified) (view diffs)
-
srv/hid/input/input.h (modified) (view diffs)
-
srv/hid/input/layout.h (modified) (view diffs)
-
srv/hid/input/layout/ar.c (added)
-
srv/hid/input/layout/cz.c (modified) (view diffs)
-
srv/hid/input/port/niagara.c (modified) (view diffs)
-
srv/hid/input/port/pl050.c (modified) (view diffs)
-
srv/hid/input/port/ski.c (modified) (view diffs)
-
srv/hid/input/proto/adb.c (modified) (view diffs)
-
srv/hid/output/output.h (modified) (view diffs)
-
srv/hid/output/port/ega.c (modified) (view diffs)
-
srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
-
srv/hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
-
srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
-
srv/hw/irc/apic/apic.c (modified) (view diffs)
-
srv/hw/irc/i8259/i8259.c (modified) (view diffs)
-
srv/hw/irc/obio/obio.c (modified) (view diffs)
-
srv/loader/main.c (modified) (view diffs)
-
srv/locsrv/locsrv.c (modified) (view diffs)
-
srv/logger/initlvl.c (modified) (view diffs)
-
srv/logger/logger.h (modified) (view diffs)
-
srv/net/ethip/ethip_nic.c (modified) (view diffs)
-
srv/net/inetsrv/inet_link.c (modified) (view diffs)
-
srv/net/inetsrv/inetsrv.h (modified) (view diffs)
-
srv/net/tcp/conn.c (modified) (view diffs)
-
srv/net/tcp/conn.h (modified) (view diffs)
-
srv/net/tcp/seq_no.c (modified) (view diffs)
-
srv/net/tcp/tcp_type.h (modified) (view diffs)
-
srv/net/udp/assoc.c (modified) (view diffs)
-
srv/ns/clonable.c (modified) (view diffs)
-
srv/ns/clonable.h (modified) (view diffs)
-
srv/ns/task.c (modified) (view diffs)
-
srv/vfs/vfs.c (modified) (view diffs)
-
srv/vfs/vfs.h (modified) (view diffs)
-
srv/vfs/vfs_file.c (modified) (view diffs)
-
srv/vfs/vfs_lookup.c (modified) (view diffs)
-
srv/vfs/vfs_ops.c (modified) (view diffs)
-
srv/vfs/vfs_register.c (modified) (view diffs)
Note:
See TracChangeset
for help on using the changeset viewer.
