[SCM] applications.git branch, master, updated. 4c9834984c7f629cd995fd820a12fed0c516d5b2

[Freebox (none)]

The following commit has been merged in the master branch:
commit 4c9834984c7f629cd995fd820a12fed0c516d5b2
Author: Freebox <elixir at elixir-desktop.(none)>
Date:   Mon Nov 22 21:46:04 2010 +0100

    IsaacOS boot vim x86/bootloader/boot.asmvim x86/bootloader/boot.asmvim x86/bootloader/boot.asm

diff --git a/isaacos/tool/script/dosemu b/isaacos/tool/script/dosemu
index b40153b..f3d7bcc 100755
--- a/isaacos/tool/script/dosemu
+++ b/isaacos/tool/script/dosemu
@@ -5,7 +5,7 @@ cp $2 /mnt/isaacsmall/$3
 umount /mnt/isaacsmall
 fi
 if [ "$1" = "e" ]; then
-/usr/bin/qemu -boot c -m 256 -hda isaacsmall.img -hdb largeext2.img -net nic,vlan=0 -net user,vlan=0 -localtime &
+/usr/bin/qemu -boot c -m 256 -hda isaacsmall.img  -net nic,vlan=0 -net user,vlan=0 -localtime &
 fi
 if [ "$1" = "" ]; then
 echo c for copy 
diff --git a/isaacos/x86/bootloader/boot.asm b/isaacos/x86/bootloader/boot.asm
index d22d730..50419e0 100755
--- a/isaacos/x86/bootloader/boot.asm
+++ b/isaacos/x86/bootloader/boot.asm
@@ -110,14 +110,14 @@ NewCode:
 
 	mov bp,500h+Offset Isaac    ; pointe sur STARTUP.SYS (Par Defaut)
 
-        mov cx,150              ; 
-Touch1:  call LecKey            ; 
-         jnz Touch1             ; 
-Touch2:  call LecKey            ; 
-         jz Touch2              ; 
-        loop Touch1
+;        mov cx,150              ; 
+;Touch1:  call LecKey            ; 
+;         jnz Touch1             ; 
+;Touch2:  call LecKey            ; 
+;         jz Touch2              ; 
+;        loop Touch1
 
-	mov bp,500h+Offset Msdos    ; pointe sur BOOTOLD.SYS
+	;mov bp,500h+Offset Msdos    ; pointe sur BOOTOLD.SYS
 stload:
 ;************************** Lecture de la Racine ***************************
 	mov ebx,[500h+PosRac]	; FAT16
@@ -166,7 +166,9 @@ CluFAT32:
 MessErr:                            ; 'pop ebx' => Pas utile !
 	mov si,500h+Offset Error    ; Affiche Err.
 	call Afftxt
-ReBoot: xor ax,ax                   ; Attend une touche
+ReBoot:
+  ; on boot en force
+  xor ax,ax                   ; Attend une touche
 	int 16h
 	int 19h                     ; Reboot
 trouv:                              ; 'pop ebx' => Pas utile !

-- 
applications.git