Changeset 192565b in mainline
- Timestamp:
- 2013-05-27T13:18:13Z (11 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- f2c19b0
- Parents:
- d120133 (diff), c90aed4 (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:
-
- 25 added
- 5 deleted
- 146 edited
- 2 moved
-
HelenOS.config (modified) (view diffs)
-
boot/Makefile.common (modified) (view diffs)
-
boot/generic/include/memstr.h (modified) (view diffs)
-
defaults/amd64/Makefile.config (modified) (view diffs)
-
defaults/arm32/Makefile.config (modified) (view diffs)
-
defaults/arm32/beagleboardxm/Makefile.config (modified) (view diffs)
-
defaults/arm32/beaglebone/Makefile.config (modified) (view diffs)
-
defaults/arm32/gta02/Makefile.config (modified) (view diffs)
-
defaults/ia32/Makefile.config (modified) (view diffs)
-
defaults/ia64/Makefile.config (modified) (view diffs)
-
defaults/mips32/Makefile.config (modified) (view diffs)
-
defaults/mips64/Makefile.config (modified) (view diffs)
-
defaults/ppc32/Makefile.config (modified) (view diffs)
-
defaults/sparc64/Makefile.config (modified) (view diffs)
-
defaults/special/Makefile.config (modified) (view diffs)
-
kernel/arch/amd64/include/arch/pm.h (modified) (view diffs)
-
kernel/arch/amd64/src/pm.c (modified) (view diffs)
-
kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (modified) (view diffs)
-
kernel/arch/arm32/src/mach/beaglebone/beaglebone.c (modified) (view diffs)
-
kernel/arch/ia32/include/arch/pm.h (modified) (view diffs)
-
kernel/arch/ia32/src/boot/vesa_real.inc (modified) (view diffs)
-
kernel/arch/ia32/src/pm.c (modified) (view diffs)
-
kernel/genarch/Makefile.inc (modified) (view diffs)
-
kernel/genarch/include/genarch/drivers/am335x/uart.h (modified) (view diffs)
-
kernel/genarch/include/genarch/drivers/am335x/uart_regs.h (deleted)
-
kernel/genarch/include/genarch/drivers/amdm37x/uart.h (modified) (view diffs)
-
kernel/genarch/include/genarch/drivers/amdm37x/uart_regs.h (deleted)
-
kernel/genarch/include/genarch/drivers/omap/uart.h (added)
-
kernel/genarch/include/genarch/drivers/omap/uart_regs.h (added)
-
kernel/genarch/src/drivers/amdm37x/uart.c (deleted)
-
kernel/genarch/src/drivers/omap/uart.c (moved) (moved from kernel/genarch/src/drivers/am335x/uart.c ) (view diffs)
-
kernel/genarch/src/fb/fb.c (modified) (view diffs)
-
kernel/genarch/src/fb/logo-196x66.c (deleted)
-
kernel/generic/include/lib/memfnc.h (modified) (view diffs)
-
tools/mkext2.py (modified) (view diffs)
-
uspace/Makefile (modified) (view diffs)
-
uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (view diffs)
-
uspace/app/bdsh/cmds/modules/cmp/cmp.c (modified) (view diffs)
-
uspace/app/bdsh/cmds/modules/cp/cp.c (modified) (view diffs)
-
uspace/app/bdsh/cmds/modules/ls/ls.c (modified) (view diffs)
-
uspace/app/bdsh/cmds/modules/sleep/sleep.c (modified) (view diffs)
-
uspace/app/bnchmark/bnchmark.c (modified) (view diffs)
-
uspace/app/dnscfg/Makefile (added)
-
uspace/app/dnscfg/dnscfg.c (added)
-
uspace/app/dnsres/Makefile (added)
-
uspace/app/dnsres/dnsres.c (added)
-
uspace/app/edit/edit.c (modified) (view diffs)
-
uspace/app/inet/inet.c (modified) (view diffs)
-
uspace/app/init/init.c (modified) (view diffs)
-
uspace/app/mkbd/main.c (modified) (view diffs)
-
uspace/app/msim/arch_helenos/input.c (modified) (view diffs)
-
uspace/app/nettest1/nettest1.c (modified) (view diffs)
-
uspace/app/nettest2/nettest2.c (modified) (view diffs)
-
uspace/app/nettest3/nettest3.c (modified) (view diffs)
-
uspace/app/nterm/conn.c (modified) (view diffs)
-
uspace/app/nterm/nterm.c (modified) (view diffs)
-
uspace/app/ping/ping.c (modified) (view diffs)
-
uspace/app/taskdump/symtab.c (modified) (view diffs)
-
uspace/app/tester/ipc/starve.c (modified) (view diffs)
-
uspace/app/tetris/scores.c (modified) (view diffs)
-
uspace/app/tetris/screen.c (modified) (view diffs)
-
uspace/app/top/screen.c (modified) (view diffs)
-
uspace/app/trace/ipc_desc.c (modified) (view diffs)
-
uspace/app/trace/ipc_desc.h (modified) (view diffs)
-
uspace/app/trace/ipcp.c (modified) (view diffs)
-
uspace/app/trace/syscalls.c (modified) (view diffs)
-
uspace/app/trace/syscalls.h (modified) (view diffs)
-
uspace/app/trace/trace.c (modified) (view diffs)
-
uspace/app/vdemo/vdemo.c (modified) (view diffs)
-
uspace/app/vlaunch/Makefile (modified) (view diffs)
-
uspace/app/vlaunch/gfx/helenos.tga (added)
-
uspace/app/vlaunch/vlaunch.c (modified) (view diffs)
-
uspace/dist/src/c/demos/tetris/scores.c (modified) (view diffs)
-
uspace/dist/src/c/demos/top/screen.c (modified) (view diffs)
-
uspace/drv/block/ahci/ahci.c (modified) (view diffs)
-
uspace/drv/bus/pci/pciintel/pci.c (modified) (view diffs)
-
uspace/drv/bus/pci/pciintel/pci.h (modified) (view diffs)
-
uspace/drv/bus/pci/pciintel/pci_regs.h (modified) (view diffs)
-
uspace/drv/bus/usb/ohci/hc.c (modified) (view diffs)
-
uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c (modified) (view diffs)
-
uspace/drv/bus/usb/ohci/hw_struct/hcca.h (modified) (view diffs)
-
uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.c (modified) (view diffs)
-
uspace/drv/bus/usb/uhci/uhci_batch.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbhub/port.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbmast/scsi_ms.c (modified) (view diffs)
-
uspace/drv/char/i8042/buffer.h (modified) (view diffs)
-
uspace/drv/char/ns8250/ns8250.c (modified) (view diffs)
-
uspace/drv/nic/e1k/e1k.c (modified) (view diffs)
-
uspace/drv/nic/ne2k/dp8390.c (modified) (view diffs)
-
uspace/drv/nic/rtl8139/driver.c (modified) (view diffs)
-
uspace/lib/bithenge/src/blob.c (modified) (view diffs)
-
uspace/lib/c/Makefile (modified) (view diffs)
-
uspace/lib/c/arch/ia32/src/setjmp.S (modified) (view diffs)
-
uspace/lib/c/generic/adt/hash_table.c (modified) (view diffs)
-
uspace/lib/c/generic/async.c (modified) (view diffs)
-
uspace/lib/c/generic/device/hw_res_parsed.c (modified) (view diffs)
-
uspace/lib/c/generic/dnsr.c (added)
-
uspace/lib/c/generic/inet/addr.c (added)
-
uspace/lib/c/generic/io/con_srv.c (modified) (view diffs)
-
uspace/lib/c/generic/io/console.c (modified) (view diffs)
-
uspace/lib/c/generic/mem.c (modified) (view diffs)
-
uspace/lib/c/generic/net/inet.c (modified) (view diffs)
-
uspace/lib/c/generic/net/socket_client.c (modified) (view diffs)
-
uspace/lib/c/include/device/hw_res_parsed.h (modified) (view diffs)
-
uspace/lib/c/include/inet/addr.h (added)
-
uspace/lib/c/include/inet/dnsr.h (added)
-
uspace/lib/c/include/inet/inet.h (modified) (view diffs)
-
uspace/lib/c/include/inet/inetcfg.h (modified) (view diffs)
-
uspace/lib/c/include/io/con_srv.h (modified) (view diffs)
-
uspace/lib/c/include/io/cons_event.h (added)
-
uspace/lib/c/include/io/console.h (modified) (view diffs)
-
uspace/lib/c/include/io/pos_event.h (added)
-
uspace/lib/c/include/io/window.h (modified) (view diffs)
-
uspace/lib/c/include/ipc/dnsr.h (added)
-
uspace/lib/c/include/ipc/services.h (modified) (view diffs)
-
uspace/lib/c/include/mem.h (modified) (view diffs)
-
uspace/lib/c/include/setjmp.h (modified) (view diffs)
-
uspace/lib/c/include/sys/types.h (modified) (view diffs)
-
uspace/lib/clui/tinput.c (modified) (view diffs)
-
uspace/lib/clui/tinput.h (modified) (view diffs)
-
uspace/lib/drv/generic/remote_nic.c (modified) (view diffs)
-
uspace/lib/ext4/libext4_directory.c (modified) (view diffs)
-
uspace/lib/gui/Makefile (modified) (view diffs)
-
uspace/lib/gui/canvas.c (added)
-
uspace/lib/gui/canvas.h (added)
-
uspace/lib/gui/grid.c (modified) (view diffs)
-
uspace/lib/gui/grid.h (modified) (view diffs)
-
uspace/lib/gui/terminal.c (modified) (view diffs)
-
uspace/lib/gui/window.c (modified) (view diffs)
-
uspace/lib/nic/src/nic_addr_db.c (modified) (view diffs)
-
uspace/lib/nic/src/nic_driver.c (modified) (view diffs)
-
uspace/lib/nic/src/nic_impl.c (modified) (view diffs)
-
uspace/lib/nic/src/nic_rx_control.c (modified) (view diffs)
-
uspace/lib/nic/src/nic_wol_virtues.c (modified) (view diffs)
-
uspace/lib/posix/include/posix/fcntl.h (modified) (view diffs)
-
uspace/lib/posix/include/posix/float.h (modified) (view diffs)
-
uspace/lib/posix/include/posix/limits.h (modified) (view diffs)
-
uspace/lib/posix/include/posix/math.h (modified) (view diffs)
-
uspace/lib/posix/include/posix/stdio.h (modified) (view diffs)
-
uspace/lib/posix/source/math.c (modified) (view diffs)
-
uspace/lib/posix/source/strings.c (modified) (view diffs)
-
uspace/lib/usb/src/debug.c (modified) (view diffs)
-
uspace/srv/devman/main.c (modified) (view diffs)
-
uspace/srv/fs/cdfs/cdfs_ops.c (modified) (view diffs)
-
uspace/srv/fs/fat/fat_dentry.c (modified) (view diffs)
-
uspace/srv/fs/fat/fat_dentry.h (modified) (view diffs)
-
uspace/srv/fs/fat/fat_directory.c (modified) (view diffs)
-
uspace/srv/fs/fat/fat_ops.c (modified) (view diffs)
-
uspace/srv/fs/mfs/mfs_dentry.c (modified) (view diffs)
-
uspace/srv/fs/mfs/mfs_ops.c (modified) (view diffs)
-
uspace/srv/fs/udf/udf_volume.c (modified) (view diffs)
-
uspace/srv/hid/compositor/Makefile (modified) (view diffs)
-
uspace/srv/hid/compositor/compositor.c (modified) (view diffs)
-
uspace/srv/hid/compositor/gfx/helenos.tga (deleted)
-
uspace/srv/hid/console/console.c (modified) (view diffs)
-
uspace/srv/hid/remcons/remcons.c (modified) (view diffs)
-
uspace/srv/net/dnsrsrv/Makefile (added)
-
uspace/srv/net/dnsrsrv/dns_msg.c (added)
-
uspace/srv/net/dnsrsrv/dns_msg.h (added)
-
uspace/srv/net/dnsrsrv/dns_std.h (added)
-
uspace/srv/net/dnsrsrv/dns_type.h (added)
-
uspace/srv/net/dnsrsrv/dnsrsrv.c (added)
-
uspace/srv/net/dnsrsrv/query.c (added)
-
uspace/srv/net/dnsrsrv/query.h (moved) (moved from kernel/genarch/include/genarch/fb/logo-196x66.h ) (view diffs)
-
uspace/srv/net/dnsrsrv/transport.c (added)
-
uspace/srv/net/dnsrsrv/transport.h (added)
-
uspace/srv/net/ethip/ethip.c (modified) (view diffs)
-
uspace/srv/net/inetsrv/addrobj.c (modified) (view diffs)
-
uspace/srv/net/inetsrv/inet_link.c (modified) (view diffs)
-
uspace/srv/net/inetsrv/inetsrv.c (modified) (view diffs)
-
uspace/srv/net/inetsrv/inetsrv.h (modified) (view diffs)
-
uspace/srv/net/udp/assoc.c (modified) (view diffs)
-
uspace/srv/net/udp/assoc.h (modified) (view diffs)
-
uspace/srv/net/udp/sock.c (modified) (view diffs)
-
uspace/srv/net/udp/ucall.c (modified) (view diffs)
-
uspace/srv/net/udp/ucall.h (modified) (view diffs)
-
uspace/srv/net/udp/udp_type.h (modified) (view diffs)
-
uspace/srv/ns/task.c (modified) (view diffs)
Note:
See TracChangeset
for help on using the changeset viewer.
