WebSVN – Kolibri OS – Diff – /kernel/trunk/kernel.asm

 format binary as "mnt"
 include 'macros.inc'
 include 'struct.inc'
-$Revision: 4641 $
+$Revision: 4700 $
         call    mutex_init
         mov     ecx, ide_channel1_mutex
         call    mutex_init
         mov     ecx, ide_channel2_mutex
         call    mutex_init
+        mov     ecx, ide_channel3_mutex
+        call    mutex_init
+        mov     ecx, ide_channel4_mutex
+        call    mutex_init
+        mov     ecx, ide_channel5_mutex
+        call    mutex_init
+        mov     ecx, ide_channel6_mutex
+        call    mutex_init
 ;-----------------------------------------------------------------------------
 ; SAVE REAL MODE VARIABLES
 ;-----------------------------------------------------------------------------
 ; --------------- APM ---------------------
         mov     ecx, [esp+64+32-12+4]
         and     ecx, not 0x80000000     ; force counted string
         mov     eax, [esp+64+8]         ; background color (if given)
         mov     edi, [esp+64+4]
         jmp     dtext
+;-----------------------------------------------------------------------------
+iglobal
+midi_base dw 0
+endg
+;-----------------------------------------------------------------------------
 align 4
 sys_setup:
-; 1=roland mpu midi base , base io address
+;  1 = roland mpu midi base , base io address
-; 2=keyboard   1, base kaybap 2, shift keymap, 9 country 1eng 2fi 3ger 4rus
+;  2 = keyboard   1, base kaybap 2, shift keymap, 9 country 1eng 2fi 3ger 4rus
-; 3=cd base    1, pri.master 2, pri slave 3 sec master, 4 sec slave
+;  3 = not used
+;  4 = not used
-; 5=system language, 1eng 2fi 3ger 4rus
+;  5 = system language, 1eng 2fi 3ger 4rus
+;  6 = not used
-; 7=hd base    1, pri.master 2, pri slave 3 sec master, 4 sec slave
+;  7 = not used
-; 8=fat32 partition in hd
+;  8 = not used
-; 9
+;  9 = not used
-; 10 = sound dma channel
+; 10 = not used
 ; 11 = enable lba read
 ; 12 = enable pci access
+;-----------------------------------------------------------------------------
         and     [esp+32], dword 0
+; F.21.1 - set MPU MIDI base port
-        dec     ebx                             ; MIDI
+        dec     ebx
-        jnz     nsyse1
+        jnz     @f
         cmp     ecx, 0x100
+        jb      @f
         jb      nsyse1
         mov     esi, 65535
+        cmp     esi, ecx
-        cmp     esi, ecx
+        jb      @f
-        jb      nsyse1
-        mov     [midi_base], cx ;bx
+        mov     [midi_base], cx
-        mov     word [mididp], cx;bx
+        mov     word [mididp], cx
-        inc     cx              ;bx
+        inc     cx
+        mov     word [midisp], cx
+        ret
+;--------------------------------------
+@@:
+; F.21.2 - set keyboard layout
-        mov     word [midisp], cx;bx
-        ret
-iglobal
-midi_base dw 0
-endg
-   nsyse1:
+        dec     ebx
-        dec     ebx                              ; KEYBOARD
+        jnz     @f
         jnz     nsyse2
-        mov     edi, [TASK_BASE]
+        mov     edi, [TASK_BASE]
         mov     eax, [edi+TASKDATA.mem_start]
         add     eax, edx
+; 1 = normal layout
         dec     ecx
-        dec     ecx
+        jnz     .shift
         jnz     kbnobase
         mov     ebx, keymap
+        mov     ecx, 128
-        mov     ecx, 128
+        call    memmove
+        ret
-        call    memmove
+;--------------------------------------
-        ret
+.shift:
-   kbnobase:
+; 2 = layout at pressed Shift
         dec     ecx
-        jnz     kbnoshift
+        jnz     .alt
+        mov     ebx, keymap_shift
+        mov     ecx, 128
-        mov     ebx, keymap_shift
+        call    memmove
-        mov     ecx, 128
+        ret
-        call    memmove
+;--------------------------------------
+.alt:
-        ret
+; 3 = layout at pressed Alt
-   kbnoshift:
+        dec     ecx
-        dec     ecx
+        jnz     .country
         jnz     kbnoalt
+        mov     ebx, keymap_alt
-        mov     ebx, keymap_alt
+        mov     ecx, 128
+        call    memmove
-        mov     ecx, 128
+        ret
-        call    memmove
-        ret
-   kbnoalt:
-        sub     ecx, 6
-        jnz     kbnocountry
-        mov     word [keyboard], dx
-        ret
-   kbnocountry:
-        mov     [esp+32], dword 1
-        ret
-   nsyse2:
-        dec     ebx                         ; CD
-        jnz     nsyse4
-        test    ecx, ecx
-        jz      nosesl
-        cmp     ecx, 4
-        ja      nosesl
+;--------------------------------------
-        mov     [cd_base], cl
-        dec     ecx
-        jnz     noprma
-        mov     eax, [hd_address_table]
-        mov     [cdbase], eax   ;0x1f0
-        mov     [cdid], 0xa0
-   noprma:
+.country:
-        dec     ecx
-        jnz     noprsl
-        mov     eax, [hd_address_table]
-        mov     [cdbase], eax   ;0x1f0
-        mov     [cdid], 0xb0
-   noprsl:
-        dec     ecx
-        jnz     nosema
-        mov     eax, [hd_address_table+16]
-        mov     [cdbase], eax   ;0x170
-        mov     [cdid], 0xa0
-   nosema:
-        dec     ecx
-        jnz     nosesl
+; country identifier
+        sub     ecx, 6
+        jnz     .error
+        mov     word [keyboard], dx
+        ret
-        mov     eax, [hd_address_table+16]
-        mov     [cdbase], eax   ;0x170
-        mov     [cdid], 0xb0
-   nosesl:
-        ret
-iglobal
-cd_base db 0
 ;--------------------------------------
-endg
+@@:
-   nsyse4:
-        sub     ebx, 2           ; SYSTEM LANGUAGE
+; F.21.5 - set system language
-        jnz     nsyse5
-        mov     [syslang], ecx
+        sub     ebx, 3
-        ret
-   nsyse5:
-        sub     ebx, 2          ; HD BASE - obsolete
-        jnz     nsyse7
-   nosethd:
-        ret
-nsyse7:
-;     cmp  eax,8                      ; HD PARTITION - obsolete
+        jnz     @f
         dec     ebx
-        jnz     nsyse8
+        mov     [syslang], ecx
         ret
+;--------------------------------------
 @@:
-nsyse8:
+; F.21.11 - enable/disable low-level access to HD
+        and     ecx, 1
-;     cmp  eax,11                     ; ENABLE LBA READ
+        sub     ebx, 6
-        and     ecx, 1
-        sub     ebx, 3
+        jnz     @f
         jnz     no_set_lba_read
         mov     [lba_read_enabled], ecx
+        ret
-        ret
+;--------------------------------------
 @@:
-no_set_lba_read:
+; F.21.12 - enable/disable low-level access to PCI
-;     cmp  eax,12                     ; ENABLE PCI ACCESS
+        dec     ebx
-        dec     ebx
+        jnz     .error
         jnz     sys_setup_err
-        mov     [pci_access_enabled], ecx
+        mov     [pci_access_enabled], ecx
         ret
-sys_setup_err:
+;--------------------------------------
-        or      [esp+32], dword -1
-        ret
+.error:
         or      [esp+32], dword -1
-align 4
+        ret
+;-----------------------------------------------------------------------------
 align 4
+sys_getsetup:
-sys_getsetup:
+;  1 = roland mpu midi base , base io address
+;  2 = keyboard   1, base kaybap 2, shift keymap, 9 country 1eng 2fi 3ger 4rus
-; 1=roland mpu midi base , base io address
+;  3 = not used
-; 2=keyboard   1, base kaybap 2, shift keymap, 9 country 1eng 2fi 3ger 4rus
-; 3=cd base    1, pri.master 2, pri slave 3 sec master, 4 sec slave
+;  4 = not used
+;  5 = system language, 1eng 2fi 3ger 4rus
+;  6 = not used
+;  7 = not used
+;  8 = not used
-; 5=system language, 1eng 2fi 3ger 4rus
+;  9 = get hs timer tic
-; 7=hd base    1, pri.master 2, pri slave 3 sec master, 4 sec slave
+; 10 = not used
+; 11 = get the state "lba read"
-; 8=fat32 partition in hd
+; 12 = get the state "pci access"
-; 9=get hs timer tic
+;-----------------------------------------------------------------------------
 ; F.26.1 - get MPU MIDI base port
+        dec     ebx
-;     cmp  eax,1
+        jnz     @f
-        dec     ebx
-        jnz     ngsyse1
+        movzx   eax, [midi_base]
-        movzx   eax, [midi_base]
+        mov     [esp+32], eax
-        mov     [esp+32], eax
+        ret
-        ret
+;--------------------------------------
-ngsyse1:
+@@:
-;     cmp  eax,2
-        dec     ebx
+; F.26.2 - get keyboard layout
-        jnz     ngsyse2
+        dec     ebx
+        jnz     @f
         mov     edi, [TASK_BASE]
         mov     ebx, [edi+TASKDATA.mem_start]
         add     ebx, edx
 ; 1 = normal layout
+        dec     ecx
-;     cmp  ebx,1
+        jnz     .shift
-        dec     ecx
-        jnz     kbnobaseret
+        mov     eax, keymap
-        mov     eax, keymap
+        mov     ecx, 128
-        mov     ecx, 128
+        call    memmove
-        call    memmove
+        ret
-        ret
+;--------------------------------------
-kbnobaseret:
+.shift:
+; 2 = layout with pressed Shift
-;     cmp  ebx,2
+        dec     ecx
-        dec     ecx
+        jnz     .alt
         jnz     kbnoshiftret
+        mov     eax, keymap_shift
-        mov     eax, keymap_shift
+        mov     ecx, 128
-        mov     ecx, 128
+        call    memmove
-        call    memmove
+        ret
-        ret
+;--------------------------------------
+.alt:
-kbnoshiftret:
+; 3 = layout with pressed Alt
-;     cmp  ebx,3
+        dec     ecx
-        dec     ecx
+        jne     .country
-        jne     kbnoaltret
+        mov     eax, keymap_alt
         mov     ecx, 128
-        mov     eax, keymap_alt
+        call    memmove
-        mov     ecx, 128
+        ret
+;--------------------------------------
+.country:
+; 9 = country identifier
+        sub     ecx, 6
+        jnz     .error
-        call    memmove
-        ret
-kbnoaltret:
-;     cmp  ebx,9
-        sub     ecx, 6
-        jnz     ngsyse2
-        movzx   eax, word [keyboard]
-        mov     [esp+32], eax
-        ret
-ngsyse2:
 ;         cmp  eax,3
-        dec     ebx
+        movzx   eax, word [keyboard]
-        jnz     ngsyse3
+        mov     [esp+32], eax
+        ret
-        movzx   eax, [cd_base]
+;--------------------------------------
-        mov     [esp+32], eax
+@@:
-        ret
+; F.26.5 - get system language
-ngsyse3:
+        sub     ebx, 3
+        jnz     @f
-;         cmp  eax,5
-        sub     ebx, 2
+        mov     eax, [syslang]
-        jnz     ngsyse5
+        mov     [esp+32], eax
+        ret
-        mov     eax, [syslang]
+;--------------------------------------
-        mov     [esp+32], eax
+@@:
-        ret
+; F.26.9 - get the value of the time counter
-ngsyse5:
+        sub     ebx, 4
+        jnz     @f
 ;     cmp  eax,9
-        sub     ebx, 4
+        mov     eax, [timer_ticks]
-        jnz     ngsyse9
+        mov     [esp+32], eax
+        ret
-        mov     eax, [timer_ticks];[0xfdf0]
+;--------------------------------------
-        mov     [esp+32], eax
+@@:
-        ret
+; F.26.11 - Find out whether low-level HD access is enabled
-ngsyse9:
+        sub     ebx, 2
+        jnz     @f
 ;     cmp  eax,11
-        sub     ebx, 2
+        mov     eax, [lba_read_enabled]
-        jnz     ngsyse11
+        mov     [esp+32], eax
+        ret
-        mov     eax, [lba_read_enabled]
+;--------------------------------------
-        mov     [esp+32], eax
+@@:
-        ret
+; F.26.12 - Find out whether low-level PCI access is enabled
-ngsyse11:
-;     cmp  eax,12
+        dec     ebx
-        dec     ebx
+        jnz     .error
         jnz     ngsyse12
         mov     eax, [pci_access_enabled]
-        mov     [esp+32], eax
+        mov     [esp+32], eax
         ret
-ngsyse12:
+;--------------------------------------
-        mov     [esp+32], dword 1
+.error:
-        ret
+        or      [esp+32], dword -1
         ret
 ;-----------------------------------------------------------------------------
 get_timer_ticks:
         mov     eax, [timer_ticks]
-        ret
+        ret
 ;-----------------------------------------------------------------------------
 iglobal
 align 4
 mousefn dd msscreen, mswin, msbutton, msset
         mov     ax, word [Screen_Max_X]
         shl     eax, 16
         mov     ax, word [Screen_Max_Y]
         mov     [esp + 32], eax
         ret
+;-----------------------------------------------------------------------------
 align 4
 syscall_cdaudio:                        ; CD
         cmp     ebx, 4
-        jb      .audio
-        jz      .eject
+        je      .eject
         cmp     ebx, 5
-        jnz     .ret
+        je      .load
+        ret
+;--------------------------------------
 .load:
         call    .reserve
         call    LoadMedium
-        ;call    .free
         jmp     .free
-;        ret
+;--------------------------------------
 .eject:
         call    .reserve
         call    clear_CD_cache
         call    allow_medium_removal
         call    EjectMedium
-;        call    .free
         jmp     .free
-;        ret
-.audio:
-        call    sys_cd_audio
-        mov     [esp+36-4], eax
+;--------------------------------------
-.ret:
-        ret
 .reserve:
         call    reserve_cd
+        mov     ebx, ecx
+        inc     ebx
+        mov     [cdpos], ebx
+        mov     eax, ebx
+        mov     ebx, ecx
+        and     ebx, 11b
+        shl     ebx, 1
+        mov     cl, 8
+        sub     cl, bl
+        dec     eax
+        shr     eax, 2
+        lea     eax, [eax*5]
+        mov     al, [eax+DRIVE_DATA+1]
+        shr     al, cl
+        test    al, 2 ; it's not an ATAPI device
+        jz      .ret
         mov     eax, ecx
         shr     eax, 1
         and     eax, 1
         inc     eax
         mov     [ChannelNumber], ax
         mov     eax, ecx
         and     eax, 1
         mov     [DiskNumber], al
         call    reserve_cd_channel
-        and     ebx, 3
-        inc     ebx
-        mov     [cdpos], ebx
-        add     ebx, ebx
-        mov     cl, 8
-        sub     cl, bl
-        mov     al, [DRIVE_DATA+1]
+;--------------------------------------
-        shr     al, cl
-        test    al, 2
+.ret:
-        jz      .free;.err
         ret
+;--------------------------------------
 .free:
         call    free_cd_channel
         and     [cd_status], 0
         ret
-.err:
-        call    .free
-;        pop     eax
-        ret
 ;-----------------------------------------------------------------------------
 align 4
 syscall_getpixel_WinMap:                       ; GetPixel WinMap
         cmp     ebx, [Screen_Max_X]
         jbe     @f
         cmp     byte [BOOT_VARS+0x9030], 1
         jne     @F
         ret
 @@:
         call    stop_all_services
-        movi    eax, 3
-        call    sys_cd_audio
 yes_shutdown_param:
         cli

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm – Rev 4641 → 4700