Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 40 → Rev 39

/kernel/trunk/core/debug.inc
File deleted
/kernel/trunk/core/sys32.inc
164,17 → 164,6
dd i40
endg
 
macro save_ring3_context
{
push ds es
pushad
}
macro restore_ring3_context
{
popad
pop es ds
}
 
; simply return control to interrupted process
unknown_interrupt:
iret
183,7 → 172,6
{
forward
e#num :
save_ring3_context
mov bl, num
jmp exc_c
}
193,7 → 181,6
forward
e#num :
add esp, 4
save_ring3_context
mov bl, num
jmp exc_c
}
206,16 → 193,6
mov ds, ax
mov es, ax
 
; test if debugging
cli
mov eax, [0x3000]
shl eax, 8
mov eax, [0x80000+eax+0xAC]
test eax, eax
jnz .debug
sti
; not debuggee => say error and terminate
add esp, 28h
movzx eax, bl
mov [error_interrupt], eax
call show_error_parameters
225,25 → 202,6
jmp change_task
 
.debug:
; we are debugged process, notify debugger and suspend ourself
; eax=debugger PID
movzx ecx, bl
push ecx
mov ecx, [0x3010]
push dword [ecx+4] ; PID of current process
push 12
pop ecx
push 1 ; 1=exception
call debugger_notify
pop ecx
pop ecx
pop ecx
mov edx, [0x3010]
mov byte [edx+0xA], 1 ; suspended
call change_task
restore_ring3_context
iretd
 
;;;;;;;;;;;;;;;;;;;;;;;
;; FPU ERROR HANDLER ;;
251,8 → 209,11
 
align 4
e7:
save_ring3_context
clts
push eax
push ds es
mov ax, os_data
mov ds, ax
mov es, ax
271,7 → 232,10
frstor [eax+0x10]
@@:
mov [eax + 0x7f], byte 1
restore_ring3_context
pop es ds
pop eax
iret
iglobal
356,7 → 320,7
{
forward
p_irq#num :
save_ring3_context
pushad
mov edi, num
jmp irq_c
}
364,48 → 328,58
irqh 2,5,7,8,9,10,11,14,15
 
irq_c:
push ds es
mov ax, os_data
mov ds, ax
mov es, ax
call irqhandler
restore_ring3_context
pop es ds
popad
iret
 
p_irq6:
save_ring3_context
pushad
push ds es
mov ax, os_data
mov ds, ax
mov es, ax
call fdc_irq
call ready_for_next_irq
restore_ring3_context
pop es ds
popad
iret
 
p_irq3:
save_ring3_context
pushad
push ds es
mov ax, os_data
mov ds, ax
mov es, ax
call check_mouse_data_com2
restore_ring3_context
pop es ds
popad
iret
 
p_irq4:
save_ring3_context
pushad
push ds es
mov ax, os_data
mov ds, ax
mov es, ax
call check_mouse_data_com1
restore_ring3_context
pop es ds
popad
iret
 
p_irq12:
save_ring3_context
pushad
push ds es
mov ax, os_data
mov ds, ax
mov es, ax
call check_mouse_data_ps2
restore_ring3_context
pop es ds
popad
iret
 
ready_for_next_irq:
422,7 → 396,8
ret
 
irqD:
save_ring3_context
pushad
push ds es
mov ax, os_data
mov ds, ax
mov es, ax
437,8 → 412,8
mov dx,0x20
out dx,al
 
restore_ring3_context
pop es ds
popad
iret
 
 
675,13 → 650,12
call sys_msg_board_str
pop esi
 
@@:
cli
cmp [application_table_status],0
je term9
sti
call change_task
jmp @b
jmp terminate
term9:
 
call set_application_table_status
778,23 → 752,6
rep stosd
popa
 
; debuggee test
pushad
mov edi, esi
shl edi, 5
mov eax, [0x80000+edi*8+0xAC]
test eax, eax
jz .nodebug
push 8
pop ecx
push dword [0x3000+edi+0x4] ; PID
push 2
call debugger_notify
pop ecx
pop ecx
.nodebug:
popad
 
pusha ; at 0x80000+
mov edi,esi
shl edi,8
906,25 → 863,6
mov edi,esi ; do not run this process slot
shl edi, 5
mov [edi+0x300A],byte 9
; debugger test - terminate all debuggees
mov eax, 2
mov ecx, 0x80000+2*0x100+0xAC
.xd0:
cmp eax, [0x3004]
ja .xd1
cmp dword [ecx], esi
jnz @f
and dword [ecx], 0
pushad
xchg eax, ebx
mov eax, 2
call sys_system
popad
@@:
inc eax
add ecx, 0x100
jmp .xd0
.xd1:
; call systest
sti ; .. and life goes on
 
/kernel/trunk/core/sched.inc
4,7 → 4,8
 
align 32
irq0:
save_ring3_context
pushad
push ds es
mov ax, os_data
mov ds, ax
mov es, ax
44,7 → 45,6
.waiting_for_termination:
.waiting_for_reuse:
.waiting_for_event:
.suspended:
cmp ebx, [0x3004]
jb @f
mov edi, 0x3000
55,10 → 55,6
inc ebx
 
mov al, byte [edi+0xA]
cmp al, 1
jz .suspended
cmp al, 2
jz .suspended
cmp al, 3
je .waiting_for_termination
cmp al, 4
105,7 → 101,8
inc [context_counter] ;noname & halyavin
@@:
restore_ring3_context
pop es ds
popad
iret
 
 
/kernel/trunk/core/newproce.inc
60,7 → 60,6
;input:
; eax - pointer to filename
; ebx - parameters to pass
; edx - flags
;result:
; eax - pid of new process
; or 0 if call fails.
232,7 → 231,6
;input:
; eax - pointer to filename
; ebx - parameters to pass
; edx - flags
;result:
; eax - pid of new process
; or 0 if call fails.
548,13 → 546,6
mov ebx,[new_process_place]
shl ebx,5
mov [0x3000+ebx+0xa],byte 0 ;set process state - running
; set if debuggee
test byte [esp+28], 1
jz .no_debug
mov [0x3000+ebx+0xa],byte 1 ;set process state - suspended
mov eax,[0x3000]
mov [0x80000+ebx*8+0xac],eax ;set debugger PID - current
.no_debug:
mov esi,new_process_running
call sys_msg_board_str ;output information about succefull startup
572,7 → 563,6
; ecx=thread stack value
;result:
; eax=pid
xor edx,edx ; flags=0
pushad
cmp eax,1
1175,7 → 1165,6
;eax - file name (kernel address)
;ebx - file name length
;ecx - work area (kernel address)
;edx - flags
;ebp - parameters
mov [appl_path],edi
pushad
1366,5 → 1355,3
sti
ret
end if
 
include 'debug.inc'
/kernel/trunk/core/syscall.inc
8,7 → 8,6
i40:
push ds es
pushad
cld
 
mov ax,word os_data
mov ds,ax
137,9 → 136,9
dd sys_process_def ; 66-Process definitions - keyboard
dd sys_window_move ; 67-Window move or resize
dd sys_internal_services ; 68-Some internal services
dd sys_debug_services ; 69-Debug
 
times 255 - ( ($-servetable) /4 ) dd undefined_syscall
 
dd sys_end ; -1-end application
endg
 
/kernel/trunk/kernel.asm
728,8 → 728,6
cmp al,1
jne no_load_vrr_m
mov eax,vrr_m
xor ebx,ebx ; no parameters
xor edx,edx ; no flags
call start_application_fl
cmp eax,2 ; if vrr_m app found (PID=2)
je first_app_found
736,8 → 734,6
no_load_vrr_m:
mov eax,firstapp
xor ebx,ebx ; no parameters
xor edx,edx ; no flags
call start_application_fl
 
cmp eax,2 ; continue if a process has been loaded
3112,8 → 3108,6
cmp [ctrl_alt_del], 1
jne nocpustart
mov eax, cpustring
xor ebx,ebx ; no parameters
xor edx,edx ; no flags
call start_application_fl
mov [ctrl_alt_del], 0
nocpustart:
4576,7 → 4570,6
add ebx,[edi]
noapppar:
; call start_application_fl
xor edx,edx ; compatibility - flags=0
call new_start_application_fl
mov [esp+36],eax
ret
4611,8 → 4604,7
add edi,0x10
add eax,[edi]
add ecx,[edi]
xor ebp,ebp
xor edx,edx ; compatibility - flags=0
mov ebp,0
call start_application_hd
mov [esp+36],eax
ret
/kernel/trunk/gui/event.inc
154,18 → 154,6
ret
no_stack_event:
 
test byte [edi+1], 1 ; DEBUG
jz no_debug_event
mov eax, [0x3000]
shl eax, 8
test [eax+0x80000+0xA8+1], byte 1
jz no_debug_event
and byte [eax+0x80000+0xA8+1], not 1
popad
mov eax, 9
ret
no_debug_event:
 
cmp dword [edi], 0xFFFF
jbe no_events
 
/kernel/trunk/hid/keyboard.inc
30,7 → 30,8
 
align 4
irq1:
save_ring3_context
pushad
push ds es
mov ax, os_data
mov ds, ax
mov es, ax
211,7 → 212,8
mov al,0x20 ; ready for next irq
out 0x20,al
 
restore_ring3_context
pop es ds
popad
iret
 
set_lights:
/kernel/trunk/boot/bootcode.inc
139,14 → 139,6
call setcursor
}
 
pagetable_set:
or al, 7
@@:
stosd
add eax, 1000h
loop @b
ret
 
; 16-bit data
; videomodes table
gr_table:
283,7 → 275,6
cmp ax,dx
jnz cpugood
mov si,not386-0x10000
sayerr:
call print
jmp $
cpugood:
356,9 → 347,9
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_off], ah
mov [si+vervesa_off+2], al
@@: call print
 
; \begin{diamond}[30.11.2005]
369,33 → 360,36
; b) preboot_mtrr = use hardware acceleration?
; c) preboot_vrrm = use VRR?
; d) preboot_device = from what boot?
mov di, preboot_graph-0x10000
mov si, 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
mov si, loader_block_error-0x10000
jnz sayerr
call print
jmp $
@@:
test byte [es:bx+1], 1
jz @f
; image in memory present
cmp [di+preboot_device-preboot_graph], 0
cmp [si+preboot_device-preboot_graph], 0
jnz @f
mov [di+preboot_device-preboot_graph], 3
mov [si+preboot_device-preboot_graph], 3
@@:
.noloaderblock:
; determine default settings
mov [.bSettingsChanged-0x10000], 0
cmp byte [di], 0
cmp byte [si], 0
jnz .preboot_gr_end
mov [di+preboot_gprobe-preboot_graph], 0
mov [si+preboot_gprobe-preboot_graph], 0
mov al, [vervesa+vervesa_off-0x10000]
cmp al, 'x'
jz .novesa
cmp al, '1'
jz .vesa12
mov [di+preboot_gprobe-preboot_graph], 2
mov [si+preboot_gprobe-preboot_graph], 2
mov al, 3
jmp @f
.vesa12:
404,14 → 398,14
.novesa:
mov al, 10
@@:
mov [di], al
mov [si], al
.preboot_gr_end:
cmp [di+preboot_mtrr-preboot_graph], 1
adc [di+preboot_mtrr-preboot_graph], 0
cmp [di+preboot_vrrm-preboot_graph], 1
adc [di+preboot_vrrm-preboot_graph], 0
cmp [di+preboot_device-preboot_graph], 1
adc [di+preboot_device-preboot_graph], 0
cmp [si+preboot_mtrr-preboot_graph], 1
adc [si+preboot_mtrr-preboot_graph], 0
cmp [si+preboot_vrrm-preboot_graph], 1
adc [si+preboot_vrrm-preboot_graph], 0
cmp [si+preboot_device-preboot_graph], 1
adc [si+preboot_device-preboot_graph], 0
; notify user
mov si, linef-0x10000
call print
463,11 → 457,21
mov si, linef-0x10000
call printplain
mov si, mtrr_msg-0x10000
call print
mov si, on_msg-0x10000
cmp [preboot_mtrr-0x10000], 1
call .say_on_off
jz @f
mov si, off_msg-0x10000
@@:
call printplain
mov si, vrrm_msg-0x10000
call print
mov si, on_msg-0x10000
cmp [preboot_vrrm-0x10000], 1
call .say_on_off
jz @f
mov si, off_msg-0x10000
@@:
call printplain
mov si, preboot_device_msg-0x10000
call print
mov al, [preboot_device-0x10000]
475,6 → 479,7
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
492,9 → 497,9
; restore timer interrupt
push 0
pop es
mov eax, [.oldtimer-0x10000]
mov [es:8*4], eax
mov [.timer-0x10000], eax
mov ecx, [.oldtimer-0x10000]
mov [es:8*4], ecx
mov [.timer-0x10000], ecx
_setcursor 7,0
mov si, space_msg-0x10000
call printplain
513,13 → 518,13
jnz .wait
_setcursor 15,0
mov si,bdev-0x10000
call print
call printplain
mov bx,'13'
call getkey
mov [preboot_device-0x10000], al
_setcursor 13,0
.d:
mov [.bSettingsChanged-0x10000], 1
mov [.bSettingsChanged-0x10000], al
mov si, space_msg-0x10000
call printplain
_setcursor 15,0
548,7 → 553,7
.change_b:
_setcursor 15,0
mov si, gr_acc-0x10000
call print
call printplain
mov bx, '12'
call getkey
mov [preboot_mtrr-0x10000], al
557,28 → 562,16
.change_c:
_setcursor 15,0
mov si, vrrmprint-0x10000
call print
call printplain
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
679,9 → 672,9
.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:
690,6 → 683,13
; 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:
push 0
pop es
; address is gr_table+6*(ax-1)-0x10000
699,14 → 699,14
mov cx,[si+2]
mov dx,[si+4]
cmp al, 9*2
mov al, 32 ; BPP
jb @f
mov [es:0x9000], al
mov byte [es:0x9000], 32
mov dword [es:0x9018], 0x800000
@@:
mov [es:0x9008],bx
mov [es:0x900A],cx
mov [es:0x900C],dx
mov ax,32
test bh, bh
jz nov
 
713,28 → 713,54
; USE DEFAULTS OR PROBE
 
; bx - mode : cx - x size : dx - y size
cmp [preboot_gprobe-0x10000], 1
 
;!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
movzx ax,[preboot_gprobe-0x10000]
test ax,ax
jne pre_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
 
push cx dx
 
mov bx,0x100
 
newprobe:
 
inc bx
cmp bx,0x17f
jne probemore
 
mov si,prnotfnd-0x10000
jz sayerr
call printplain
 
jmp $
 
probemore:
push cx
 
mov ax,0x4f01
mov cx,bx
and cx,0xfff
mov di,0xa000
int 0x10
pop cx
 
test byte [es:di], 80h ; lfb?
jz newprobe
cmp [es:di+0x12], cx ; x size?
mov ax, [es:di+0x12] ; x size?
cmp ax, [esp+2]
jnz newprobe
cmp [es:di+0x14], dx ; y size?
jnz newprobe
741,9 → 767,9
cmp byte [es:di+0x19], 32 ;24
jb newprobe
 
; add bx,0100000000000000b
or bh, 40h
add bx,0100000000000000b
mov [es:0x9008],bx
pop dx cx
 
noprobe:
 
756,26 → 782,27
mov di,0xa000
int 0x10
; LFB
mov eax,[es:di+0x28]
mov [es:0x9018],eax
mov ecx,[es:di+0x28]
mov [es:0x9018],ecx
; ---- vbe voodoo
BytesPerScanLine equ 0x10
mov ax, [es:di+BytesPerScanLine]
mov [es:0x9001],ax
; BPP
mov al,byte [es:di+0x19]
movzx ax,byte [es:di+0x19]
mov [es:0x9000],al
nov:
cmp al,24
cmp ax,24
mov si,bt24-0x10000
jz bppl
cmp al,32
cmp ax,32
mov si,bt32-0x10000
jz bppl
mov si,btns-0x10000
jmp sayerr
call print
jmp $
bppl:
call print
call printplain
 
 
; FIND VESA 1.2 PM BANK SWITCH ADDRESS
798,12 → 825,33
; GRAPHICS ACCELERATION
 
mov al, [preboot_mtrr-0x10000]
test al,al
jne pre_mtrr
mov si,gr_acc-0x10000
call printplain
mov bx,'12'
call getkey
pre_mtrr:
mov [es:0x901C],al
; commented by diamond - newlines are not used now
; mov si,linef-0x10000
; call printplain
 
 
; VRR_M USE
 
mov al,[preboot_vrrm-0x10000]
test al,al
jne pre_vrrm
mov si,vrrmprint-0x10000
call print
mov bx,'13'
call getkey
pre_vrrm:
mov [es:0x9030],al
; commented by diamond - newlines are not used now
; mov si,linef2-0x10000
; call printplain
 
 
; MEMORY MODEL
891,12 → 939,24
; BOOT DEVICE
 
mov al, [preboot_device-0x10000]
dec al
test al, al
jnz pre_device
mov si,bdev-0x10000
call printplain
mov bx,'13'
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
 
 
 
; READ DISKETTE TO MEMORY
 
; cmp [boot_dev-0x10000],0
cmp [boot_dev-0x10000],0
jne no_sys_on_floppy
mov si,diskload-0x10000
call print
919,7 → 979,6
cmp si,10
jnz newread
mov si,badsect-0x10000
sayerr_plain:
call printplain
jmp $
goodread:
939,7 → 998,8
mov al,0
out dx,al
mov si,memmovefailed-0x10000
jmp sayerr_plain
call print
jmp $
goodmove:
 
add dword [movedesc-0x10000+0x18+2], 512*18
970,8 → 1030,9
jnz reads
readdone:
pop ax
mov si,backspace2-0x10000
mov si,backspace-0x10000
call printplain
call printplain
mov si,okt-0x10000
call printplain
no_sys_on_floppy:
993,36 → 1054,30
pop es ; es:di = 6000:0
xor di,di
mov cx,256*map_mem ; Map (mapmem) M
; mov eax,7
; pt2:
; 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
; 8M..12M map to LFB
mov eax,7
pt2:
cmp cx,256*(map_mem-8) ; 8 M map to LFB
jnz pt3
pop eax
; mov cx, 256*4
mov ch, 4
mov di, 2000h
call pagetable_set
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
 
push 0x7100
pop es
xor di,di
mov eax,8*0x100000
mov eax,8*0x100000+7
mov cx,256*4
call pagetable_set
pt5:
stosd
add eax,0x1000
loop pt5
; 4 KB PAGE DIRECTORY
 
1031,12 → 1086,15
xor di, di
mov cx, 64 / 4
mov eax, 0x60007 ; for 0 M
call pagetable_set
pd4k:
stosd
add eax, 0x1000
loop pd4k
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/2
rep movs word [es:di], [es:si]
mov cx,64/4
rep movs dword [es:di], [es:si]
mov eax, 0x7F000 +8+16 ; Page directory and enable caches
mov cr3, eax
1044,8 → 1102,9
; SET GRAPHICS
 
pop es
mov ax,[es:0x9008] ; vga & 320x200
mov bx, ax
mov bx,[es:0x9008] ; vga & 320x200
mov ax, bx
push ax
cmp ax,0x13
je setgr
cmp ax,0x12
1054,8 → 1113,12
setgr:
int 0x10
test ah,ah
jz gmok
mov si, fatalsel-0x10000
jnz sayerr
call print
jmp $
gmok:
; set mode 0x12 graphics registers:
cmp bx,0x12
jne gmok2
1062,7 → 1125,6
 
mov al,0x05
mov dx,0x03ce
push dx
out dx,al ; select GDC mode register
mov al,0x02
inc dx
1076,7 → 1138,7
out dx,al ; set mask for all planes 0-3
 
mov al,0x08
pop dx
mov dx,0x03ce
out dx,al ; select GDC bit mask register
; for writes to 0x03cf
 
/kernel/trunk/boot/booteng.inc
62,24 → 62,25
db 186," EGA/CGA 256 Colors: [9] 320x200, "
db "VGA 16 Colors: [0] 640x480",13,10
db 186," Select mode: ",0
bt24 db "Bits Per Pixel: 24",13,10,0
bt32 db "Bits Per Pixel: 32",13,10,0
vrrmprint db "Apply VRR? (picture frequency greater than 60Hz"
bt24 db 13,10,186," Bits Per Pixel: 24",13,10,0
bt32 db 13,10,186," Bits Per Pixel: 32",13,10,0
vrrmprint db 13,10,186," Apply VRR? (picture frequency greater than 60Hz"
db " only for transfers:",13,10
db 186," 1024*768->800*600 and 800*600->640*480) [1-yes,2-no]:",0
;askmouse db " Mouse at:"
; db " [1] PS/2 (USB), [2] Com1, [3] Com2."
; db " Select port [1-3]: ",0
;no_com1 db 13,10,186, " No COM1 mouse",0
;no_com2 db 13,10,186, " No COM2 mouse",0
gr_acc db "Vesa 2.0+ : MTRR graphics acceleration "
askmouse db " Mouse at:"
db " [1] PS/2 (USB), [2] Com1, [3] Com2."
db " Select port [1-3]: ",0
no_com1 db 13,10,186, " No COM1 mouse",0
no_com2 db 13,10,186, " No COM2 mouse",0
gr_acc db 13,10,186," Vesa 2.0+ : MTRR graphics acceleration "
db "[1-yes/2-no] ? ",0
;gr_direct db 186," Use direct LFB writing? "
; db "[1-yes/2-no] ? ",0
gr_direct db 186," Use direct LFB writing? "
db "[1-yes/2-no] ? ",0
;mem_model db 13,10,186," Motherboard memory [1-16 Mb / 2-32 Mb / "
; db "3-64Mb / 4-128 Mb / 5-256 Mb] ? ",0
;bootlog db 13,10,186," After bootlog display [1-continue/2-pause] ? ",0
bdev db "Load ramdisk from [1-floppy; 2-C:\menuet.img (FAT32);"
bootlog db 13,10,186," After bootlog display [1-continue/2-pause] ? ",0
bdev db 186
db " Load ramdisk from [1-floppy; 2-C:\menuet.img (FAT32);"
db 13,10,186," "
db "3-use preloaded ram-image from kernel restart]: ",0
probetext db 13,10,13,10,186," Use standart graphics mode? [1-yes, "
89,18 → 90,18
;memokz64 db 13,10,186," RAM 64 Mb",0
;memokz32 db 13,10,186," RAM 32 Mb",0
;memokz16 db 13,10,186," RAM 16 Mb",0
prnotfnd db "Fatal - Videomode not found.",0
;modena db "Fatal - VBE 0x112+ required.",0
prnotfnd db " pr. - not found.",0
modena db "Fatal - VBE 0x112+ required.",0
not386 db "Fatal - CPU 386+ required.",0
btns db "Fatal - Can't determine color depth.",0
fatalsel db "Fatal - Graphics mode not supported by hardware.",0
btns db 13,10,186,"Fatal - Can't determine color depth.",0
fatalsel db 13,10,"Fatal - Graphics mode not supported by hardware.",0
badsect db 13,10,186," Fatal - Bad sector. Replace floppy.",0
memmovefailed db 13,10,186," Fatal - Int 0x15 move failed.",0
memmovefailed db "Fatal - Int 0x15 move failed.",0
okt db " ... OK"
linef db 13,10,0
diskload db "Loading diskette: 00 %",8,8,8,8,0
pros db "00"
backspace2 db 8,8,0
diskload db 13,10,186," Loading diskette: 00 %",8,8,8,8,0
backspace db 8,0
pros db "00",8,8,0
boot_dev db 0 ; 0=floppy, 1=hd
start_msg db "Press [abcd] to change settings, press [Enter] to continue booting",13,10,0
time_msg db " or wait "
/kernel/trunk/boot/bootru.inc
62,24 → 62,25
db 186," EGA/CGA 256 –¢¥â®¢: [9] 320x200, "
db "VGA 16 –¢¥â®¢: [0] 640x480",13,10
db 186," ‚ë¡¥à¨â¥ ¢¨¤¥®à¥¦¨¬: ",0
bt24 db "ƒ«ã¡¨­  梥â : 24",13,10,0
bt32 db "ƒ«ã¡¨­  梥â : 32",13,10,0
vrrmprint db "ˆá¯®«ì§®¢ âì VRR? (ç áâ®â  ª ¤à®¢ ¢ëè¥ 60 ƒæ"
bt24 db 13,10,186," ƒ«ã¡¨­  梥â : 24",13,10,0
bt32 db 13,10,186," ƒ«ã¡¨­  梥â : 32",13,10,0
vrrmprint db 13,10,186," ˆá¯®«ì§®¢ âì VRR? (ç áâ®â  ª ¤à®¢ ¢ëè¥ 60 ƒæ"
db " ⮫쪮 ¤«ï ¯¥à¥å®¤®¢:",13,10
db 186," 1024*768>800*600 ¨ 800*600>640*480) [1-¤ , 2-­¥â]: ",0
;askmouse db "Œëèì:" ; 186, " "
; db " [1] PS/2 (USB), [2] Com1, [3] Com2."
; db " ‚ë¡¥à¨â¥ ¯®àâ [1-3]: ",0
;no_com1 db 13,10,186," No COM1 mouse",0
;no_com2 db 13,10,186," No COM2 mouse",0
gr_acc db "Vesa 2.0+: ‚ª«îç¨âì MTRR ¤«ï ã᪮७¨ï £à ä¨ª¨? "
askmouse db "Œëèì:" ; 186, " "
db " [1] PS/2 (USB), [2] Com1, [3] Com2."
db " ‚ë¡¥à¨â¥ ¯®àâ [1-3]: ",0
no_com1 db 13,10,186," No COM1 mouse",0
no_com2 db 13,10,186," No COM2 mouse",0
gr_acc db 13,10,186," Vesa 2.0+: ‚ª«îç¨âì MTRR ¤«ï ã᪮७¨ï £à ä¨ª¨? "
db "[1-¤ /2-­¥â]: ",0
;gr_direct db 186," ˆá¯®«ì§®¢ âì «¨­¥©­ë© ¢¨¤¥®¡ãä¥à? "
; db "[1-¤ /2-­¥â]: ",0
gr_direct db 186," ˆá¯®«ì§®¢ âì «¨­¥©­ë© ¢¨¤¥®¡ãä¥à? "
db "[1-¤ /2-­¥â]: ",0
;mem_model db 13,10,186," Ž¡ê+¬ ¯ ¬ï⨠[1-16 Mb / 2-32 Mb / "
; db "3-64Mb / 4-128 Mb / 5-256 Mb]: ",0
;bootlog db 13,10,186," à®á¬®âà¥âì ¦ãà­ « § £à㧪¨? [1-­¥â/2-¤ ]: ",0
bdev db "‡ £à㧨âì ®¡à § ¨§ [1-¤¨áª¥â ; 2-C:\menuet.img (FAT32);"
bootlog db 13,10,186," à®á¬®âà¥âì ¦ãà­ « § £à㧪¨? [1-­¥â/2-¤ ]: ",0
bdev db 186
db " ‡ £à㧨âì ®¡à § ¨§ [1-¤¨áª¥â ; 2-C:\menuet.img (FAT32);"
db 13,10,186," "
db "3-¨á¯®«ì§®¢ âì 㦥 § £à㦥­­ë© ®¡à §]: ",0
probetext db 13,10,13,10,186," ‘â ­¤ àâ­ë© ¢¨¤¥®à¥¦¨¬? [1-¤ , "
89,18 → 90,19
;memokz64 db 13,10,186," RAM 64 Mb",0
;memokz32 db 13,10,186," RAM 32 Mb",0
;memokz16 db 13,10,186," RAM 16 Mb",0
prnotfnd db "Žè¨¡ª  - ‚¨¤¥®à¥¦¨¬ ­¥ ­ ©¤¥­.",0
;modena db "Žè¨¡ª  - ’ॡã¥âáï ¯®¤¤¥à¦ª  VBE 0x112+.",0
prnotfnd db " pr. - ®è¨¡ª .",0
modena db "Žè¨¡ª  - ’ॡã¥âáï ¯®¤¤¥à¦ª  VBE 0x112+.",0
not386 db "Žè¨¡ª  - ’ॡã¥âáï ¯à®æ¥áá®à 386+.",0
btns db "Žè¨¡ª  - ¥ ¬®£ã ®¯à¥¤¥«¨âì £«ã¡¨­ã 梥â .",0
fatalsel db "Žè¨¡ª  - ‚ë¡à ­­ë© ¢¨¤¥®à¥¦¨¬ ­¥ ¯®¤¤¥à¦¨¢ ¥âáï.",0
badsect db 13,10,186," Žè¨¡ª  - „¨áª¥â  ¯®¢à¥¦¤¥­ . ®¯à®¡ã©â¥ ¤àã£ãî.",0
memmovefailed db 13,10,186," Žè¨¡ª  - Int 0x15 move failed.",0
btns db 13,10,186," Žè¨¡ª  - ¥ ¬®£ã ®¯à¥¤¥«¨âì £«ã¡¨­ã 梥â .",0
fatalsel db 13,10,"Žè¨¡ª  - ‚ë¡à ­­ë© ¢¨¤¥®à¥¦¨¬ ­¥ ¯®¤¤¥à¦¨¢ ¥âáï.",0
badsect db 13,10,186," Žè¨¡ª  - „¨áª¥â  ¯®¢à¥¦¤¥­ . ®¯à®¡ã©â¥ ¤àã£ãî. "
db 0
memmovefailed db "Fatal - Int 0x15 move failed.",0
okt db " ... OK"
linef db 13,10,0
diskload db "‡ £à㧪  ¤¨áª¥âë: 00 %",8,8,8,8,0
pros db "00"
backspace2 db 8,8,0
diskload db 13,10,186," ‡ £à㧪  ¤¨áª¥âë: 00 %",8,8,8,8,0
backspace db 8,0
pros db "00",8,8,0
boot_dev db 0
start_msg db " ¦¬¨â¥ [abcd] ¤«ï ¨§¬¥­¥­¨ï ­ áâ஥ª, [Enter] ¤«ï ¯à®¤®«¦¥­¨ï § £à㧪¨",13,10,0
time_msg db " ¨«¨ ¯®¤®¦¤¨â¥ "
/kernel/trunk/fs/fs.inc
318,7 → 318,6
mov ebx,[ebx+0x10]
add ebx,[esp+12]
no_fl_start_param:
mov edx,[esp+16] ; flags
 
call start_application_fl
 
441,7 → 440,6
add ebx,[esp+12]
 
no_flp_start_param:
mov edx,[esp+16] ; flags
 
call start_application_floppy
 
780,7 → 778,6
mov ebp,[ebp+0x10]
add ebp,[esp+12]
no_hd_start_param:
mov edx,[esp+16] ; flags
 
call start_application_hd