Changeset 04803bf in mainline for contrib

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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:

Merge mainline changes (needs fixes).

Location:

contrib

Files:

• arch/HelenOS.adl (added)
• arch/hadlbppp.py (added)
• arch/kernel/kernel.adl (added)
• arch/uspace/app/klog/klog.adl (added)
• arch/uspace/lib/libblock/fnc.block_fini (added)
• arch/uspace/lib/libblock/fnc.block_init (added)
• arch/uspace/lib/libblock/fnc.block_seqread (added)
• arch/uspace/lib/libc/bind (added)
• arch/uspace/lib/libc/fnc.devmap_device_connect (added)
• arch/uspace/lib/libc/fnc.devmap_device_get_count (added)
• arch/uspace/lib/libc/fnc.devmap_device_get_devices (added)
• arch/uspace/lib/libc/fnc.devmap_device_get_handle (added)
• arch/uspace/lib/libc/fnc.devmap_device_register (added)
• arch/uspace/lib/libc/fnc.devmap_driver_register (added)
• arch/uspace/lib/libc/fnc.devmap_get_phone (added)
• arch/uspace/lib/libc/protocol (added)
• arch/uspace/lib/libc/requires (added)
• arch/uspace/lib/libc/subsume (added)
• arch/uspace/lib/libfs/fnc.fs_register (added)
• arch/uspace/lib/libfs/fnc.libfs_lookup (added)
• arch/uspace/lib/libfs/fnc.libfs_mount (added)
• arch/uspace/lib/libfs/fnc.libfs_open_node (added)
• arch/uspace/lib/libfs/fnc.libfs_stat (added)
• arch/uspace/srv/bd/bd.adl (added)
• arch/uspace/srv/bd/bd.bp (added)
• arch/uspace/srv/bd/rd/rd.adl (added)
• arch/uspace/srv/console/console.adl (added)
• arch/uspace/srv/console/console.bp (added)
• arch/uspace/srv/console/fnc.cell_mark_changed (added)
• arch/uspace/srv/console/fnc.clear (added)
• arch/uspace/srv/console/fnc.cons_read (added)
• arch/uspace/srv/console/fnc.cons_write (added)
• arch/uspace/srv/console/fnc.curs_goto (added)
• arch/uspace/srv/console/fnc.curs_visibility (added)
• arch/uspace/srv/console/fnc.draw_pixmap (added)
• arch/uspace/srv/console/fnc.fb_pending_flush (added)
• arch/uspace/srv/console/fnc.gcons_notify_char (added)
• arch/uspace/srv/console/fnc.gcons_notify_connect (added)
• arch/uspace/srv/console/fnc.gcons_notify_disconnect (added)
• arch/uspace/srv/console/fnc.gcons_redraw_console (added)
• arch/uspace/srv/console/fnc.make_anim (added)
• arch/uspace/srv/console/fnc.make_pixmap (added)
• arch/uspace/srv/console/fnc.redraw_state (added)
• arch/uspace/srv/console/fnc.screen_clear (added)
• arch/uspace/srv/console/fnc.set_color (added)
• arch/uspace/srv/console/fnc.set_rgb_color (added)
• arch/uspace/srv/console/fnc.set_style (added)
• arch/uspace/srv/console/fnc.vp_create (added)
• arch/uspace/srv/console/fnc.vp_switch (added)
• arch/uspace/srv/console/fnc.write_char (added)
• arch/uspace/srv/devmap/devmap.adl (added)
• arch/uspace/srv/devmap/devmap_client.bp (added)
• arch/uspace/srv/devmap/devmap_driver.bp (added)
• arch/uspace/srv/fb/fb.adl (added)
• arch/uspace/srv/fb/fb.bp (added)
• arch/uspace/srv/fs/devfs/devfs.adl (added)
• arch/uspace/srv/fs/devfs/devfs.bp (added)
• arch/uspace/srv/fs/fat/fat.adl (added)
• arch/uspace/srv/fs/fat/fat.bp (added)
• arch/uspace/srv/fs/tmpfs/fnc.tmpfs_restore (added)
• arch/uspace/srv/fs/tmpfs/tmpfs.adl (added)
• arch/uspace/srv/fs/tmpfs/tmpfs.bp (added)
• arch/uspace/srv/kbd/event.bp (added)
• arch/uspace/srv/kbd/kbd.adl (added)
• arch/uspace/srv/kbd/kbd.bp (added)
• arch/uspace/srv/loader/loader.adl (added)
• arch/uspace/srv/loader/loader.bp (added)
• arch/uspace/srv/ns/ns.adl (added)
• arch/uspace/srv/ns/ns.bp (added)
• arch/uspace/srv/ns/service.adl (added)
• arch/uspace/srv/vfs/fnc.vfs_grab_phone (added)
• arch/uspace/srv/vfs/fnc.vfs_lookup_internal (added)
• arch/uspace/srv/vfs/fnc.vfs_open_node_internal (added)
• arch/uspace/srv/vfs/fnc.vfs_release_phone (added)
• arch/uspace/srv/vfs/vfs.adl (added)
• arch/uspace/srv/vfs/vfs.bp (added)
• bazaar/bzreml/__init__.py (added)
• bazaar/bzreml/setup.py (added)
• bazaar/mbprotect/__init__.py (added)
• conf/arm32-qe.sh (added)
• conf/ia32-qe.sh (modified) (1 diff)
• conf/mips32-gx.sh (modified) (1 diff)
• conf/msim.conf (modified) (2 diffs)
• conf/net-qe.bat (added)
• conf/net-qe.sh (added)
• conf/pearpc.conf (deleted)
• highlight/Syntax (added)
• highlight/adl.syntax (added)
• highlight/bp.syntax (added)
• toolchain/toolchain.amd64.sh (deleted)
• toolchain/toolchain.arm32.sh (deleted)
• toolchain/toolchain.ia32.sh (deleted)
• toolchain/toolchain.ia64.sh (deleted)
• toolchain/toolchain.mipseb32.sh (deleted)
• toolchain/toolchain.mipsel32.sh (deleted)
• toolchain/toolchain.ppc32.sh (deleted)
• toolchain/toolchain.ppc64.sh (deleted)
• toolchain/toolchain.sparc64.sh (deleted)
• tools/download_and_patch_silo.sh (moved) (moved from contrib/util/DownloadAndPatchSILO.sh )
• tools/gen_vga323.c (moved) (moved from boot/tools/ia32/gen_vga323.c )

contrib/conf/ia32-qe.sh

@@ -5 +5 @@
 # Create a disk image if it does not exist
 if [ ! -f "$DISK_IMG" ]; then
-        tools/mkfat.py uspace/dist/data "$DISK_IMG"
+        tools/mkfat.py 1048576 uspace/dist/data "$DISK_IMG"
 fi
 

contrib/conf/mips32-gx.sh

@@ -5 +5 @@
 # Create a disk image if it does not exist
 if [ ! -f "$DISK_IMG" ]; then
-        tools/mkfat.py uspace/dist/data "$DISK_IMG"
+        tools/mkfat.py 1048576 uspace/dist/data "$DISK_IMG"
 fi
 

contrib/conf/msim.conf

@@ -7 +7 @@
 
 add rwm mainmem 0x00000000
-mainmem generic 16M
-mainmem load "/dev/zero"
+mainmem generic 32M
+mainmem fill 0
 
 add rom bootmem 0x1fc00000
@@ -16 +16 @@
 add dprinter printer 0x10000000
 add dkeyboard keyboard 0x10000000 2
-add dorder order 0x10000004 5
+add dorder order 0x10000100 5