WebSVN – Kolibri OS – Diff – /kernel/branches/net/boot/bootcode.inc

         pop     ax
         jnc     @f
         inc     si
         cmp     si, 10
         jb      @b
+sayerr_badsect:
         mov     si, badsect
 sayerr_plain:
         call    printplain
         jmp     $
 @@:
 ;                           16 BIT CODE
+;
 ;=========================================================================
+include 'bootvesa.inc'                 ;Include source for boot vesa
+if defined extended_primary_loader
+include 'parsers.inc'
-include 'bootvesa.inc'                 ;Include source for boot vesa
+end if
+start_of_code:
+if defined extended_primary_loader
+; save data from primary loader
+        mov     word [cs:bootcallback], si
+        mov     word [cs:bootcallback+2], ds
+        push    cs
+        pop     ds
+        mov     [bootdevice], ax
+        mov     [bootfs], bx
+; set up stack
+        mov     ax, 3000h
+        mov     ss, ax
+        mov     sp, 0EC00h
+; try to load configuration file
+        mov     ax, 1
+        mov     di, config_file_struct
+        call    [bootcallback]
+        cld
+        push    cs
+        pop     es
+; bx=0 - ok, bx=1 - part of file loaded, assume this is ok
+        cmp     bx, 1
+        ja      .config_bad
+; configuration file was loaded, parse
+; if length is too big, use first 0FFFFh bytes
+        test    dx, dx
+        jz      @f
+        mov     ax, 0FFFFh
+@@:
+; ds:si will be pointer to current data, dx = limit
+        xchg    ax, dx
+        push    4000h
+        pop     ds
+        xor     si, si
+.parse_loop:
+; skip spaces
+        cmp     si, dx
+        jae     .parse_done
+        lodsb
+        cmp     al, ' '
+        jbe     .parse_loop
+        dec     si
+; loop over all possible configuration values
+        mov     bx, config_file_variables
+.find_variant:
+; get length
+        mov     cx, [es:bx]
+; zero length = end of list
+        jecxz   .find_newline
+; skip over length
+        inc     bx
+        inc     bx
+        mov     di, bx
+; skip over string
+        add     bx, cx
+; test whether we have at least cx symbols left
+        mov     ax, cx
+        add     ax, si
+        jc      .next_variant1
+        cmp     ax, dx
+        jae     .next_variant1
+; save current position
+        push    si
+; compare strings
+        repz cmpsb
+        jnz     .next_variant2
+; strings are equal; look for "=" with possible spaces before and after
+@@:
+        cmp     si, dx
+        jae     .next_variant2
+        lodsb
+        cmp     al, ' '
+        jbe     @b
+        cmp     al, '='
+        jnz     .next_variant2
+; ok, we found the true variant
+; ignore saved position on the stack
+        pop     ax
+; call the parser
+        call    word [es:bx]
+; line parsed, find next
+.find_newline:
+        cmp     si, dx
+        jae     .parse_done
+        lodsb
+        cmp     al, 13
+        jz      .parse_loop
+        cmp     al, 10
+        jz      .parse_loop
+        jmp     .find_newline
+.next_variant2:
+; continue to the next variant, restoring current position
+        pop     si
+.next_variant1:
+; continue to the next variant
+; skip over the parser
+        inc     bx
+        inc     bx
+        jmp     .find_variant
+.parse_done:
+.config_bad:
+; set up segment registers
+        push    cs
         pop     ds
-start_of_code:
+else
         cld
 ; \begin{diamond}[02.12.2005]
 ; if bootloader sets ax = 'KL', then ds:si points to loader block
 ; set up segment registers
         push    cs
         pop     ds
         push    cs
         pop     es
+end if
 ; set videomode
         mov     ax, 3
         mov     [es:BOOT_APM_DATA_16], dx
 apm_end:
+        _setcursor d80x25_top_num, 0
         _setcursor d80x25_top_num, 0
 if ~ defined extended_primary_loader
 ;CHECK current of code
         cmp     [cfgmanager.loader_block], -1
         jz      noloaderblock
         les     bx, [cfgmanager.loader_block]
         cmp     byte [es:bx], 1
         mov     si, loader_block_error
         jnz     sayerr
+        push    0
-        push    0
+        pop     es
-        pop     es
+end if
 noloaderblock:
 ; b) preboot_dma  = use DMA access?
 ; c) preboot_vrrm = use VRR?
 ; d) preboot_device = from what boot?
+; determine default settings
-; determine default settings
+if ~ defined extended_primary_loader
+        mov     [.bSettingsChanged], 0
-        mov     [.bSettingsChanged], 0
+end if
 ;.preboot_gr_end:
         mov     di, preboot_device
 ; if image in memory is present and [preboot_device] is uninitialized,
 ; set it to use this preloaded image
+        cmp     byte [di], 0
+        jnz     .preboot_device_inited
+if defined extended_primary_loader
+        inc     byte [di]
+        cmp     byte [bootdevice], 'f' ; floppy?
+        jz      .preboot_device_inited
-        cmp     byte [di], 0
+        inc     byte [di]
-        jnz     .preboot_device_inited
+else
         cmp     [.loader_block], -1
         jz      @f
         les     bx, [.loader_block]
         test    byte [es:bx+1], 1
         jz      @f
         mov     byte [di], 3
         jmp     .preboot_device_inited
 @@:
+; otherwise, set [preboot_device] to 1 (default value - boot from floppy)
-; otherwise, set [preboot_device] to 1 (default value - boot from floppy)
+        mov     byte [di], 1
-        mov     byte [di], 1
+end if
 .preboot_device_inited:
 ; following 4 lines set variables to 1 if its current value is 0
         cmp     byte [di+preboot_dma-preboot_device], 1
         adc     byte [di+preboot_dma-preboot_device], 0
         cmp     byte [di+preboot_biosdisk-preboot_device], 1
         adc     byte [di+preboot_biosdisk-preboot_device], 0
-; default value for VRR is OFF
+;; default value for VRR is OFF
-        cmp     byte [di+preboot_vrrm-preboot_device], 0
+;        cmp     byte [di+preboot_vrrm-preboot_device], 0
-        jnz     @f
+;        jnz    @f
-        mov     byte [di+preboot_vrrm-preboot_device], 2
+;        mov    byte [di+preboot_vrrm-preboot_device], 2
-@@:
+;@@:
 ; notify user
         _setcursor 5,2
-            call    draw_current_vmode
+        call    draw_current_vmode
         mov     si, usebd_msg
         cmp     [preboot_biosdisk], 1
         call    .say_on_off
-        mov     si, vrrm_msg
+;        mov     si, vrrm_msg
-        cmp     [preboot_vrrm], 1
+;        cmp     [preboot_vrrm], 1
-        call    .say_on_off
+;        call    .say_on_off
         mov     si, preboot_device_msg
         call    print
+        mov     al, [preboot_device]
+if defined extended_primary_loader
+        and     eax, 3
-        mov     al, [preboot_device]
+else
+        and     eax, 7
-        and     eax, 7
+end if
         mov     si, [preboot_device_msgs+eax*2]
         call    printplain
 .show_remarks:
 ; show remarks in gray color
         or      al, 20h
         cmp     al, 'a'
         jz      .change_a
         cmp     al, 'b'
         jz      .change_b
-        cmp     al, 'c'
+;        cmp     al, 'c'
-        jz      .change_c
+;        jz      .change_c
-        cmp     al, 'd'
+        cmp     al, 'c'         ; 'd'
         jnz     .show_remarks
         _setcursor 15,0
         mov     si, bdev
         call    print
+if defined extended_primary_loader
+        mov     bx, '12'
+else
         mov     bx, '14'
+end if
         call    getkey
         mov     [preboot_device], al
         _setcursor 13,0
 .d:
+if ~ defined extended_primary_loader
         mov     [.bSettingsChanged], 1
+end if
         call    clear_vmodes_table             ;clear vmodes_table
-        jmp    .printcfg
+        jmp     .printcfg
 .change_a:
 .loops:
         call    draw_vmodes_table
-        cmp     si,modes_table
+        cmp     si, modes_table
         jbe     .loops
-        sub     word [cursor_pos],size_of_step
+        sub     word [cursor_pos], size_of_step
         jmp     .loops
+.down:
-.down:  cmp     ah,0x50;x,0x50E0               ; down
+        cmp     ah, 0x50;x,0x50E0               ; down
         jne     .pgup
-        cmp     word[es:si+10],-1
+        cmp     word[es:si+10], -1
         je      .loops
-        add     word [cursor_pos],size_of_step
+        add     word [cursor_pos], size_of_step
+        jmp     .loops
-        jmp     .loops
 .pgup:
-.pgup:  cmp     ah,0x49                 ; page up
+        cmp     ah, 0x49                ; page up
         jne     .pgdn
         sub     si, size_of_step*long_v_table
         cmp     si, modes_table
         mov     si, modes_table
 @@:
         mov     word [home_cursor], si
         jmp     .loops
+.pgdn:
-.pgdn:  cmp     ah,0x51                 ; page down
+        cmp     ah, 0x51                ; page down
         jne     .enter
         mov     ax, [end_cursor]
         add     si, size_of_step*long_v_table
         cmp     si, ax
         mov     si, ax
 @@:
         mov     word [home_cursor], si
         jmp     .loops
+.enter:
-.enter: cmp     al,0x0D;x,0x1C0D               ; enter
+        cmp     al, 0x0D;x,0x1C0D               ; enter
         jne     .loops
         push    word [cursor_pos]
         pop     bp
         push    word [es:bp]
         mov     bx, '12'
         call    getkey
         mov     [preboot_biosdisk], al
         _setcursor 11,0
         jmp     .d
-.change_c:
+;.change_c:
-        _setcursor 15,0
+;        _setcursor 15,0
-        mov     si, vrrmprint
+;        mov     si, vrrmprint
-        call    print
+;        call    print
-        mov     bx, '12'
+;        mov     bx, '12'
-        call    getkey
+;        call    getkey
-        mov     [preboot_vrrm], al
+;        mov     [preboot_vrrm], al
-        _setcursor 12,0
+;        _setcursor 12,0
-        jmp     .d
+;        jmp     .d
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 .say_on_off:
         pushf
         call    print
         mov     si, on_msg
         popf
         jz      @f
         mov     si, off_msg
+@@:
-@@:     jmp     printplain
+        jmp     printplain
 ; novesa and vervesa strings are not used at the moment of executing this code
 virtual at novesa
 .oldtimer dd ?
 .starttime dd ?
+if ~ defined extended_primary_loader
 .bSettingsChanged db ?
+end if
 .timer dd ?
 end virtual
+if ~ defined extended_primary_loader
 .loader_block dd -1
+end if
 .gettime:
         mov     ah, 0
         int     1Ah
         xchg    ax, cx
         shl     eax, 10h
         pushf
         call    [.oldtimer]
         pushad
         call    .gettime
         sub     eax, [.starttime]
+if defined extended_primary_loader
+        sub     ax, [preboot_timeout]
+else
         sub     ax, 18*5
+end if
         jae     .timergo
         neg     ax
         add     ax, 18-1
         mov     bx, 18
         xor     dx, dx
         jae     @f
         cmp     al, 1
         mov     cl, 'ã'
         jz      @f
         mov     cl, 'ë'
+@@:
-@@:     mov     [time_str+9], cl
+        mov     [time_str+9], cl
 else if lang eq et
         cmp     al, 1
         ja      @f
         mov     [time_str+9], ' '
-        mov     [time_str+10],' '
+        mov     [time_str+10], ' '
 @@:
+else if lang eq sp
+; esperar 5/4/3/2 segundos, 1 segundo
+        cmp     al, 1
+        mov     cl, 's'
+        ja      @f
+        mov     cl, ' '
+@@:
+        mov     [time_str+10], cl
 else
 ; wait 5/4/3/2 seconds, 1 second
         cmp     al, 1
         mov     cl, 's'
         ja      @f
         mov     cl, ' '
+@@:
-@@:     mov     [time_str+9], cl
+        mov     [time_str+9], cl
 end if
         add     al, '0'
         mov     [time_str+1], al
         mov     si, time_msg
         _setcursor 7,0
         call    printplain
         _setcursor 6,0
         mov     si, loading_msg
         call    print
         _setcursor 15,0
+if ~ defined extended_primary_loader
         cmp     [.bSettingsChanged], 0
         jz      .load
         cmp     [.loader_block], -1
         jz      .load
         les     bx, [.loader_block]
         mov     byte [si+80], 0
         _setcursor 15,0
         call    printplain
         _setcursor 15,0
 .load:
+end if
 ; \end{diamond}[02.12.2005]
 ; ASK GRAPHICS MODE
         call    set_vmode
 ; GRAPHICS ACCELERATION
 ; force yes
-        mov     [es:0x901C], byte 1
+        mov     [es:BOOT_MTRR], byte 1
 ; DMA ACCESS TO HD
         mov     al, [preboot_dma]
-        mov     [es:0x901F], al
         mov     [es:BOOT_DMA], al
 ; VRR_M USE
 ;; VRR_M USE
         jz      @f
 sayerr_floppy:
         mov     dx, 0x3f2
         mov     al, 0
         out     dx, al
+sayerr_memmove:
         mov     si, memmovefailed
         jmp     sayerr_plain
 @@:
         pop     ax                      ; restore from stack count of words in boot+FAT
         shl     ax, 1                   ; make bytes count from count of words
         int     0x13
         mov     dx, 0x3f2       ; floppy motor off
         mov     al, 0
         out     dx, al
+if defined extended_primary_loader
+        cmp     [boot_dev], 1
+        jne     no_sys_from_primary
+; load kolibri.img using callback from primary loader
+        and     word [movedesc + 24 + 2], 0
+        mov     byte [movedesc + 24 + 4], 10h
+; read in blocks of 64K until file is fully loaded
+        mov     ax, 1
+.repeat:
+        mov     di, image_file_struct
+        call    [bootcallback]
+        push    cs
+        pop     ds
+        push    cs
+        pop     es
+        cmp     bx, 1
+        ja      sayerr_badsect
+        push    bx
+        mov     si, movedesc
+        and     word [si + 16 + 2], 0
+        mov     byte [si + 16 + 4], 4
+        mov     ah, 87h
+        mov     cx, 8000h
+        int     15h
+        pop     bx
+        test    ah, ah
+        jnz     sayerr_memmove
+        inc     byte [si + 24 + 4]
+        test    bx, bx
+        jz      no_sys_from_primary
+        mov     ax, 2
+        jmp     .repeat
+no_sys_from_primary:
 end if
 ; SET GRAPHICS

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/boot/bootcode.inc – Rev 2540 → 3359