- Timestamp:
- 2014-01-19T14:37:22Z (11 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- cf982ff
- Parents:
- 2f591127 (diff), 476f62c (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:
-
- 84 added
- 7 deleted
- 107 edited
- 22 moved
-
Makefile (modified) (view diffs)
-
Makefile.common (modified) (view diffs)
-
app/hdisk/Makefile (added)
-
app/hdisk/common.h (added)
-
app/hdisk/func_gpt.c (added)
-
app/hdisk/func_gpt.h (added)
-
app/hdisk/func_mbr.c (added)
-
app/hdisk/func_mbr.h (added)
-
app/hdisk/func_none.c (added)
-
app/hdisk/func_none.h (added)
-
app/hdisk/hdisk.c (added)
-
app/hdisk/hdisk.h (added)
-
app/hdisk/input.c (added)
-
app/hdisk/input.h (added)
-
app/init/init.c (modified) (view diffs)
-
app/kio/Makefile (moved) (moved from uspace/app/klog/Makefile ) (view diffs)
-
app/kio/kio.c (moved) (moved from uspace/app/klog/klog.c ) (view diffs)
-
app/mkbd/Makefile (modified) (view diffs)
-
app/mkbd/main.c (modified) (view diffs)
-
app/sportdmp/Makefile (modified) (view diffs)
-
app/sportdmp/sportdmp.c (modified) (view diffs)
-
app/tester/Makefile (modified) (view diffs)
-
app/tester/hw/misc/virtchar1.c (modified) (view diffs)
-
app/tester/hw/serial/serial1.c (modified) (view diffs)
-
app/tester/tester.c (modified) (view diffs)
-
app/tester/tester.h (modified) (view diffs)
-
app/tester/thread/setjmp1.c (added)
-
app/tester/thread/setjmp1.def (added)
-
app/trace/syscalls.c (modified) (view diffs)
-
app/untar/Makefile (added)
-
app/untar/main.c (added)
-
app/untar/tar.c (added)
-
app/untar/tar.h (added)
-
app/vdemo/vdemo.c (modified) (view diffs)
-
app/viewer/viewer.c (modified) (view diffs)
-
app/vlaunch/vlaunch.c (modified) (view diffs)
-
app/vterm/vterm.c (modified) (view diffs)
-
dist/src/c/demos/hello/build.gcc (added)
-
dist/src/c/demos/tetris/build.gcc (added)
-
dist/src/c/demos/tetris/screen.c (modified) (view diffs)
-
dist/src/python/demo/hello.py (added)
-
dist/src/python/demo/sintab.py (added)
-
dist/src/python/modules.py (added)
-
drv/block/ahci/ahci.c (modified) (view diffs)
-
drv/bus/amba/Makefile (added)
-
drv/bus/amba/amba.c (added)
-
drv/bus/amba/amba.ma (added)
-
drv/bus/amba/ambapp.h (added)
-
drv/bus/pci/pciintel/pci.c (modified) (view diffs)
-
drv/bus/usb/ehci/res.c (modified) (view diffs)
-
drv/bus/usb/uhci/res.c (modified) (view diffs)
-
drv/bus/usb/uhci/root_hub.c (modified) (view diffs)
-
drv/bus/usb/uhci/root_hub.h (modified) (view diffs)
-
drv/bus/usb/uhci/uhci.c (modified) (view diffs)
-
drv/bus/usb/uhcirh/main.c (modified) (view diffs)
-
drv/char/grlib_uart/Makefile (added)
-
drv/char/grlib_uart/cyclic_buffer.h (added)
-
drv/char/grlib_uart/grlib_uart.c (added)
-
drv/char/grlib_uart/grlib_uart.ma (added)
-
drv/infrastructure/rootleon3/Makefile (added)
-
drv/infrastructure/rootleon3/rootleon3.c (added)
-
drv/infrastructure/rootleon3/rootleon3.h (added)
-
drv/infrastructure/rootleon3/rootleon3.ma (added)
-
drv/infrastructure/rootmalta/rootmalta.c (modified) (view diffs)
-
drv/infrastructure/rootpc/rootpc.c (modified) (view diffs)
-
drv/nic/e1k/e1k.c (modified) (view diffs)
-
drv/nic/rtl8139/driver.c (modified) (view diffs)
-
lib/c/Makefile (modified) (view diffs)
-
lib/c/arch/abs32le/include/libarch/atomic.h (modified) (view diffs)
-
lib/c/arch/amd64/_link.ld.in (modified) (view diffs)
-
lib/c/arch/ia32/Makefile.inc (modified) (view diffs)
-
lib/c/arch/sparc32/Makefile.common (added)
-
lib/c/arch/sparc32/Makefile.inc (added)
-
lib/c/arch/sparc32/_link.ld.in (added)
-
lib/c/arch/sparc32/include/libarch/atomic.h (added)
-
lib/c/arch/sparc32/include/libarch/barrier.h (added)
-
lib/c/arch/sparc32/include/libarch/config.h (added)
-
lib/c/arch/sparc32/include/libarch/context_offset.h (added)
-
lib/c/arch/sparc32/include/libarch/ddi.h (added)
-
lib/c/arch/sparc32/include/libarch/elf.h (added)
-
lib/c/arch/sparc32/include/libarch/elf_linux.h (added)
-
lib/c/arch/sparc32/include/libarch/faddr.h (added)
-
lib/c/arch/sparc32/include/libarch/fibril.h (added)
-
lib/c/arch/sparc32/include/libarch/inttypes.h (added)
-
lib/c/arch/sparc32/include/libarch/istate.h (added)
-
lib/c/arch/sparc32/include/libarch/stack.h (added)
-
lib/c/arch/sparc32/include/libarch/stackarg.h (added)
-
lib/c/arch/sparc32/include/libarch/syscall.h (added)
-
lib/c/arch/sparc32/include/libarch/thread.h (added)
-
lib/c/arch/sparc32/include/libarch/tls.h (added)
-
lib/c/arch/sparc32/include/libarch/types.h (added)
-
lib/c/arch/sparc32/src/entry.s (added)
-
lib/c/arch/sparc32/src/entryjmp.s (added)
-
lib/c/arch/sparc32/src/fibril.S (added)
-
lib/c/arch/sparc32/src/stacktrace.c (added)
-
lib/c/arch/sparc32/src/stacktrace_asm.S (moved) (moved from uspace/lib/c/arch/ia32/src/setjmp.S ) (view diffs)
-
lib/c/arch/sparc32/src/thread_entry.s (added)
-
lib/c/arch/sparc32/src/tls.c (added)
-
lib/c/generic/adt/checksum.c (added)
-
lib/c/generic/assert.c (modified) (view diffs)
-
lib/c/generic/ddi.c (modified) (view diffs)
-
lib/c/generic/device/ahci.c (deleted)
-
lib/c/generic/device/char_dev.c (deleted)
-
lib/c/generic/device/nic.c (deleted)
-
lib/c/generic/device/pci.c (deleted)
-
lib/c/generic/io/io.c (modified) (view diffs)
-
lib/c/generic/io/kio.c (added)
-
lib/c/generic/io/klog.c (modified) (view diffs)
-
lib/c/generic/io/window.c (modified) (view diffs)
-
lib/c/generic/private/stdio.h (modified) (view diffs)
-
lib/c/generic/setjmp.c (added)
-
lib/c/include/adt/checksum.h (added)
-
lib/c/include/bitops.h (modified) (view diffs)
-
lib/c/include/ddi.h (modified) (view diffs)
-
lib/c/include/io/kio.h (added)
-
lib/c/include/io/klog.h (modified) (view diffs)
-
lib/c/include/io/log.h (modified) (view diffs)
-
lib/c/include/io/window.h (modified) (view diffs)
-
lib/c/include/math.h (added)
-
lib/c/include/setjmp.h (modified) (view diffs)
-
lib/c/include/stdio.h (modified) (view diffs)
-
lib/draw/cursor/embedded.c (modified) (view diffs)
-
lib/drv/Makefile (modified) (view diffs)
-
lib/drv/generic/dev_iface.c (modified) (view diffs)
-
lib/drv/generic/driver.c (modified) (view diffs)
-
lib/drv/generic/interrupt.c (modified) (view diffs)
-
lib/drv/generic/private/remote_ahci.h (moved) (moved from uspace/lib/drv/include/remote_ahci.h ) (view diffs)
-
lib/drv/generic/private/remote_audio_mixer.h (moved) (moved from uspace/lib/drv/include/remote_audio_mixer.h ) (view diffs)
-
lib/drv/generic/private/remote_audio_pcm.h (moved) (moved from uspace/lib/drv/include/remote_audio_pcm.h ) (view diffs)
-
lib/drv/generic/private/remote_battery_dev.h (moved) (moved from uspace/lib/drv/include/remote_battery_dev.h ) (view diffs)
-
lib/drv/generic/private/remote_char_dev.h (moved) (moved from uspace/lib/drv/include/remote_char_dev.h ) (view diffs)
-
lib/drv/generic/private/remote_clock_dev.h (moved) (moved from uspace/lib/drv/include/remote_clock_dev.h ) (view diffs)
-
lib/drv/generic/private/remote_graph_dev.h (moved) (moved from uspace/lib/drv/include/remote_graph_dev.h ) (view diffs)
-
lib/drv/generic/private/remote_hw_res.h (moved) (moved from uspace/lib/drv/include/remote_hw_res.h ) (view diffs)
-
lib/drv/generic/private/remote_nic.h (moved) (moved from uspace/lib/drv/include/remote_nic.h ) (view diffs)
-
lib/drv/generic/private/remote_pci.h (moved) (moved from uspace/lib/drv/include/remote_pci.h ) (view diffs)
-
lib/drv/generic/private/remote_pio_window.h (moved) (moved from uspace/lib/drv/include/remote_pio_window.h ) (view diffs)
-
lib/drv/generic/private/remote_usb.h (moved) (moved from uspace/lib/drv/include/remote_usb.h ) (view diffs)
-
lib/drv/generic/private/remote_usbhc.h (moved) (moved from uspace/lib/drv/include/remote_usbhc.h ) (view diffs)
-
lib/drv/generic/private/remote_usbhid.h (moved) (moved from uspace/lib/drv/include/remote_usbhid.h ) (view diffs)
-
lib/drv/generic/remote_ahci.c (modified) (view diffs)
-
lib/drv/generic/remote_audio_mixer.c (modified) (view diffs)
-
lib/drv/generic/remote_audio_pcm.c (modified) (view diffs)
-
lib/drv/generic/remote_battery_dev.c (modified) (view diffs)
-
lib/drv/generic/remote_char_dev.c (modified) (view diffs)
-
lib/drv/generic/remote_clock_dev.c (modified) (view diffs)
-
lib/drv/generic/remote_graph_dev.c (modified) (view diffs)
-
lib/drv/generic/remote_hw_res.c (modified) (view diffs)
-
lib/drv/generic/remote_nic.c (modified) (view diffs)
-
lib/drv/generic/remote_pci.c (modified) (view diffs)
-
lib/drv/generic/remote_pio_window.c (modified) (view diffs)
-
lib/drv/generic/remote_usb.c (modified) (view diffs)
-
lib/drv/generic/remote_usbhc.c (modified) (view diffs)
-
lib/drv/generic/remote_usbhid.c (modified) (view diffs)
-
lib/drv/include/ahci_iface.h (modified) (view diffs)
-
lib/drv/include/battery_iface.h (moved) (moved from uspace/lib/c/include/device/battery_dev.h ) (view diffs)
-
lib/drv/include/char_dev_iface.h (moved) (moved from uspace/lib/c/include/device/char_dev.h ) (view diffs)
-
lib/drv/include/ddf/driver.h (modified) (view diffs)
-
lib/drv/include/ddf/interrupt.h (modified) (view diffs)
-
lib/drv/include/dev_iface.h (modified) (view diffs)
-
lib/drv/include/graph_iface.h (moved) (moved from uspace/lib/c/include/device/graph_dev.h ) (view diffs)
-
lib/drv/include/nic_iface.h (moved) (moved from uspace/lib/c/include/device/nic.h ) (view diffs)
-
lib/drv/include/ops/battery_dev.h (modified) (view diffs)
-
lib/drv/include/pci_dev_iface.h (modified) (view diffs)
-
lib/drv/include/usbhid_iface.h (modified) (view diffs)
-
lib/gpt/Makefile (added)
-
lib/gpt/global.c (added)
-
lib/gpt/gpt.h (added)
-
lib/gpt/libgpt.c (added)
-
lib/gpt/libgpt.h (added)
-
lib/gui/Makefile (modified) (view diffs)
-
lib/gui/button.c (modified) (view diffs)
-
lib/gui/button.h (modified) (view diffs)
-
lib/gui/canvas.c (modified) (view diffs)
-
lib/gui/canvas.h (modified) (view diffs)
-
lib/gui/common.c (added)
-
lib/gui/common.h (added)
-
lib/gui/connection.c (modified) (view diffs)
-
lib/gui/label.c (modified) (view diffs)
-
lib/gui/label.h (modified) (view diffs)
-
lib/gui/window.c (modified) (view diffs)
-
lib/gui/window.h (modified) (view diffs)
-
lib/math/Makefile (added)
-
lib/math/src/dummy.c (added)
-
lib/mbr/Makefile (added)
-
lib/mbr/libmbr.c (added)
-
lib/mbr/libmbr.h (added)
-
lib/mbr/mbr.h (added)
-
lib/nic/Makefile (modified) (view diffs)
-
lib/nic/src/nic_ev.c (modified) (view diffs)
-
lib/posix/Makefile (modified) (view diffs)
-
lib/posix/include/posix/float.h (modified) (view diffs)
-
lib/posix/include/posix/math.h (modified) (view diffs)
-
lib/posix/include/posix/setjmp.h (moved) (moved from uspace/lib/c/generic/bitops.c ) (view diffs)
-
lib/posix/include/posix/stdlib.h (modified) (view diffs)
-
lib/posix/source/math.c (deleted)
-
lib/softfloat/softfloat.c (modified) (view diffs)
-
lib/softfloat/softfloat.h (modified) (view diffs)
-
lib/softint/Makefile (modified) (view diffs)
-
lib/softint/generic/bits.c (added)
-
lib/softint/generic/shift.c (modified) (view diffs)
-
lib/softint/include/bits.h (added)
-
lib/softint/include/shift.h (modified) (view diffs)
-
lib/usbhid/Makefile (modified) (view diffs)
-
lib/usbhid/src/hidiface.c (deleted)
-
srv/bd/sata_bd/Makefile (modified) (view diffs)
-
srv/bd/sata_bd/sata_bd.c (modified) (view diffs)
-
srv/hid/compositor/Makefile (modified) (view diffs)
-
srv/hid/compositor/compositor.c (modified) (view diffs)
-
srv/hid/compositor/gfx/nameic.tga (deleted)
-
srv/hid/isdv4_tablet/Makefile (modified) (view diffs)
-
srv/hid/isdv4_tablet/isdv4.c (modified) (view diffs)
-
srv/hid/isdv4_tablet/main.c (modified) (view diffs)
-
srv/klog/Makefile (added)
-
srv/klog/klog.c (added)
-
srv/logger/writer.c (modified) (view diffs)
-
srv/net/ethip/Makefile (modified) (view diffs)
-
srv/net/ethip/ethip_nic.c (modified) (view diffs)
-
srv/net/slip/Makefile (modified) (view diffs)
-
srv/net/slip/slip.c (modified) (view diffs)
Note:
See TracChangeset
for help on using the changeset viewer.
