WebSVN – Kolibri OS – Diff – /kernel/trunk/blkdev/cd_drv.inc

 ;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1168 $
+$Revision: 1276 $
 ;**********************************************************
 ;  Íåïîñðåäñòâåííàÿ ðàáîòà ñ óñòðîéñòâîì ÑD (ATAPI)
 ;**********************************************************
 ; Àâòîð ÷àñòè èñõîäíîãî òåêñòà Êóëàêîâ Âëàäèìèð Ãåííàäüåâè÷
-; Àäàïòàöèÿ, äîðàáîòêà è ðàçðàáîòêà Mario79
+; Àäàïòàöèÿ, äîðàáîòêà è ðàçðàáîòêà Mario79,
 ; Ìàêñèìàëüíîå êîëè÷åñòâî ïîâòîðåíèé îïåðàöèè ÷òåíèÿ
 MaxRetr equ 10
-; Ïðåäåëüíîå âðåìÿ îæèäàíèÿ ãîòîâíîñòè ê ïðèåìó êîìàíäû
-; (â òèêàõ)
-BSYWaitTime equ 1000  ;2
-NoTickWaitTime equ 0xfffff
-;*************************************************
-;*      ÏÎËÍÎÅ ×ÒÅÍÈÅ ÑÅÊÒÎÐÀ ÊÎÌÏÀÊÒ-ÄÈÑÊÀ      *
-;* Ñ÷èòûâàþòñÿ äàííûå ïîëüçîâàòåëÿ, èíôîðìàöèÿ   *
-;* ñóáêàíàëà è êîíòðîëüíàÿ èíôîðìàöèÿ            *
-;* Âõîäíûå ïàðàìåòðû ïåðåäàþòñÿ ÷åðåç ãëîáàëüíûå *
-;* ïåðìåííûå:                                    *
-;* ChannelNumber - íîìåð êàíàëà;                 *
-;* DiskNumber - íîìåð äèñêà íà êàíàëå;           *
-;* CDSectorAddress - àäðåñ ñ÷èòûâàåìîãî ñåêòîðà. *
-;* Äàííûå ñ÷èòûâàåòñÿ â ìàññèâ CDDataBuf.        *
-;*************************************************
+; Ïðåäåëüíîå âðåìÿ îæèäàíèÿ ãîòîâíîñòè ê ïðèåìó êîìàíäû
-ReadCD:
-        pusha
-; Çàäàòü ðàçìåð ñåêòîðà
-        mov       [CDBlockSize],2048 ;2352
-; Î÷èñòèòü áóôåð ïàêåòíîé êîìàíäû
-        call  clear_packet_buffer
-; Ñôîðìèðîâàòü ïàêåòíóþ êîìàíäó äëÿ ñ÷èòûâàíèÿ
-; ñåêòîðà äàííûõ
-        ; Çàäàòü êîä êîìàíäû Read CD
-        mov       [PacketCommand],byte 0x28  ;0xBE
-        ; Çàäàòü àäðåñ ñåêòîðà
-        mov   AX,word [CDSectorAddress+2]
-        xchg  AL,AH
-        mov   word [PacketCommand+2],AX
-        mov   AX,word [CDSectorAddress]
-        xchg  AL,AH
-        mov   word [PacketCommand+4],AX
-;        mov   eax,[CDSectorAddress]
-;        mov   [PacketCommand+2],eax
-        ; Çàäàòü êîëè÷åñòâî ñ÷èòûâàåìûõ ñåêòîðîâ
-        mov       [PacketCommand+8],byte 1
-        ; Çàäàòü ñ÷èòûâàíèå äàííûõ â ïîëíîì îáúåìå
-;        mov     [PacketCommand+9],byte 0xF8
-; Ïîäàòü êîìàíäó
-        call  SendPacketDatCommand
+; (â òèêàõ)
-        popa
+BSYWaitTime equ 1000  ;2
-        ret
+NoTickWaitTime equ 0xfffff
 CDBlockSize equ 2048
 ;********************************************
 ;-----------------------------------------------------------
     pushad
     mov   eax,[CDSectorAddress]
     mov   ebx,[CDDataBuf_pointer]
     call  cd_calculate_cache
+    xor   edi,edi
     add   esi,8
-    mov   edi,1
+    inc   edi
 .hdreadcache:
 ;    cmp   dword [esi+4],0       ; empty
 ;    je    .nohdcache
     cmp   [esi],eax             ; correct sector
     je    .yeshdcache
 ; Öèêë, ïîêà êîìàíäà íå âûïîëíåíà óñïåøíî èëè íå
 ; èñ÷åðïàíî êîëè÷åñòâî ïîïûòîê
         mov       ECX,MaxRetr
 @@NextRetr:
 ; Ïîäàòü êîìàíäó
+;*************************************************
+;*      ÏÎËÍÎÅ ×ÒÅÍÈÅ ÑÅÊÒÎÐÀ ÊÎÌÏÀÊÒ-ÄÈÑÊÀ      *
+;* Ñ÷èòûâàþòñÿ äàííûå ïîëüçîâàòåëÿ, èíôîðìàöèÿ   *
+;* ñóáêàíàëà è êîíòðîëüíàÿ èíôîðìàöèÿ            *
+;* Âõîäíûå ïàðàìåòðû ïåðåäàþòñÿ ÷åðåç ãëîáàëüíûå *
+;* ïåðìåííûå:                                    *
+;* ChannelNumber - íîìåð êàíàëà;                 *
+;* DiskNumber - íîìåð äèñêà íà êàíàëå;           *
+;* CDSectorAddress - àäðåñ ñ÷èòûâàåìîãî ñåêòîðà. *
+;* Äàííûå ñ÷èòûâàåòñÿ â ìàññèâ CDDataBuf.        *
+;*************************************************
+;ReadCD:
+	push	ecx
+;        pusha
+; Çàäàòü ðàçìåð ñåêòîðà
+;        mov       [CDBlockSize],2048 ;2352
+; Î÷èñòèòü áóôåð ïàêåòíîé êîìàíäû
+        call  clear_packet_buffer
+; Ñôîðìèðîâàòü ïàêåòíóþ êîìàíäó äëÿ ñ÷èòûâàíèÿ
+; ñåêòîðà äàííûõ
+; Çàäàòü êîä êîìàíäû Read CD
+        mov   [PacketCommand],byte 0x28  ;0xBE
+; Çàäàòü àäðåñ ñåêòîðà
+        mov   AX,word [CDSectorAddress+2]
+        xchg  AL,AH
+        mov   word [PacketCommand+2],AX
+        mov   AX,word [CDSectorAddress]
+        xchg  AL,AH
+        mov   word [PacketCommand+4],AX
+;        mov   eax,[CDSectorAddress]
+;        mov   [PacketCommand+2],eax
+; Çàäàòü êîëè÷åñòâî ñ÷èòûâàåìûõ ñåêòîðîâ
+        mov   [PacketCommand+8],byte 1
+; Çàäàòü ñ÷èòûâàíèå äàííûõ â ïîëíîì îáúåìå
+;        mov     [PacketCommand+9],byte 0xF8
+; Ïîäàòü êîìàíäó
+        call  SendPacketDatCommand
-        call  ReadCD
+        pop   ecx
+;        ret
-        cmp       [DevErrorCode],0
+;        cmp       [DevErrorCode],0
+	test  eax,eax
-        je        @@End_4
+        jz    @@End_4
         or    ecx,ecx           ;{SPraid.simba} (for cd load)
         jz    @@End_4
         dec   ecx
         cmp   [timer_ticks_enable],0
         jne   @f
         mov   eax,NoTickWaitTime
 .wait:
         dec   eax
-        cmp   eax,0
+;        test  eax,eax
-        je    @@NextRetr
+        jz    @@NextRetr
         jmp       .wait
 @@:
 ; Çàäåðæêà íà 2,5 ñåêóíäû
 ;       call    change_task
 ;       cmp     EAX,[timer_ticks]
 ;       ja      @@Wait
         loop  @@NextRetr
 @@End_4:
+	mov	dword [DevErrorCode],eax
         popad
         ret
-;   Óíèâåðñàëüíûå ïðîöåäóðû, îáåñïå÷èâàþùèå âûïîëíåíèå
+; Óíèâåðñàëüíûå ïðîöåäóðû, îáåñïå÷èâàþùèå âûïîëíåíèå
 ;             ïàêåòíûõ êîìàíä â ðåæèìå PIO
+; Ìàêñèìàëüíî äîïóñòèìîå âðåìÿ îæèäàíèÿ ðåàêöèè
-; Ìàêñèìàëüíî äîïóñòèìîå âðåìÿ îæèäàíèÿ ðåàêöèè
+; óñòðîéñòâà íà ïàêåòíóþ êîìàíäó (â òèêàõ)
 ; óñòðîéñòâà íà ïàêåòíóþ êîìàíäó (â òèêàõ)
 MaxCDWaitTime equ 1000 ;200 ;10 ñåêóíä
 uglobal
 ; Îáëàñòü ïàìÿòè äëÿ ôîðìèðîâàíèÿ ïàêåòíîé êîìàíäû
 PacketCommand:   rb 12  ;DB 12 DUP (?)
 ; Îáëàñòü ïàìÿòè äëÿ ïðèåìà äàííûõ îò äèñêîâîäà
 ;CDDataBuf       DB 4096 DUP (0)
 ; Ðàçìåð ïðèíèìàåìîãî áëîêà äàííûõ â áàéòàõ
-CDBlockSize     DW ?
+;CDBlockSize     DW ?
 ; Àäðåñ ñ÷èòûâàåìîãî ñåêòîðà äàííûõ
 CDSectorAddress: DD ?
 ; Âðåìÿ íà÷àëà î÷åðåäíîé îïåðàöèè ñ äèñêîì
 TickCounter_1 DD 0
 ; Âðåìÿ íà÷àëà îæèäàíèÿ ãîòîâíîñòè óñòðîéñòâà
 WURStartTime DD 0
 ; óêàçàòåëü áóôåðà äëÿ ñ÷èòûâàíèÿ
 CDDataBuf_pointer dd 0
 endg
 ;****************************************************
 ;*    ÏÎÑËÀÒÜ ÓÑÒÐÎÉÑÒÂÓ ATAPI ÏÀÊÅÒÍÓÞ ÊÎÌÀÍÄÓ,    *
 ;* ÏÐÅÄÓÑÌÀÒÐÈÂÀÞÙÓÞ ÏÅÐÅÄÀ×Ó ÎÄÍÎÃÎ ÑÅÊÒÎÐÀ ÄÀÍÍÛÕ *
 ;*     ÐÀÇÌÅÐÎÌ 2048 ÁÀÉÒ ÎÒ ÓÑÒÐÎÉÑÒÂÀ Ê ÕÎÑÒÓ     *
 ;* Âõîäíûå ïàðàìåòðû ïåðåäàþòñÿ ÷åðåç ãëîáàëüíûå    *
 ;* ïåðìåííûå:                                       *
+;* ChannelNumber - íîìåð êàíàëà;                    *
-;* ChannelNumber - íîìåð êàíàëà;                    *
+;* DiskNumber - íîìåð äèñêà íà êàíàëå;              *
-;* DiskNumber - íîìåð äèñêà íà êàíàëå;              *
+;* PacketCommand - 12-áàéòíûé êîìàíäíûé ïàêåò;      *
-;* PacketCommand - 12-áàéòíûé êîìàíäíûé ïàêåò;      *
+;* CDBlockSize - ðàçìåð ïðèíèìàåìîãî áëîêà äàííûõ.  *
-;* CDBlockSize - ðàçìåð ïðèíèìàåìîãî áëîêà äàííûõ.  *
+; return eax DevErrorCode
 ;****************************************************
 SendPacketDatCommand:
-        pushad
+	xor	eax,eax
-        mov   [DevErrorCode],0
+;        mov	byte [DevErrorCode],al
 ; Çàäàòü ðåæèì CHS
-        mov     [ATAAddressMode],0
+        mov     byte [ATAAddressMode],al
 ; Ïîñëàòü ATA-êîìàíäó ïåðåäà÷è ïàêåòíîé êîìàíäû
-        mov     [ATAFeatures],0
+        mov     byte [ATAFeatures],al
-        mov     [ATASectorCount],0
+        mov     byte [ATASectorCount],al
-        mov     [ATASectorNumber],0
+        mov     byte [ATASectorNumber],al
         ; Çàãðóçèòü ðàçìåð ïåðåäàâàåìîãî áëîêà
-        mov     AX,[CDBlockSize]
+        mov     [ATAHead],al
+;        mov     AX,[CDBlockSize]
-        mov     [ATACylinder],AX
+        mov     [ATACylinder],CDBlockSize
-        mov     [ATAHead],0
+        mov     [ATACommand],0A0h
-        mov     [ATACommand],0A0h
+        call    SendCommandToHDD_1
-        call    SendCommandToHDD_1
+	test	eax,eax
-        cmp     [DevErrorCode],0 ;ïðîâåðèòü êîä îøèáêè
+;        cmp     [DevErrorCode],0 ;ïðîâåðèòü êîä îøèáêè
-        jne     @@End_8    ;çàêîí÷èòü, ñîõðàíèâ êîä îøèáêè
+        jnz     @@End_8    ;çàêîí÷èòü, ñîõðàíèâ êîä îøèáêè
 ; Îæèäàíèå ãîòîâíîñòè äèñêîâîäà ê ïðèåìó
 ; ïàêåòíîé êîìàíäû
         mov     DX,[ATABasePortAddr]
         add     DX,7     ;ïîðò 1õ7h
         mov     ecx,NoTickWaitTime
 @@WaitDevice0:
         cmp     [timer_ticks_enable],0
         jne     @f
         dec     ecx
-        cmp     ecx,0
+;        test    ecx,ecx
-        je      @@Err1_1
+        jz      @@Err1_1
         mov     ecx,NoTickWaitTime
 @@WaitDevice1:
         cmp     [timer_ticks_enable],0
         jne     @f
         dec     ecx
-        cmp     ecx,0
+;        test    ecx,ecx
-        je      @@Err1_1
+        jz      @@Err1_1
         jmp     .test_1
 @@:
         call    change_task
         ; Ïðîâåðèòü âðåìÿ âûïîëíåíèÿ êîìàíäû
         mov     EAX,[timer_ticks]
         mov     EDI,[CDDataBuf_pointer] ;0x7000  ;CDDataBuf
         ; Çàãðóçèòü àäðåñ ðåãèñòðà äàííûõ êîíòðîëëåðà
         mov     DX,[ATABasePortAddr] ;ïîðò 1x0h
         ; Çàãðóçèòü â ñ÷åò÷èê ðàçìåð áëîêà â áàéòàõ
         xor     ecx,ecx
-        mov     CX,[CDBlockSize]
+        mov     CX,CDBlockSize
         ; Âû÷èñëèòü ðàçìåð áëîêà â 16-ðàçðÿäíûõ ñëîâàõ
         shr     CX,1 ;ðàçäåëèòü ðàçìåð áëîêà íà 2
         ; Ïðèíÿòü áëîê äàííûõ
         cli
         cld
         rep     insw
         sti
-        ; Óñïåøíîå çàâåðøåíèå ïðèåìà äàííûõ
+; Óñïåøíîå çàâåðøåíèå ïðèåìà äàííûõ
+@@End_8:
+	xor	eax,eax
-        jmp @@End_8
+        ret
 ; Çàïèñàòü êîä îøèáêè
+@@Err1_1:
+	xor	eax,eax
+	inc	eax
-@@Err1_1:
+	ret
-        mov     [DevErrorCode],1
+;        mov     [DevErrorCode],1
-        jmp @@End_8
+;	ret
+@@Err6_temp:
+	mov	eax,7
-@@Err6_temp:
+	ret
-        mov     [DevErrorCode],7
+;        mov     [DevErrorCode],7
-        jmp @@End_8
+;	ret
-@@Err6:
-        mov     [DevErrorCode],6
+@@Err6:
-@@End_8:
-        popad
+	mov	eax,6
+	ret
+;        mov     [DevErrorCode],6
+;@@End_8:
-        ret
+;        ret
 ;* DiskNumber - íîìåð äèñêà íà êàíàëå;         *
 ;* PacketCommand - 12-áàéòíûé êîìàíäíûé ïàêåò. *
 ;***********************************************
 SendPacketNoDatCommand:
         pushad
+	xor	eax,eax
-    mov   [DevErrorCode],0
+;        mov     byte [DevErrorCode],al
 ; Çàäàòü ðåæèì CHS
-        mov     [ATAAddressMode],0
+        mov     byte [ATAAddressMode],al
 ; Ïîñëàòü ATA-êîìàíäó ïåðåäà÷è ïàêåòíîé êîìàíäû
-        mov     [ATAFeatures],0
+        mov     byte [ATAFeatures],al
-        mov     [ATASectorCount],0
+        mov     byte [ATASectorCount],al
-        mov     [ATASectorNumber],0
+        mov     byte [ATASectorNumber],al
-        mov     [ATACylinder],0
+        mov     word [ATACylinder],ax
-        mov     [ATAHead],0
+        mov     byte [ATAHead],al
         mov     [ATACommand],0A0h
         call    SendCommandToHDD_1
-        cmp     [DevErrorCode],0 ;ïðîâåðèòü êîä îøèáêè
+;        cmp     [DevErrorCode],0 ;ïðîâåðèòü êîä îøèáêè
+	test	eax,eax
-        jne     @@End_9  ;çàêîí÷èòü, ñîõðàíèâ êîä îøèáêè
+        jnz     @@End_9  ;çàêîí÷èòü, ñîõðàíèâ êîä îøèáêè
 ; Îæèäàíèå ãîòîâíîñòè äèñêîâîäà ê ïðèåìó
 ; ïàêåòíîé êîìàíäû
         mov     DX,[ATABasePortAddr]
         add     DX,7   ;ïîðò 1õ7h
 @@WaitDevice0_1:
         out     DX,AX
         mov     AX,word [PacketCommand+10]
         out     DX,AX
 ;        sti
-    cmp [ignore_CD_eject_wait],1
+	cmp [ignore_CD_eject_wait],1
-    je  @@End_9
+	je  @@clear_DEC
 ; Îæèäàíèå ïîäòâåðæäåíèÿ ïðèåìà êîìàíäû
         mov     DX,[ATABasePortAddr]
         add     DX,7   ;ïîðò 1õ7h
 @@WaitDevice1_1:
         call    change_task
         jnz     @@WaitDevice1_1
         test    AL,1     ;ñîñòîÿíèå ñèãíàëà ERR
         jnz     @@Err6_1
         test    AL,40h   ;ñîñòîÿíèå ñèãíàëà DRDY
         jz      @@WaitDevice1_1
+@@clear_DEC:
+	and     [DevErrorCode],0
-        jmp @@End_9
+        popad
+        ret
 ; Çàïèñàòü êîä îøèáêè
 @@Err1_3:
-        mov     [DevErrorCode],1
+        xor	eax,eax
+	inc	eax
         jmp @@End_9
 @@Err6_1:
-        mov     [DevErrorCode],6
+        mov     eax,6
 @@End_9:
+	mov     [DevErrorCode],eax
         popad
         ret
 ;****************************************************
 ;* ATACommand - êîä êîìàíäû.                        *
 ;* Ïîñëå óñïåøíîãî âûïîëíåíèÿ ôóíêöèè:              *
 ;* â ATABasePortAddr - áàçîâûé àäðåñ HDD;           *
 ;* â DevErrorCode - íîëü.                           *
 ;* Ïðè âîçíèêíîâåíèè îøèáêè â DevErrorCode áóäåò    *
-;* âîçâðàùåí êîä îøèáêè.                            *
+;* âîçâðàùåí êîä îøèáêè â eax                       *
 ;****************************************************
 SendCommandToHDD_1:
-        pushad
+;        pushad
-    mov   [DevErrorCode],0
+;        mov   	[DevErrorCode],0	not need
 ; Ïðîâåðèòü çíà÷åíèå êîäà ðåæèìà
         cmp     [ATAAddressMode],1
         ja      @@Err2_4
 ; Ïðîâåðèòü êîððåêòíîñòü íîìåðà êàíàëà
         mov     BX,[ChannelNumber]
         mov     ecx,NoTickWaitTime
 @@WaitHDReady_2:
         cmp    [timer_ticks_enable],0
         jne    @f
         dec    ecx
-        cmp    ecx,0
+;        test   ecx,ecx
-        je     @@Err1_4
+        jz     @@Err1_4
         jmp    .test
 @@:
         call    change_task
         ; Ïðîâåðèòü âðåìÿ îæèäàíèÿ
         mov     eax,[timer_ticks]
         mov     AL,[ATACommand]
         inc     DX      ;ðåãèñòð êîìàíä
         out     DX,AL
         sti
 ; Ñáðîñèòü ïðèçíàê îøèáêè
-        mov     [DevErrorCode],0
+;        mov     [DevErrorCode],0
-        jmp @@End_10
+@@End_10:
+	xor	eax,eax
+	ret
 ; Çàïèñàòü êîä îøèáêè
 @@Err1_4:
+	xor	eax,eax
+	inc	eax
-        mov     [DevErrorCode],1
+;        mov     [DevErrorCode],1
-        jmp @@End_10
+	ret
 @@Err2_4:
+	mov	eax,2
-        mov     [DevErrorCode],2
+;        mov     [DevErrorCode],2
-        jmp @@End_10
+	ret
 @@Err3_4:
+	mov	eax,3
-        mov     [DevErrorCode],3
+;        mov     [DevErrorCode],3
-        jmp @@End_10
+	ret
 @@Err4_4:
+	mov	eax,4
-        mov     [DevErrorCode],4
+;        mov     [DevErrorCode],4
-        jmp @@End_10
+	ret
 @@Err5_4:
+	mov	eax,5
-        mov     [DevErrorCode],5
+;        mov     [DevErrorCode],5
 ; Çàâåðøåíèå ðàáîòû ïðîãðàììû
-@@End_10:
-;        sti
-        popad
-        ret
+	ret
+;        sti
+;        popad
 ;*************************************************
 ;*    ÎÆÈÄÀÍÈÅ ÃÎÒÎÂÍÎÑÒÈ ÓÑÒÐÎÉÑÒÂÀ Ê ÐÀÁÎÒÅ    *
 ;* Âõîäíûå ïàðàìåòðû ïåðåäàþòñÿ ÷åðåç ãëîáàëüíûå *
         cmp     [timer_ticks_enable],0
         jne     @f
         cmp     [DevErrorCode],0
         je      @@End_11
         dec     ecx
-        cmp     ecx,0
+;        cmp     ecx,0
-        je      .Error
+        jz      .Error
         jmp     @@SendCommand
 @@:
         call    change_task
         ; Ïðîâåðèòü êîä îøèáêè
         cmp     [DevErrorCode],0
         call allow_medium_removal
         mov  [ignore_CD_eject_wait],1
         call EjectMedium
         mov  [ignore_CD_eject_wait],0
         ret
+iglobal
 timer_ATAPI_check dd 0
 ATAPI_IDE0_lock db 0
 ATAPI_IDE1_lock db 0
 ATAPI_IDE2_lock db 0
 ATAPI_IDE3_lock db 0
 ignore_CD_eject_wait db 0
+endg
 ;*************************************************
 ;* Ïîëó÷èòü ñîîáùåíèå î ñîáûòèè èëè ñîñòîÿíèè    *
 ;*                  óñòðîéñòâà                   *
 ;* Âõîäíûå ïàðàìåòðû ïåðåäàþòñÿ ÷åðåç ãëîáàëüíûå *
 ;* ïåðåìåííûå:                                   *
 ;       popa
 ;       ret
 clear_packet_buffer:
 ; Î÷èñòèòü áóôåð ïàêåòíîé êîìàíäû
-        mov     [PacketCommand],dword 0
+        and     [PacketCommand],dword 0
-        mov     [PacketCommand+4],dword 0
+        and     [PacketCommand+4],dword 0
-        mov     [PacketCommand+8],dword 0
+        and     [PacketCommand+8],dword 0

Subversion Repositories Kolibri OS

(root)/kernel/trunk/blkdev/cd_drv.inc – Rev 1168 → 1276