Spaceraven/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Fix EN comments in kernel

Browse Source 
- Minor tweaks and translations from RU.
- Includes work by @rgimad.

git-svn-id: svn://kolibrios.org@10070 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Andrew 2024-05-30 21:54:55 +00:00
parent 48bd92cda2
commit f80a8960b0
5 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/trunk/boot/bootcode.inc
View File

@ -414,7 +414,7 @@ sayerr:
test al, 2 test al, 2
loopnz @b loopnz @b
mov al, 0xf6 ; Сброс клавиатуры, разрешить сканирование mov al, 0xf6 ; Keyboard reset, enable scanning
out 0x60, al out 0x60, al
xor cx, cx xor cx, cx
@@: @@:
@ -704,7 +704,7 @@ end if
if defined extended_primary_loader if defined extended_primary_loader
_ask_question bdev,'13',preboot_device ; range accepted for answer: 1-3 _ask_question bdev,'13',preboot_device ; range accepted for answer: 1-3
else else
_ask_question bdev,'14',preboot_device ; range accepted for answer: 1-4 _ask_question bdev,'14',preboot_device ; range accepted for answer: 1-4
end if end if
_setcursor 14,0 _setcursor 14,0
@ -875,7 +875,7 @@ end if
xor dx, dx xor dx, dx
div bx div bx
if lang eq ru if lang eq ru
; подождите 5 секунд, 4/3/2 секунды, 1 секунду ; подождите 5 секунд, 4/3/2 секундЫ, 1 секундУ
cmp al, 5 cmp al, 5
mov cl, ' ' mov cl, ' '
jae @f jae @f
@ -892,7 +892,7 @@ else if lang eq et
mov byte [time_str+10], ' ' mov byte [time_str+10], ' '
@@: @@:
else if lang eq sp else if lang eq sp
; esperar 5/4/3/2 segundos, 1 segundo ; esperar 5/4/3/2 segundo_s_, 1 segundo
cmp al, 1 cmp al, 1
mov cl, 's' mov cl, 's'
ja @f ja @f
@ -900,7 +900,7 @@ else if lang eq sp
@@: @@:
mov [time_str+10], cl mov [time_str+10], cl
else else
; wait 5/4/3/2 seconds, 1 second ; wait 5/4/3/2 second_s_, 1 second
cmp al, 1 cmp al, 1
mov cl, 's' mov cl, 's'
ja @f ja @f

30
kernel/trunk/boot/bootvesa.inc
View File

@ -77,13 +77,13 @@ virtual at $A000
mi VBE_ModeInfo mi VBE_ModeInfo
modes_table: modes_table:
end virtual end virtual
cursor_pos dw 0 ;временное хранение курсора. cursor_pos dw 0 ; temporary cursor storage
cursor_pos_old dw 0 cursor_pos_old dw 0
home_cursor dw 0 ;current shows rows a table home_cursor dw 0 ; current shows rows a table
end_cursor dw 0 ;end of position current shows rows a table end_cursor dw 0 ; end of position current shows rows a table
scroll_start dw 0 ;start position of scroll bar scroll_start dw 0 ; start position of scroll bar
scroll_end dw 0 ;end position of scroll bar scroll_end dw 0 ; end position of scroll bar
long_v_table = 9 ;long of visible video table long_v_table = 9 ; long of visible video table
size_of_step = 10 size_of_step = 10
scroll_area_size = long_v_table - 2 scroll_area_size = long_v_table - 2
int2str: int2str:
@ -696,7 +696,7 @@ draw_vmodes_table:
jmp .@@_sh jmp .@@_sh
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
;Clear arrea of current video page (0xb800) ;Clear area of current video page (0xb800)
clear_vmodes_table: clear_vmodes_table:
pusha pusha
; draw frames ; draw frames
@ -724,17 +724,17 @@ set_vmode:
push 0 ;0;x1000 push 0 ;0;x1000
pop es pop es
mov si, word [preboot_graph] ;[preboot_graph] mov si, word [preboot_graph] ;[preboot_graph]
mov cx, word [es:si+6] ; number of mode mov cx, word [es:si+6] ; number of mode
mov ax, word [es:si+0] ; resolution X mov ax, word [es:si+0] ; resolution X
mov bx, word [es:si+2] ; resolution Y mov bx, word [es:si+2] ; resolution Y
mov word [es:BOOT_LO.x_res], ax ; resolution X mov word [es:BOOT_LO.x_res], ax ; resolution X
mov word [es:BOOT_LO.y_res], bx ; resolution Y mov word [es:BOOT_LO.y_res], bx ; resolution Y
mov word [es:BOOT_LO.vesa_mode], cx ; number of mode mov word [es:BOOT_LO.vesa_mode], cx ; number of mode
cmp cx, 0x12 cmp cx, 0x12
je .mode0x12_0x13 je .mode0x12_0x13
@ -752,7 +752,7 @@ set_vmode:
mov di, mi;0xa000 mov di, mi;0xa000
int 0x10 int 0x10
; LFB ; LFB
mov eax, [es:mi.PhysBasePtr];di+0x28] mov eax, [es:mi.PhysBasePtr] ; di+0x28
mov [es:BOOT_LO.lfb], eax mov [es:BOOT_LO.lfb], eax
; ---- vbe voodoo ; ---- vbe voodoo
BytesPerLine = 0x10 BytesPerLine = 0x10

4
kernel/trunk/core/sched.inc
View File

@ -84,8 +84,8 @@ updatecputimes:
loop .newupdate loop .newupdate
ret ret
;TODO: Надо бы убрать использование do_change_task из V86... ; TODO: We should remove the use of do_change_task from V86...
; и после этого перенести обработку APPDATA.counter_add/sum в do_change_task ; and then move the processing of APPDATA.counter_add/sum to do_change_task
align 4 align 4
do_change_task: do_change_task:

2
kernel/trunk/core/v86.inc
View File

@ -170,7 +170,7 @@ v86_get_lin_addr:
; esi=handle ; esi=handle
; out: eax=V86 address, para-aligned (0x10 multiple) ; out: eax=V86 address, para-aligned (0x10 multiple)
; destroys: nothing ; destroys: nothing
; недописана!!! ; Unfinished !!!
;v86_alloc: ;v86_alloc:
; push ebx ecx edx edi ; push ebx ecx edx edi
; lea ebx, [esi+V86_machine.mutex] ; lea ebx, [esi+V86_machine.mutex]

16
kernel/trunk/kernel.asm
View File

@ -337,11 +337,11 @@ high_code:
or eax, 1 ; bit_0 - System Call Extension (SCE) or eax, 1 ; bit_0 - System Call Extension (SCE)
wrmsr wrmsr
; !!!! It`s dirty hack, fix it !!! ; !!!! FIXME: Hack, fix it !!!
; Bits of EDX : ; Bits of EDX :
; Bit 31–16 During the SYSRET instruction, this field is copied into the CS register ; Bit 31-16 During the SYSRET instruction, this field is copied into the CS register
; and the contents of this field, plus 8, are copied into the SS register. ; and the contents of this field, plus 8, are copied into the SS register.
; Bit 15–0 During the SYSCALL instruction, this field is copied into the CS register ; Bit 15-0 During the SYSCALL instruction, this field is copied into the CS register
; and the contents of this field, plus 8, are copied into the SS register. ; and the contents of this field, plus 8, are copied into the SS register.
; mov edx, (os_code + 16) * 65536 + os_code ; mov edx, (os_code + 16) * 65536 + os_code
@ -2553,8 +2553,8 @@ sys_sheduler:
;now counter in ecx ;now counter in ecx
;(edx:eax) esi:edi => edx:esi ;(edx:eax) esi:edi => edx:esi
; Fast Call MSR can't be destroy ; Fast Call MSR can't be destroy
; Но MSR_AMD_EFER можно изменять, т.к. в этом регистре лиш ; But MSR_AMD_EFER can be changed, because in this register only
; включаются/выключаются расширенные возможности ; advanced features are enabled/disabled
cmp edx, MSR_SYSENTER_CS cmp edx, MSR_SYSENTER_CS
je @f je @f
cmp edx, MSR_SYSENTER_ESP cmp edx, MSR_SYSENTER_ESP
@ -2857,13 +2857,13 @@ newdw2:
cmp eax, [esp+4] cmp eax, [esp+4]
je not_this_task je not_this_task
; check if window in redraw area ; check if window in redraw area
mov edi, eax mov edi, eax
cmp ecx, 1 ; limit for background cmp ecx, 1 ; limit for background
jz bgli jz bgli
mov eax, [esp+4] ;if upper in z-position - no redraw mov eax, [esp+4] ; if upper in z-position - no redraw
test eax, eax test eax, eax
jz @f jz @f
mov al, [eax + WDATA.z_modif] mov al, [eax + WDATA.z_modif]