WebSVN – Kolibri OS – Diff – /kernel/trunk/boot/bootcode.inc

+{
 	mov	dx, row*256 + column
 	call	setcursor
+}
+pagetable_set:
+	or	al, 7
+@@:
+	stosd
+	add	eax, 1000h
+	loop	@b
+	ret
 ; 16-bit data
 ; videomodes table
 gr_table:
 	dw      0x112+0100000000000000b ,  640 ,  480		; 1
         and     ax,bx
         and     dx,bx
         cmp     ax,dx
         jnz     cpugood
         mov     si,not386-0x10000
+sayerr:
         call    print
         jmp     $
      cpugood:
         cmp     ax,0x004f
         mov	si, novesa-0x10000
         jnz	@f
         mov     ax,[es:di+4]
         add     ax,'0'*256+'0'
-        mov     [vervesa+vervesa_off-0x10000], ah
-        mov     [vervesa+vervesa_off+2-0x10000], al
-        mov     si,vervesa-0x10000
+        mov	si,vervesa-0x10000
+        mov     [si+vervesa_off], ah
+        mov     [si+vervesa_off+2], al
 @@:     call    print
 ; \begin{diamond}[30.11.2005]
 cfgmanager:
 ; settings:
 ; a) preboot_graph = graphical mode
 ;    preboot_gprobe = probe this mode?
 ; b) preboot_mtrr = use hardware acceleration?
 ; c) preboot_vrrm = use VRR?
 ; d) preboot_device = from what boot?
-	mov	si, preboot_graph-0x10000
+	mov	di, preboot_graph-0x10000
 ; check bootloader block
 	cmp	[.loader_block-0x10000], 0
 	jz	.noloaderblock
 	les	bx, [.loader_block-0x10000]
-	cmp	byte [es:bx], 1
-	jz	@f
+	cmp	byte [es:bx], 1
-	mov	si, loader_block_error-0x10000
-	call	print
+	mov	si, loader_block_error-0x10000
-	jmp	$
-@@:
+	jnz	sayerr
 	test	byte [es:bx+1], 1
 	jz	@f
 ; image in memory present
-	cmp	[si+preboot_device-preboot_graph], 0
+	cmp	[di+preboot_device-preboot_graph], 0
 	jnz	@f
-	mov	[si+preboot_device-preboot_graph], 3
+	mov	[di+preboot_device-preboot_graph], 3
 @@:
 .noloaderblock:
 ; determine default settings
 	mov	[.bSettingsChanged-0x10000], 0
-	cmp	byte [si], 0
+	cmp	byte [di], 0
 	jnz	.preboot_gr_end
-	mov	[si+preboot_gprobe-preboot_graph], 0
+	mov	[di+preboot_gprobe-preboot_graph], 0
 	mov	al, [vervesa+vervesa_off-0x10000]
 	cmp	al, 'x'
 	jz	.novesa
 	cmp	al, '1'
 	jz	.vesa12
-	mov	[si+preboot_gprobe-preboot_graph], 2
+	mov	[di+preboot_gprobe-preboot_graph], 2
 	mov	al, 3
 	jmp	@f
 .vesa12:
 	mov	al, 7
 	jmp	@f
 .novesa:
 	mov	al, 10
 @@:
-	mov	[si], al
+	mov	[di], al
 .preboot_gr_end:
-	cmp	[si+preboot_mtrr-preboot_graph], 1
+	cmp	[di+preboot_mtrr-preboot_graph], 1
-	adc	[si+preboot_mtrr-preboot_graph], 0
+	adc	[di+preboot_mtrr-preboot_graph], 0
-	cmp	[si+preboot_vrrm-preboot_graph], 1
+	cmp	[di+preboot_vrrm-preboot_graph], 1
-	adc	[si+preboot_vrrm-preboot_graph], 0
+	adc	[di+preboot_vrrm-preboot_graph], 0
-	cmp	[si+preboot_device-preboot_graph], 1
+	cmp	[di+preboot_device-preboot_graph], 1
-	adc	[si+preboot_device-preboot_graph], 0
+	adc	[di+preboot_device-preboot_graph], 0
 ; notify user
 	mov	si, linef-0x10000
 	call	print
 	mov	si, start_msg-0x10000
 	jmp	@b
 .c:
 	mov	si, linef-0x10000
 	call	printplain
 	mov	si, mtrr_msg-0x10000
-	call	print
-	mov	si, on_msg-0x10000
 	cmp	[preboot_mtrr-0x10000], 1
-	jz	@f
-	mov	si, off_msg-0x10000
-@@:
-	call	printplain
+	call	.say_on_off
 	mov	si, vrrm_msg-0x10000
-	call	print
-	mov	si, on_msg-0x10000
 	cmp	[preboot_vrrm-0x10000], 1
-	jz	@f
-	mov	si, off_msg-0x10000
-@@:
-	call	printplain
+	call	.say_on_off
 	mov	si, preboot_device_msg-0x10000
 	call	print
 	mov	al, [preboot_device-0x10000]
 	and	eax, 3
 	mov	si, [preboot_device_msgs-0x10000+eax*2]
 	call	printplain
 .wait:
-; empty BIOS keyboard buffer
 	_setcursor 25,0		; out of screen
 ; set timer interrupt handler
 	cli
 	push	0
 	pop	es
 	int	16h
 	push	ax
 ; restore timer interrupt
 	push	0
 	pop	es
-	mov	ecx, [.oldtimer-0x10000]
+	mov	eax, [.oldtimer-0x10000]
-	mov	[es:8*4], ecx
+	mov	[es:8*4], eax
-	mov	[.timer-0x10000], ecx
+	mov	[.timer-0x10000], eax
 	_setcursor 7,0
 	mov	si, space_msg-0x10000
 	call	printplain
 	pop	ax
 ; switch on key
 	jz	.change_c
 	cmp	al, 'd'
 	jnz	.wait
 	_setcursor 15,0
 	mov     si,bdev-0x10000
-	call    printplain
+	call    print
 	mov     bx,'13'
 	call    getkey
 	mov	[preboot_device-0x10000], al
 	_setcursor 13,0
 .d:
-	mov	[.bSettingsChanged-0x10000], al
+	mov	[.bSettingsChanged-0x10000], 1
 	mov	si, space_msg-0x10000
 	call	printplain
 	_setcursor 15,0
 	mov	cx, 6
 @@:
 	_setcursor 10,0
 	jmp	.d
 .change_b:
 	_setcursor 15,0
 	mov	si, gr_acc-0x10000
-	call	printplain
+	call	print
 	mov	bx, '12'
 	call	getkey
 	mov	[preboot_mtrr-0x10000], al
 	_setcursor 11,0
 	jmp	.d
 .change_c:
 	_setcursor 15,0
 	mov	si, vrrmprint-0x10000
-	call	printplain
+	call	print
 	mov	bx, '12'
 	call	getkey
 	mov	[preboot_vrrm-0x10000], al
 	_setcursor 12,0
 	jmp	.d
+.say_on_off:
+	pushf
+	call	print
+	mov	si, on_msg-0x10000
+	popf
+	jz	@f
+	mov	si, off_msg-0x10000
+@@:	call	printplain
+	ret
+; novesa and vervesa strings are not used at the moment of executing this code
+virtual at novesa
 .oldtimer dd ?
 .starttime dd ?
 .bSettingsChanged db ?
 .timer dd ?
+end virtual
 .loader_block dd 0
 .gettime:
 	mov	ah, 0
 	int	1Ah
 	xchg	ax, cx
 .loadc:
 	pop	eax
 .cont:
 	push	cs
 	pop	ds
-	mov	byte [space_msg-0x10000+80], 0
-	_setcursor 15,0
 	mov	si, space_msg-0x10000
+	mov	byte [si+80], 0
+	_setcursor 15,0
 	call	printplain
 	_setcursor 15,0
 .load:
 ; \end{diamond}[02.12.2005]
 ; ASK GRAPHICS MODE
-	movzx	ax, [preboot_graph-0x10000]
-	test	ax, ax
-        jne     pre_graph
-        mov     si,gr_mode-0x10000
-        call    printplain
-        mov     bx,'09'
         call    getkey
-       pre_graph:
+	movzx	ax, [preboot_graph-0x10000]
 	push	0
 	pop	es
 ; address is gr_table+6*(ax-1)-0x10000
         add	ax, ax
         lea	si, [gr_table-0x10000 + eax + eax*2 - 6]
         mov     bx,[si+0]
         mov     cx,[si+2]
+        mov     dx,[si+4]
-        mov     dx,[si+4]
+        cmp	al, 9*2
-        cmp	al, 9*2
+        mov	al, 32	; BPP
         jb	@f
-        mov	byte [es:0x9000], 32
+        mov	[es:0x9000], al
         mov	dword [es:0x9018], 0x800000
        @@:
         mov     [es:0x9008],bx
-        mov     [es:0x900A],cx
-        mov     [es:0x900C],dx
+        mov     [es:0x900A],cx
-        mov     ax,32
+        mov     [es:0x900C],dx
         test	bh, bh
         jz	nov
-; USE DEFAULTS OR PROBE
-; bx - mode : cx - x size : dx - y size
-     ;!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-        movzx   ax,[preboot_gprobe-0x10000]
-        test    ax,ax
-        jne     pre_probe
+; USE DEFAULTS OR PROBE
-     ;!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-        test    bx,0100000000000000b
-        jz      noprobe
-        mov     si,probetext-0x10000
-        call    printplain
-        push    bx
-        mov	bx, '12'
-        call    getkey
-        pop     bx
-     pre_probe:
 	dec	ax
-        je      noprobe
 ; bx - mode : cx - x size : dx - y size
-        push    cx dx
 	cmp	[preboot_gprobe-0x10000], 1
-        mov     bx,0x100
+	jz	noprobe
-     newprobe:
-        inc     bx
-        cmp     bx,0x17f
-        jne     probemore
+        mov     bx,0x100
      newprobe:
-        mov     si,prnotfnd-0x10000
+        inc     bx
-        call    printplain
+        cmp     bx,0x17f
         mov	si,prnotfnd-0x10000
-        jmp     $
+        jz	sayerr
      probemore:
+     	push	cx
         mov     ax,0x4f01
-        mov     ax,0x4f01
+        mov     cx,bx
-        mov     cx,bx
+        and     cx,0xfff
-        and     cx,0xfff
         mov     di,0xa000
         int     0x10
         pop	cx
 	test	byte [es:di], 80h	; lfb?
-	jz	newprobe
+	test	byte [es:di], 80h	; lfb?
-	mov	ax, [es:di+0x12]	; x size?
+	jz	newprobe
+	cmp	[es:di+0x12], cx	; x size?
-	cmp	ax, [esp+2]
+	jnz	newprobe
-	jnz	newprobe
 	cmp	[es:di+0x14], dx	; y size?
 	jnz	newprobe
         mov     cx,bx
         and     cx,0xfff
         mov     di,0xa000
         int     0x10
         ; LFB
-        mov     ecx,[es:di+0x28]
+        mov     eax,[es:di+0x28]
-        mov     [es:0x9018],ecx
+        mov     [es:0x9018],eax
         ; ---- vbe voodoo
         BytesPerScanLine equ 0x10
         mov ax, [es:di+BytesPerScanLine]
         mov [es:0x9001],ax
         ; BPP
-        movzx   ax,byte [es:di+0x19]
+        mov     al,byte [es:di+0x19]
         mov     [es:0x9000],al
        nov:
-        cmp     ax,24
+        cmp     al,24
         mov	si,bt24-0x10000
         jz	bppl
-        cmp     ax,32
+        cmp     al,32
         mov     si,bt32-0x10000
         jz     bppl
         mov     si,btns-0x10000
-        call    print
-        jmp     $
+        jmp	sayerr
        bppl:
-        call    printplain
+        call    print
-; GRAPHICS ACCELERATION
-        mov     al, [preboot_mtrr-0x10000]
-        test    al,al
-        jne     pre_mtrr
-        mov     si,gr_acc-0x10000
-        call    printplain
-        mov     bx,'12'
+; GRAPHICS ACCELERATION
-        call    getkey
-      pre_mtrr:
-        mov     [es:0x901C],al
-; commented by diamond - newlines are not used now
 ;        mov     si,linef-0x10000
-;        call    printplain
+        mov     al, [preboot_mtrr-0x10000]
-; VRR_M USE
-        mov     al,[preboot_vrrm-0x10000]
-        test    al,al
-        jne     pre_vrrm
-        mov     si,vrrmprint-0x10000
+        mov     [es:0x901C],al
-        call    print
-        mov     bx,'13'
-        call    getkey
       pre_vrrm:
-        mov     [es:0x9030],al
+; VRR_M USE
-; BOOT DEVICE
-	mov	al, [preboot_device-0x10000]
-	test	al, al
-	jnz	pre_device
-        mov     si,bdev-0x10000
-        call    printplain
-        mov     bx,'13'
+; BOOT DEVICE
         call    getkey
-      pre_device:
-        dec     ax
-        mov     [boot_dev-0x10000],al
-; commented by diamond - newlines are not used now
-;        mov     si,linef-0x10000
-;        call    printplain
+	mov	al, [preboot_device-0x10000]
+        dec     al
         mov     [boot_dev-0x10000],al
 ; READ DISKETTE TO MEMORY
-        cmp     [boot_dev-0x10000],0
+;        cmp     [boot_dev-0x10000],0
         jz      goodread
         inc	si
         cmp     si,10
         jnz     newread
         mov     si,badsect-0x10000
+sayerr_plain:
         call    printplain
         jmp     $
        goodread:
         ; move -> 1mb
         mov     si,movedesc-0x10000
         je      goodmove
         mov     dx,0x3f2              ; floppy motor off
         mov     al,0
         out     dx,al
         mov     si,memmovefailed-0x10000
-        call    print
+        jmp	sayerr_plain
-        jmp     $
       goodmove:
 	add	dword [movedesc-0x10000+0x18+2], 512*18
         popa
         dec     ax
         push    ax
         jnz     reads
        readdone:
         pop     ax
-        mov     si,backspace-0x10000
+        mov     si,backspace2-0x10000
-        call    printplain
         call    printplain
         mov     si,okt-0x10000
         call    printplain
        no_sys_on_floppy:
         xor	ax, ax		; reset drive
         push	0x6000
         pop	es                    ; es:di = 6000:0
         xor     di,di
         mov     cx,256*map_mem         ; Map (mapmem) M
-        mov     eax,7
+;        mov     eax,7
-       pt2:
+;       pt2:
-        cmp     cx,256*(map_mem-8)     ; 8 M map to LFB
+;        cmp     cx,256*(map_mem-8)     ; 8 M map to LFB
+;        jnz     pt3
+;        pop     eax
+;        add     eax,7
+;       pt3:
+;        cmp     cx,256*(map_mem-12)    ; 12 M back to linear = physical
+;        jnz     pt4
+;        mov     eax,12*0x100000 + 7
+;       pt4:
+;        stosd
+;        add     eax,4096
+;        loop    pt2
+; initialize as identity mapping
+	xor	eax, eax
+	call	pagetable_set
-        jnz     pt3
+; 8M..12M map to LFB
-        pop     eax
-        add     eax,7
-       pt3:
-        cmp     cx,256*(map_mem-12)    ; 12 M back to linear = physical
+	pop	eax
-        jnz     pt4
-        mov     eax,12*0x100000 + 7
+;	mov	cx, 256*4
-       pt4:
+	mov	ch, 4
-        stosd
-        add     eax,4096
+	mov	di, 2000h
-        loop    pt2
+	call	pagetable_set
 	push	0x7100
 	pop	es
         xor     di,di
-        mov     eax,8*0x100000+7
-        mov     cx,256*4
-      pt5:
+        mov     eax,8*0x100000
-        stosd
-        add     eax,0x1000
+        mov     cx,256*4
-        loop    pt5
+        call	pagetable_set
 ; 4 KB PAGE DIRECTORY
 	push	0x7F00
-	pop	es                ; es:di = 7F00:0
-        xor     di, di
-        mov     cx, 64 / 4
+	pop	es                ; es:di = 7F00:0
-        mov     eax, 0x60007            ; for 0 M
-      pd4k:
+        xor     di, di
-        stosd
+        mov     cx, 64 / 4
-        add     eax, 0x1000
+        mov     eax, 0x60007            ; for 0 M
-        loop    pd4k
+        call	pagetable_set
         mov     dword [es:0x800],0x71007   ;map region 0x80000000-0x803FFFFF to 0x800000-0xCFFFFF
         xor     si,si
         mov     di,second_base_address shr 20
-        mov     cx,64/4
+        mov     cx,64/2
-        rep     movs dword [es:di], [es:si]
+        rep     movs word [es:di], [es:si]
         mov     eax, 0x7F000 +8+16      ; Page directory and enable caches
-        mov     cr3, eax
         mov     cr3, eax
 ; SET GRAPHICS
 ; SET GRAPHICS
 	pop	es
-        mov     bx,[es:0x9008]		; vga & 320x200
+	pop	es
-        mov	ax, bx
+        mov     ax,[es:0x9008]		; vga & 320x200
-	push	ax
+        mov	bx, ax
         cmp     ax,0x13
-        je      setgr
-        cmp     ax,0x12
+        je      setgr
-        je      setgr
-        mov     ax,0x4f02            ; Vesa
+        cmp     ax,0x12
-       setgr:
-        int     0x10
-        test	ah,ah
+        je      setgr
-        jz      gmok
+        mov     ax,0x4f02            ; Vesa
-        mov     si,fatalsel-0x10000
+       setgr:
-        call    print
+        int     0x10
-        jmp     $
+        test	ah,ah
+        mov	si, fatalsel-0x10000
         jnz	sayerr
-       gmok:
+; set mode 0x12 graphics registers:
-; set mode 0x12 graphics registers:
+        cmp     bx,0x12
-        cmp     bx,0x12
+        jne     gmok2
         mov     al,0x0f
         inc	dx
         out     dx,al      ; set mask for all planes 0-3
         mov     al,0x08
-        mov     dx,0x03ce
+        pop	dx
         out     dx,al      ; select GDC bit mask register
                            ; for writes to 0x03cf

Subversion Repositories Kolibri OS

(root)/kernel/trunk/boot/bootcode.inc – Rev 34 → 40