Moved '/DEBUGPORT=SCREEN' from loadros to (a)boot.bat.
authorHartmut Birr <osexpert@googlemail.com>
Sat, 27 Apr 2002 19:20:29 +0000 (19:20 +0000)
committerHartmut Birr <osexpert@googlemail.com>
Sat, 27 Apr 2002 19:20:29 +0000 (19:20 +0000)
svn path=/trunk/; revision=2882

reactos/aboot.bat
reactos/boot.bat
reactos/loaders/dos/loadros.asm

index 4b10938..b183b5f 100644 (file)
@@ -1 +1,2 @@
-loadros system32\ntoskrnl.exe system32\hal.dll system32\drivers\acpi.sys bootc.lst
\ No newline at end of file
+loadros system32\ntoskrnl.exe system32\hal.dll system32\drivers\acpi.sys /DEBUGPORT=SCREEN bootc.lst
+
index e9946e0..9c497d4 100644 (file)
@@ -1 +1 @@
-loadros system32\ntoskrnl.exe system32\hal.dll bootc.lst
\ No newline at end of file
+loadros system32\ntoskrnl.exe system32\hal.dll /DEBUGPORT=SCREEN bootc.lst
index e6933c9..9250423 100644 (file)
@@ -189,6 +189,29 @@ entry:
        ;;
        cmp     byte [di], '/'
        jne     .no_next_module
+
+       mov     si, _multiboot_kernel_cmdline
+.find_end:
+       cmp     byte [si], 0
+       je      .line_end
+       inc     si
+       jmp     .find_end
+
+.line_end
+       mov     byte [si], ' '
+       inc     si
+.line_copy
+       cmp     di, [dos_cmdline_end]
+       je      .done_copy
+       cmp     byte [di], 0
+       je      .done_copy
+       mov     al, byte [di]
+       mov     byte [si], al
+       inc     di
+       inc     si
+       jmp     .line_copy
+.done_copy:
+       mov     byte [si], 0    
        jmp     .next_module
 .no_next_module:
 
@@ -1213,7 +1236,7 @@ _multiboot_address_ranges:
        times (64*multiboot_address_range_size) db 0
 
 _multiboot_kernel_cmdline:
-       db 'multi(0)disk(0)rdisk(0)partition(1)\reactos /DEBUGPORT=SCREEN'
+       db 'multi(0)disk(0)rdisk(0)partition(1)\reactos'
        times 255-($-_multiboot_kernel_cmdline) db 0
 
        ;;