From e423045d6f3bf89fae519dfd900671c0a6539a74 Mon Sep 17 00:00:00 2001 From: pathoswithin Date: Thu, 15 Oct 2015 15:26:59 +0000 Subject: [PATCH] Setup: total code refactoring git-svn-id: svn://kolibrios.org@5849 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/system/setup/trunk/keymaps.inc | 133 +-- programs/system/setup/trunk/setup.asm | 1030 ++++++++--------------- programs/system/setup/trunk/setup.dat | Bin 28 -> 0 bytes 3 files changed, 384 insertions(+), 779 deletions(-) delete mode 100755 programs/system/setup/trunk/setup.dat diff --git a/programs/system/setup/trunk/keymaps.inc b/programs/system/setup/trunk/keymaps.inc index 4b6ca5c5ac..82808a4d85 100644 --- a/programs/system/setup/trunk/keymaps.inc +++ b/programs/system/setup/trunk/keymaps.inc @@ -1,18 +1,5 @@ alt_general: - -; db ' ',27 -; db ' @ $ {[]}\ ',8,9 -; db ' ',13 -; db ' ',0,' ',0,'4',0,' ' -; db ' ',180,178,184,'6',176,'7' -; db 179,'8',181,177,183,185,182 -; db 'ABCD',255,'FGHIJKLMNOPQRSTUVWXYZ' -; db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' -; db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' -; db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - en_keymap: - db '6',27 db '1234567890-=',8,9 db 'qwertyuiop[]',13 @@ -20,12 +7,9 @@ en_keymap: db '@234567890123',180,178,184,'6',176,'7' db 179,'8',181,177,183,185,182 db 'ABD',255,'FGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - - - - + db 'ABCDEFGHIJKLMNOPQR' fr_keymap: - db '6',27 db '&О"',39,'(-Н_УР)=',8,9 db 'azertyuiop',136,'$',13 @@ -50,12 +27,9 @@ fr_keymap: db '@234567890123',180,178,184,'6',176,'7' db 179,'8',181,177,183,185,182 db 'ABD',255,'FGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' + db 'ABCDEFGHIJKLMNOPQR' fr_keymap_alt_gr: - db '6',27 db 28,'~#{[|Ш\^@]}',8,9 db 'azertyuiop^$',13 @@ -76,15 +47,9 @@ fr_keymap_alt_gr: db '@234567890123',180,178,184,'6',176,'7' db 179,'8',181,177,183,185,182 db 'ABD',255,'FGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - - - - + db 'ABCDEFGHIJKLMNOPQR' ge_keymap: - db '6',27 db '1234567890?[',8,9 db 'qwertzuiop',203,'~',13 @@ -122,12 +77,9 @@ ge_keymap: db '@234567890123',180,178,184,'6',176,'7' db 179,'8',181,177,183,185,182 db 'ABD',255,'FGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - - - + db 'ABCDEFGHIJKLMNOPQR' ru_keymap: - db '6',27 db '1234567890-=',8,9 db 'йцукенгшщзхъ',13 @@ -153,12 +99,9 @@ ru_keymap: db '@234567890123',180,178,184,'6',176,'7' db 179,'8',181,177,183,185,182 db 'ABD',255,'FGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - - - + db 'ABCDEFGHIJKLMNOPQR' et_keymap: - db '6',27 db '1234567890+┤',8,9 db 'qwertyuiop№ї',13 @@ -184,12 +121,9 @@ et_keymap: db '@234567890123',180,178,184,'6',176,'7' db 179,'8',181,177,183,185,182 db 'ABD',255,'FGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - - + db 'ABCDEFGHIJKLMNOPQR' be_keymap: - db '6',27 db '&щ"',39,'(зш!чр)-',8,9 db 'azertyuiop',136,'$',13 @@ -212,12 +141,9 @@ be_keymap: db '@2345-7+90123',180,178,184,'6',176,'7' db 179,'8',181,177,183,185,182 db 'ABD',255,'FGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' + db 'ABCDEFGHIJKLMNOPQR' be_keymap_alt_gr: - db '6',27 db '|@#',0,0,'^',0,0,'{}',0,0,8,9 db 'azАrtyuiop[]',13 @@ -238,12 +161,9 @@ be_keymap_alt_gr: db '@234567890123',180,178,184,'6',176,'7' db 179,'8',181,177,183,185,182 db 'AB\D',255,'FGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - + db 'ABCDEFGHIJKLMNOPQR' + it_keymap: - db '6',27 db '1234567890',39,0,8,9 db 'qwertyuiop',0,'+',13 @@ -251,12 +171,9 @@ it_keymap: db '@234567890123',180,178,184,'6',176,'7' db 179,'8',181,177,183,185,182 db 'ABD',255,'FGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' - -it_keymap_alt_gr: + db 'ABCDEFGHIJKLMNOPQR' +it_keymap_alt_gr: db '6',27 db 172,185,178,179,188,189,172,'{[]}',96,'~',8,9 db 'qwertyuiop[]',13 @@ -277,7 +191,4 @@ it_keymap_alt_gr: db '@234567890123',180,178,184,'6',176,'7' db 179,'8',181,177,183,185,182 db 'AB,,0xB4111199,0,title +; Main buttons + mov eax,8 + mov ecx,6*65536+26 + mov edx,4 + mov esi,0x5580c0 + mov ebp,stringsAmount +@@: + mcall ,<490,24> + inc edx + mcall ,<526,24> + inc edx + mcall ,<562,120> + inc edx + add ecx,32*65536 + dec ebp + jnz @b +; APPLY ALL + add ecx,32*65536 + mcall ,<514,168>,,3,0x005588dd +; SAVE ALL + add ecx,32*65536 + dec edx + mcall +; text + mov eax,4 + mov ebx,6*65536+11 + mov ecx,1ffffffh + mov edx,[text] + mov esi,LLL + mov ebp,stringsAmount +newline: + mcall + add ebx,32 + add edx,esi + dec ebp + jnz newline + + mov ebp,2 + add ebx,32 +@@: + mcall + add ebx,32 + add edx,esi + dec ebp + jnz @b + + mcall 12,2 + still: -sysevent: - mcall 23,8 ; wait here for event with timeout + mcall 10 cmp eax,1 - jz red + jz draw_window cmp eax,2 jz key @@ -138,467 +231,89 @@ sysevent: jz button jmp still -;------------------------------------------------------------------------------- +;--------------------------------------------------------------- key: mcall 2 jmp still -;------------------------------------------------------------------------------- +;--------------------------------------------------------------- button: mcall 17 - cmp ah,99 - jne nosaveall - mcall 70,save_fileinfo - jmp still -;-------------------------------------- -nosaveall: - cmp ah,100 - jne no_apply_all - call apply_all - jmp still -;-------------------------------------- -no_apply_all: - cmp ah,1 ; CLOSE APPLICATION - jne no_close -;-------------------------------------- + shr eax,8 + call dword[eax*4+buttonTab-4] + jmp draw_infotext close: - or eax,-1 - mcall -;-------------------------------------- -no_close: - cmp ah,4 ; SET KEYBOARD - jnz nokm - mov eax,[keyboard] - test eax,eax - je downuplbl - dec eax - jmp nodownup -;-------------------------------------- -downuplbl: - mov eax,7 -;-------------------------------------- -nodownup: - mov [keyboard],eax - call draw_infotext -;-------------------------------------- -nokm: - cmp ah,5 - jnz nokp - mov eax,[keyboard] - cmp eax,7 - je updownlbl - inc eax - jmp noupdown -;-------------------------------------- -updownlbl: - xor eax,eax -;-------------------------------------- -noupdown: - mov [keyboard],eax - call draw_infotext -;-------------------------------------- -nokp: - cmp ah,92 ; SET LBA READ - jne no_lba_d -;-------------------------------------- -slbal: - btc [lba_read],0 - call draw_infotext - jmp still -;-------------------------------------- -no_lba_d: - cmp ah,93 - jne no_lba_i - jmp slbal -;-------------------------------------- -no_lba_i: - cmp ah,91 - jne no_set_lba_read - call _lba_read - jmp still -;-------------------------------------- -no_set_lba_read: - cmp ah,102 ; SET PCI ACCESS - jne no_pci_d -;-------------------------------------- -pcip: - btc [pci_acc],0 - call draw_infotext - jmp still -;-------------------------------------- -no_pci_d: - cmp ah,103 - jne no_pci_i - jmp pcip -;-------------------------------------- -no_pci_i: - cmp ah,101 - jne no_set_pci_acc - call _pci_acc - jmp still -;-------------------------------------- -no_set_pci_acc: - cmp ah,42 ; SET SYSTEM LANGUAGE BASE - jnz nosysm - mov eax,[syslang] - dec eax - jz still - mov [syslang],eax - call draw_infotext -;-------------------------------------- -nosysm: - cmp ah,43 - jnz nosysp - mov eax,[syslang] - cmp eax,6 - je nosysp - inc eax - mov [syslang],eax - call draw_infotext -;-------------------------------------- -nosysp: - cmp ah,41 - jnz nosyss - call _syslang - call cleantxt - call loadtxt - call draw_window -;-------------------------------------- -nosyss: -;-------------------------------------- -speakermute: - cmp ah,152 ; SET SPEAKER - jne no_speaker_d -;-------------------------------------- -speaker_p: - btc [speaker_mute],0 - call draw_infotext - jmp still -;-------------------------------------- -no_speaker_d: - cmp ah,153 - jne no_speaker_i - jmp speaker_p -;-------------------------------------- -no_speaker_i: - cmp ah,151 - jne .noapply - call _speaker_mute - jmp still -;-------------------------------------- -.noapply: - cmp ah,3 ; SET KEYMAP - jne still - call _keyboard - jmp still -;------------------------------------------------------------------------------- -_keyboard: - cmp [keyboard],0 ; english - jnz nosetkeyle - - mcall 21,2,1,en_keymap - - inc ecx - mcall 21,,,en_keymap_shift - - mcall 21,,9,1 - call alt_gen -;-------------------------------------- -nosetkeyle: - cmp [keyboard],1 ; finnish - jnz nosetkeylfi - - mcall 21,2,1,fi_keymap - - inc ecx - mcall 21,,,fi_keymap_shift - - mcall 21,,9,2 - call alt_gen -;-------------------------------------- -nosetkeylfi: - cmp [keyboard],2 ; german - jnz nosetkeylge - - mcall 21,2,1,ge_keymap - - inc ecx - mcall 21,,,ge_keymap_shift - - mcall 21,,9,3 - call alt_gen -;-------------------------------------- -nosetkeylge: - cmp [keyboard],3 ; russian - jnz nosetkeylru - - mcall 21,2,1,ru_keymap - - inc ecx - mcall 21,,,ru_keymap_shift - - mcall 21,,9,4 - call alt_gen -;-------------------------------------- -nosetkeylru: - cmp [keyboard],4 ;french - jnz nosetkeylfr - - mcall 21,2,1,fr_keymap - - inc ecx - mcall 21,,,fr_keymap_shift - - inc ecx - mcall 21,,,fr_keymap_alt_gr - - mcall 21,,9,5 -;-------------------------------------- -nosetkeylfr: - cmp [keyboard],5 ; estonian - jnz nosetkeylet - - mcall 21,2,1,et_keymap - - inc ecx - mcall 21,,,et_keymap_shift - - mcall 21,,9,6 - call alt_gen -;-------------------------------------- -nosetkeylet: - cmp [keyboard],6 ;belgian - jnz nosetkeylit - - mcall 21,2,1,be_keymap - - inc ecx - mcall 21,,,be_keymap_shift - - inc ecx - mcall 21,,,be_keymap_alt_gr - - mcall 21,,9,7 -;-------------------------------------- -nosetkeylit: - cmp [keyboard],7 ;italian - jnz nosetkeylbe - - mcall 21,2,1,it_keymap - - inc ecx - mcall 21,,,it_keymap_shift - - inc ecx - mcall 21,,,it_keymap_alt_gr - - mcall 21,,9,8 -;-------------------------------------- - -nosetkeylbe: + pop eax + mcall -1 +saveAll: + mov byte[fileinfo],2 + mcall 70,fileinfo ret -;------------------------------------------------------------------------------- -alt_gen: - mcall 21,,3,alt_general +language1: + dec [syslang] + jnz @f + mov [syslang],6 ret -;------------------------------------------------------------------------------- -draw_buttons: - pusha - shl ecx,16 - add ecx,12 - mcall 8,<(350-57),(46+BBB)> - - inc edx - mcall ,<(350-85),9> - - inc edx - mcall ,<(350-73),9> - - popa +language2: + inc [syslang] + cmp [syslang],7 + jnz @f + mov [syslang],1 ret -;------------------------------------------------------------------------------- -; ******************************************** -; ******* WINDOW DEFINITIONS AND DRAW ******* -; ******************************************** -draw_window: - pusha - mcall 12,1 - - mcall 0,<40,(355+BBB)>,<40,(10*16)>,0xB4111199,0,title ; DRAW WINDOW - - mcall 9,procinfo,-1 - - mov eax,[ebx+70] ;status of window - test eax,100b - jne .end - - mcall 8,<(350-85),100>,<(5+16*6),12>,100,0x005588dd ; APPLY ALL - - add ecx,16*65536 ; SAVE ALL - dec edx - mcall - - mov esi,0x5580c0 - - mov edx,41 - mov ecx,5+0*8 - call draw_buttons - - mov edx,3 - mov ecx,5+2*8 - call draw_buttons - - mov edx,91 - mov ecx,5+4*8 - call draw_buttons - - mov edx,101 - mov ecx,5+6*8 - call draw_buttons - - mov edx,151 - mov ecx,5+8*8 - call draw_buttons - - call draw_infotext -.end: - mcall 12,2 - popa +layout1: + dec [keyboard] + jns @f + mov [keyboard],7 ret -;------------------------------------------------------------------------------- -draw_infotext: - pusha - mov eax,[keyboard] ; KEYBOARD - test eax,eax - jnz noen - mov [text00+LLL*1+28],dword 'ENGL' - mov [text00+LLL*1+32],dword 'ISH ' -;-------------------------------------- -noen: - cmp eax,1 - jnz nofi - mov [text00+LLL*1+28],dword 'FINN' - mov [text00+LLL*1+32],dword 'ISH ' -;-------------------------------------- -nofi: - cmp eax,2 - jnz noge - mov [text00+LLL*1+28],dword 'GERM' - mov [text00+LLL*1+32],dword 'AN ' -;-------------------------------------- -noge: - cmp eax,3 - jnz nogr - mov [text00+LLL*1+28],dword 'RUSS' - mov [text00+LLL*1+32],dword 'IAN ' -;-------------------------------------- -nogr: - cmp eax,4 - jnz nofr - mov [text00+LLL*1+28],dword 'FREN' - mov [text00+LLL*1+32],dword 'CH ' -;-------------------------------------- -nofr: - cmp eax,5 - jnz noet - mov [text00+LLL*1+28],dword 'EEST' - mov [text00+LLL*1+32],dword 'I ' -;-------------------------------------- -noet: - cmp eax,6 - jnz nobe - mov [text00+LLL*1+28],dword 'BELG' - mov [text00+LLL*1+32],dword 'IAN ' -;-------------------------------------- -nobe: - cmp eax,7 - jnz noit - mov [text00+LLL*1+28],dword 'ITAL' - mov [text00+LLL*1+32],dword 'IAN' -;-------------------------------------- -noit: - mov eax,[syslang] ; SYSTEM LANGUAGE - dec eax - test eax,eax - jnz noen5 - mov [text00+LLL*0+28],dword 'ENGL' - mov [text00+LLL*0+32],dword 'ISH ' -;-------------------------------------- -noen5: - cmp eax,1 - jnz nofi5 - mov [text00+LLL*0+28],dword 'FINN' - mov [text00+LLL*0+32],dword 'ISH ' -;-------------------------------------- -nofi5: - cmp eax,2 - jnz noge5 - mov [text00+LLL*0+28],dword 'GERM' - mov [text00+LLL*0+32],dword 'AN ' -;-------------------------------------- -noge5: - cmp eax,3 - jnz nogr5 - mov [text00+LLL*0+28],dword 'RUSS' - mov [text00+LLL*0+32],dword 'IAN ' -;-------------------------------------- -nogr5: - cmp eax,4 - jne nofr5 - mov [text00+LLL*0+28],dword 'FREN' - mov [text00+LLL*0+32],dword 'CH ' -;-------------------------------------- -nofr5: - cmp eax,5 - jne noet5 - mov [text00+LLL*0+28],dword 'EEST' - mov [text00+LLL*0+32],dword 'I ' -;-------------------------------------- -noet5: - mov eax,[lba_read] - call onoff ; LBA READ - mov [text00+LLL*2+28],ebx - - mov eax,[pci_acc] - call onoff ; PCI ACCESS - mov [text00+LLL*3+28],ebx - - mov eax,[speaker_mute] - call onoff ; SPEAKER - mov [text00+LLL*4+28],ebx - - call text_out - - popa +layout2: + inc [keyboard] + cmp [keyboard],8 + jnz @f + mov [keyboard],0 ret -;------------------------------------------------------------------------------- -text_out: - mcall 13,<165,85>,<0,(14*8)>,0x80111199 ;0x80111199-19 - - mov edx,text00 - mov ebx,3*65536+7 - mov eax,4 - mov ecx,0xffffff - mov esi,LLL - mov ebp,text1_strings -;-------------------------------------- -newline: - mcall - add ebx,8+8 - add edx,esi - dec ebp - jnz newline - - mov ebp,text2_strings - add ebx,8+8 -;-------------------------------------- +LBA1: + btr [lba_read],0 + ret +LBA2: + bts [lba_read],0 + ret +PCI1: + btr [pci_acc],0 + ret +PCI2: + bts [pci_acc],0 + ret +SPEAKER1: + btr [speaker_mute],0 + ret +SPEAKER2: + bts [speaker_mute],0 + ret +font1: + cmp [fontSmoothing],0 + jz @f + dec [fontSmoothing] + ret +font2: + cmp [fontSmoothing],2 + jz @f + inc [fontSmoothing] @@: - mcall - add ebx,8+8 - add edx,esi - dec ebp - jnz @b ret -;------------------------------------------------------------------------------- +;--------------------------------------------------------------- +loadtxt: + cmp [syslang],4 + jne @f + mov [text],textrus + ret +@@: + cmp [syslang],6 + jne @f + mov [text],textet + ret +@@: + mov [text],texteng + ret +;--------------------------------------------------------------- onoff: cmp [syslang],4 jne norus1 @@ -615,149 +330,128 @@ norus1: je exitsub mov ebx,'V─L.' ret -;-------------------------------------- noet1: mov ebx,'ON ' cmp eax,1 je exitsub mov ebx,'OFF ' -;-------------------------------------- exitsub: ret -;------------------------------------------------------------------------------- -_lba_read: - mcall 21,11,[lba_read] - ret -;------------------------------------------------------------------------------- -_pci_acc: - mcall 21,12,[pci_acc] - ret -;------------------------------------------------------------------------------- -_syslang: - mcall 21,5,[syslang] - ret -;------------------------------------------------------------------------------- -_speaker_mute: - mcall 18,8,1 - cmp [speaker_mute],eax - je @f - inc ecx - mcall 18 -;-------------------------------------- -@@: - ret -;------------------------------------------------------------------------------- -loadtxt: - mov edi,text00 - mov ecx,LLL*(text1_strings + text2_strings)/4+1 - cmp [syslang],4 - jne loadet +;--------------------------------------------------------------- +align 4 +buttonTab: ; button handler pointers: -,+,apply + dd close + dd saveAll + dd apply_all + dd language1 + dd language2 + dd _syslang + dd layout1 + dd layout2 + dd _keyboard + dd LBA1 + dd LBA2 + dd _lba_read + dd PCI1 + dd PCI2 + dd _pci_acc + dd SPEAKER1 + dd SPEAKER2 + dd _speaker_mute + dd font1 + dd font2 + dd fontApply +keymapTab: + dd en_keymap + dd fi_keymap + dd ge_keymap + dd ru_keymap + dd fr_keymap + dd et_keymap + dd be_keymap + dd it_keymap +shiftKeymapTab: + dd en_keymap_shift + dd fi_keymap_shift + dd ge_keymap_shift + dd ru_keymap_shift + dd fr_keymap_shift + dd et_keymap_shift + dd be_keymap_shift + dd it_keymap_shift +altKeymapTab: + dd alt_general + dd alt_general + dd alt_general + dd alt_general + dd fr_keymap_alt_gr + dd alt_general + dd be_keymap_alt_gr + dd it_keymap_alt_gr - mov esi,textrus - jmp sload -loadet: - mov edi,text00 - mov ecx,LLL*(text1_strings + text2_strings)/4+1 - cmp [syslang],6 - jne norus - mov esi,textet - jmp sload -;-------------------------------------- -norus: - mov esi,texteng -;-------------------------------------- -sload: - rep movsd - ret -;------------------------------------------------------------------------------- -cleantxt: - xor eax,eax - mov ecx,LLL*(text1_strings + text2_strings)/4 - cld - mov edi,text00 - rep stosd - mov [text00+1711],byte 'x' - ret -;------------------------------------------------------------------------------- -; DATA AREA -count: db 0x0 -blinkpar: dd 0x0 -time: dw 0x0 -date: dd 0x0 -;------------------------------------------------------------------------------- -textrus: - db 'Язык системы : ENGLISH - + Применить' - db 'Раскладка клавиатуры : ENGLISH - + Применить' - db 'Включить LBA : OFF - + Применить' - db 'Доступ к шине PCI : OFF - + Применить' - db 'Выключить SPEAKER : OFF - + Применить' +setup.dat: ; file structure +syslang dd 0 +keyboard dd 0 +lba_read dd 0 +pci_acc dd 0 +speaker_mute dd 0 +fontSmoothing dd 0 - db 'ВНИМАНИЕ: Применить все ' - db 'НЕ ЗАБУДЬТЕ СОХРАНИТЬ НАСТРОЙКИ Сохранить все ' -;------------------------------------------------------------------------------- -texteng: - db 'System language : ENGLISH - + Apply ' - db 'Keyboard layout : ENGLISH - + Apply ' - db 'LBA read enabled : OFF - + Apply ' - db 'PCI access for appl. : OFF - + Apply ' - db 'SPEAKER disabled : OFF - + Apply ' -text1_strings = 5 - - db 'NOTE: Apply all ' - db 'SAVE YOUR SETTINGS BEFORE QUITING KOLIBRI Save all ' -textet: - db 'S№steemi keel : ENGLISH - + Kinnita ' - db 'Klaviatuuri paigutus : ENGLISH - + Kinnita ' - db 'LBA lugemine lubatud : V─L. - + Kinnita ' - db 'PCI juurdepффs programm. : V─L. - + Kinnita ' - db 'SPEAKER disabled : V─L. - + Kinnita ' - db 'M─RKUS: Kinnita kїik' - db 'SALVESTA SEADED ENNE KOLIBRIST V─LJUMIST Salvesta kїik' -text2_strings = 2 -;------------------------------------------------------------------------------- -title db 'System setup',0 +fileinfo: + dd 0 + dd 0 + dd 0 + dd 4*6 + dd setup.dat + db '/SYS/SETTINGS/SETUP.DAT',0 +title db 'System settings',0 hex db '0123456789ABCDEF' -;------------------------------------------------------------------------------- + +LLL = 56 +stringsAmount = 6 + +align 4 +text dd 0 +langs: +db 'ENGLISH FINNISH GERMAN RUSSIAN FRENCH ESTONIANBELGIAN ITALIAN ' + +textrus: +db 'Язык системы : < > Применить' +db 'Раскладка клавиатуры : < > Применить' +db 'Включить LBA : - + Применить' +db 'Доступ к шине PCI : - + Применить' +db 'Выключить SPEAKER : - + Применить' +db 'Сглаживание шрифтов : - + Применить' + +db 'ВНИМАНИЕ: Применить все' +db 'НЕ ЗАБУДЬТЕ СОХРАНИТЬ НАСТРОЙКИ Сохранить все' + +texteng: +db 'System language : < > Apply ' +db 'Keyboard layout : < > Apply ' +db 'LBA read enabled : - + Apply ' +db 'PCI access for appl. : - + Apply ' +db 'SPEAKER disabled : - + Apply ' +db 'Font smoothing : - + Apply ' + +db 'NOTE: Apply all ' +db 'SAVE YOUR SETTINGS BEFORE QUITING KOLIBRI Save all ' + +textet: +db 'S№steemi keel : < > Kinnita ' +db 'Klaviatuuri paigutus : < > Kinnita ' +db 'LBA lugemine lubatud : - + Kinnita ' +db 'PCI juurdepффs programm. : - + Kinnita ' +db 'SPEAKER disabled : - + Kinnita ' +db 'Font smoothing : - + Kinnita ' + +db 'M─RKUS: Kinnita kїik ' +db 'SALVESTA SEADED ENNE KOLIBRIST V─LJUMIST Salvesta kїik' + include 'keymaps.inc' -;------------------------------------------------------------------------------- -read_fileinfo: - dd 0 - dd 0 - dd 0 - dd 28 - dd keyboard - db 0 - dd file_name -;------------------------------------------------------------------------------- -save_fileinfo: - dd 2 - dd 0 - dd 0 - dd 28 - dd keyboard -file_name: db '/SYS/SETTINGS/SETUP.DAT',0 -;------------------------------------------------------------------------------- -keyboard dd 0x0 -syslang dd 0x4 ; 4 - rus -lba_read dd 0x1 -pci_acc dd 0x1 -speaker_mute dd 0 ; 0 - enable, 1 - disable -;----------------------------------------------------------------------------- IM_END: -;----------------------------------------------------------------------------- -align 4 -text00: - rb LLL*(text1_strings + text2_strings)+4 -;----------------------------------------------------------------------------- -align 4 boot_param: -procinfo: rb 1024 -;----------------------------------------------------------------------------- -align 4 - rb 0x1000 stack_area: -;----------------------------------------------------------------------------- -I_END: -;------------------------------------------------------------------------------- \ No newline at end of file +I_END: \ No newline at end of file diff --git a/programs/system/setup/trunk/setup.dat b/programs/system/setup/trunk/setup.dat deleted file mode 100755 index 87fcf52012fb2d3d0810a905a02299f1b47f1196..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28 YcmZQzU|?VYVh~^iVkRKw0&#!<008s=5&!@I