WebSVN – Kolibri OS – Path Comparison – / – /kernel/branches/net/blkdev/ Rev 1375 and /kernel/branches/net/blkdev/ Rev 1376

Regard whitespace Rev 1375 → Rev 1376

 /kernel/branches/net/blkdev/cd_drv.inc
 ,7 → 12,7
 ;  Íåïîñðåäñòâåííàÿ ðàáîòà ñ óñòðîéñòâîì ÑD (ATAPI)
 ;**********************************************************
 ; Àâòîð ÷àñòè èñõîäíîãî òåêñòà Êóëàêîâ Âëàäèìèð Ãåííàäüåâè÷
-; Àäàïòàöèÿ, äîðàáîòêà è ðàçðàáîòêà Mario79
+; Àäàïòàöèÿ, äîðàáîòêà è ðàçðàáîòêà Mario79,<Lrz>
 ; Ìàêñèìàëüíîå êîëè÷åñòâî ïîâòîðåíèé îïåðàöèè ÷òåíèÿ
 MaxRetr equ 10
 ,46 → 20,7
 ; (â òèêàõ)
 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
-        ret
+CDBlockSize equ 2048
 ;********************************************
 ;*        ×ÒÅÍÈÅ ÑÅÊÒÎÐÀ Ñ ÏÎÂÒÎÐÀÌÈ        *
 ;* Ìíîãîêðàòíîå ïîâòîðåíèå ÷òåíèÿ ïðè ñáîÿõ *
 ,8 → 34,9
     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
 ,10 → 90,50
         mov       ECX,MaxRetr
 @@NextRetr:
 ; Ïîäàòü êîìàíäó
-        call  ReadCD
-        cmp       [DevErrorCode],0
-        je        @@End_4
+;*************************************************
+;*      ÏÎËÍÎÅ ×ÒÅÍÈÅ ÑÅÊÒÎÐÀ ÊÎÌÏÀÊÒ-ÄÈÑÊÀ      *
+;* Ñ÷èòûâàþòñÿ äàííûå ïîëüçîâàòåëÿ, èíôîðìàöèÿ   *
+;* ñóáêàíàëà è êîíòðîëüíàÿ èíôîðìàöèÿ            *
+;* Âõîäíûå ïàðàìåòðû ïåðåäàþòñÿ ÷åðåç ãëîáàëüíûå *
+;* ïåðìåííûå:                                    *
+;* 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
+        pop   ecx
+;        ret
+;        cmp       [DevErrorCode],0
+        test  eax,eax
+        jz    @@End_4
         or    ecx,ecx           ;{SPraid.simba} (for cd load)
         jz    @@End_4
         dec   ecx
 ,8 → 143,8
         mov   eax,NoTickWaitTime
 .wait:
         dec   eax
-        cmp   eax,0
-        je    @@NextRetr
+;        test  eax,eax
+        jz    @@NextRetr
         jmp       .wait
 @@:
 ; Çàäåðæêà íà 2,5 ñåêóíäû
 ,6 → 156,7
 ;       ja      @@Wait
         loop  @@NextRetr
 @@End_4:
+        mov     dword [DevErrorCode],eax
         popad
         ret
 ,14 → 166,15
 ; Ìàêñèìàëüíî äîïóñòèìîå âðåìÿ îæèäàíèÿ ðåàêöèè
 ; óñòðîéñòâà íà ïàêåòíóþ êîìàíäó (â òèêàõ)
 MaxCDWaitTime equ 1000 ;200 ;10 ñåêóíä
+uglobal
 ; Îáëàñòü ïàìÿòè äëÿ ôîðìèðîâàíèÿ ïàêåòíîé êîìàíäû
 PacketCommand:   rb 12  ;DB 12 DUP (?)
 ; Îáëàñòü ïàìÿòè äëÿ ïðèåìà äàííûõ îò äèñêîâîäà
 ;CDDataBuf       DB 4096 DUP (0)
 ; Ðàçìåð ïðèíèìàåìîãî áëîêà äàííûõ â áàéòàõ
-CDBlockSize     DW ?
+;CDBlockSize     DW ?
 ; Àäðåñ ñ÷èòûâàåìîãî ñåêòîðà äàííûõ
 CDSectorAddress: DD ?
 ; Âðåìÿ íà÷àëà î÷åðåäíîé îïåðàöèè ñ äèñêîì
 ,7 → 183,7
 WURStartTime DD 0
 ; óêàçàòåëü áóôåðà äëÿ ñ÷èòûâàíèÿ
 CDDataBuf_pointer dd 0
+endg
 ;****************************************************
 ;*    ÏÎÑËÀÒÜ ÓÑÒÐÎÉÑÒÂÓ ATAPI ÏÀÊÅÒÍÓÞ ÊÎÌÀÍÄÓ,    *
 ;* ÏÐÅÄÓÑÌÀÒÐÈÂÀÞÙÓÞ ÏÅÐÅÄÀ×Ó ÎÄÍÎÃÎ ÑÅÊÒÎÐÀ ÄÀÍÍÛÕ *
 ,24 → 194,26
 ;* DiskNumber - íîìåð äèñêà íà êàíàëå;              *
 ;* PacketCommand - 12-áàéòíûé êîìàíäíûé ïàêåò;      *
 ;* CDBlockSize - ðàçìåð ïðèíèìàåìîãî áëîêà äàííûõ.  *
+; return eax DevErrorCode
 ;****************************************************
 SendPacketDatCommand:
-        pushad
-        mov   [DevErrorCode],0
+        xor     eax,eax
+;        mov    byte [DevErrorCode],al
 ; Çàäàòü ðåæèì CHS
-        mov     [ATAAddressMode],0
+        mov     byte [ATAAddressMode],al
 ; Ïîñëàòü ATA-êîìàíäó ïåðåäà÷è ïàêåòíîé êîìàíäû
-        mov     [ATAFeatures],0
-        mov     [ATASectorCount],0
-        mov     [ATASectorNumber],0
+        mov     byte [ATAFeatures],al
+        mov     byte [ATASectorCount],al
+        mov     byte [ATASectorNumber],al
         ; Çàãðóçèòü ðàçìåð ïåðåäàâàåìîãî áëîêà
-        mov     AX,[CDBlockSize]
-        mov     [ATACylinder],AX
-        mov     [ATAHead],0
+        mov     [ATAHead],al
+;        mov     AX,[CDBlockSize]
+        mov     [ATACylinder],CDBlockSize
         mov     [ATACommand],0A0h
         call    SendCommandToHDD_1
-        cmp     [DevErrorCode],0 ;ïðîâåðèòü êîä îøèáêè
-        jne     @@End_8    ;çàêîí÷èòü, ñîõðàíèâ êîä îøèáêè
+        test    eax,eax
+;        cmp     [DevErrorCode],0 ;ïðîâåðèòü êîä îøèáêè
+        jnz     @@End_8    ;çàêîí÷èòü, ñîõðàíèâ êîä îøèáêè
 ; Îæèäàíèå ãîòîâíîñòè äèñêîâîäà ê ïðèåìó
 ; ïàêåòíîé êîìàíäû
 ,8 → 224,8
         cmp     [timer_ticks_enable],0
         jne     @f
         dec     ecx
-        cmp     ecx,0
-        je      @@Err1_1
+;        test    ecx,ecx
+        jz      @@Err1_1
         jmp     .test
 @@:
         call    change_task
 ,8 → 267,8
         cmp     [timer_ticks_enable],0
         jne     @f
         dec     ecx
-        cmp     ecx,0
-        je      @@Err1_1
+;        test    ecx,ecx
+        jz      @@Err1_1
         jmp     .test_1
 @@:
         call    change_task
 ,7 → 292,7
         mov     DX,[ATABasePortAddr] ;ïîðò 1x0h
         ; Çàãðóçèòü â ñ÷åò÷èê ðàçìåð áëîêà â áàéòàõ
         xor     ecx,ecx
-        mov     CX,[CDBlockSize]
+        mov     CX,CDBlockSize
         ; Âû÷èñëèòü ðàçìåð áëîêà â 16-ðàçðÿäíûõ ñëîâàõ
         shr     CX,1 ;ðàçäåëèòü ðàçìåð áëîêà íà 2
         ; Ïðèíÿòü áëîê äàííûõ
 ,20 → 301,28
         rep     insw
         sti
         ; Óñïåøíîå çàâåðøåíèå ïðèåìà äàííûõ
-        jmp @@End_8
+@@End_8:
+        xor     eax,eax
+        ret
 ; Çàïèñàòü êîä îøèáêè
 @@Err1_1:
-        mov     [DevErrorCode],1
-        jmp @@End_8
+        xor     eax,eax
+        inc     eax
+        ret
+;        mov     [DevErrorCode],1
+;       ret
 @@Err6_temp:
-        mov     [DevErrorCode],7
-        jmp @@End_8
+        mov     eax,7
+        ret
+;        mov     [DevErrorCode],7
+;       ret
 @@Err6:
-        mov     [DevErrorCode],6
-@@End_8:
-        popad
+        mov     eax,6
         ret
+;        mov     [DevErrorCode],6
+;@@End_8:
+;        ret
 ,19 → 337,21
 ;***********************************************
 SendPacketNoDatCommand:
         pushad
-    mov   [DevErrorCode],0
+        xor     eax,eax
+;        mov     byte [DevErrorCode],al
 ; Çàäàòü ðåæèì CHS
-        mov     [ATAAddressMode],0
+        mov     byte [ATAAddressMode],al
 ; Ïîñëàòü ATA-êîìàíäó ïåðåäà÷è ïàêåòíîé êîìàíäû
-        mov     [ATAFeatures],0
-        mov     [ATASectorCount],0
-        mov     [ATASectorNumber],0
-        mov     [ATACylinder],0
-        mov     [ATAHead],0
+        mov     byte [ATAFeatures],al
+        mov     byte [ATASectorCount],al
+        mov     byte [ATASectorNumber],al
+        mov     word [ATACylinder],ax
+        mov     byte [ATAHead],al
         mov     [ATACommand],0A0h
         call    SendCommandToHDD_1
-        cmp     [DevErrorCode],0 ;ïðîâåðèòü êîä îøèáêè
-        jne     @@End_9  ;çàêîí÷èòü, ñîõðàíèâ êîä îøèáêè
+;        cmp     [DevErrorCode],0 ;ïðîâåðèòü êîä îøèáêè
+        test    eax,eax
+        jnz     @@End_9  ;çàêîí÷èòü, ñîõðàíèâ êîä îøèáêè
 ; Îæèäàíèå ãîòîâíîñòè äèñêîâîäà ê ïðèåìó
 ; ïàêåòíîé êîìàíäû
         mov     DX,[ATABasePortAddr]
 ,7 → 388,7
         out     DX,AX
 ;        sti
     cmp [ignore_CD_eject_wait],1
-    je  @@End_9
+        je  @@clear_DEC
 ; Îæèäàíèå ïîäòâåðæäåíèÿ ïðèåìà êîìàíäû
         mov     DX,[ATABasePortAddr]
         add     DX,7   ;ïîðò 1õ7h
 ,15 → 407,19
         jnz     @@Err6_1
         test    AL,40h   ;ñîñòîÿíèå ñèãíàëà DRDY
         jz      @@WaitDevice1_1
-        jmp @@End_9
+@@clear_DEC:
+        and     [DevErrorCode],0
+        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
 ,11 → 440,11
 ;* â ATABasePortAddr - áàçîâûé àäðåñ HDD;           *
 ;* â DevErrorCode - íîëü.                           *
 ;* Ïðè âîçíèêíîâåíèè îøèáêè â DevErrorCode áóäåò    *
-;* âîçâðàùåí êîä îøèáêè.                            *
+;* âîçâðàùåí êîä îøèáêè â eax                       *
 ;****************************************************
 SendCommandToHDD_1:
-        pushad
-    mov   [DevErrorCode],0
+;        pushad
+;        mov    [DevErrorCode],0        not need
 ; Ïðîâåðèòü çíà÷åíèå êîäà ðåæèìà
         cmp     [ATAAddressMode],1
         ja      @@Err2_4
 ,8 → 479,8
         cmp    [timer_ticks_enable],0
         jne    @f
         dec    ecx
-        cmp    ecx,0
-        je     @@Err1_4
+;        test   ecx,ecx
+        jz     @@Err1_4
         jmp    .test
 @@:
         call    change_task
 ,28 → 534,35
         out     DX,AL
         sti
 ; Ñáðîñèòü ïðèçíàê îøèáêè
-        mov     [DevErrorCode],0
-        jmp @@End_10
+;        mov     [DevErrorCode],0
+@@End_10:
+        xor     eax,eax
+        ret
 ; Çàïèñàòü êîä îøèáêè
 @@Err1_4:
-        mov     [DevErrorCode],1
-        jmp @@End_10
+        xor     eax,eax
+        inc     eax
+;        mov     [DevErrorCode],1
+        ret
 @@Err2_4:
-        mov     [DevErrorCode],2
-        jmp @@End_10
+        mov     eax,2
+;        mov     [DevErrorCode],2
+        ret
 @@Err3_4:
-        mov     [DevErrorCode],3
-        jmp @@End_10
+        mov     eax,3
+;        mov     [DevErrorCode],3
+        ret
 @@Err4_4:
-        mov     [DevErrorCode],4
-        jmp @@End_10
+        mov     eax,4
+;        mov     [DevErrorCode],4
+        ret
 @@Err5_4:
-        mov     [DevErrorCode],5
+        mov     eax,5
+;        mov     [DevErrorCode],5
 ; Çàâåðøåíèå ðàáîòû ïðîãðàììû
-@@End_10:
+        ret
 ;        sti
-        popad
-        ret
+;        popad
 ;*************************************************
 ;*    ÎÆÈÄÀÍÈÅ ÃÎÒÎÂÍÎÑÒÈ ÓÑÒÐÎÉÑÒÂÀ Ê ÐÀÁÎÒÅ    *
 ,8 → 590,8
         cmp     [DevErrorCode],0
         je      @@End_11
         dec     ecx
-        cmp     ecx,0
-        je      .Error
+;        cmp     ecx,0
+        jz      .Error
         jmp     @@SendCommand
 @@:
         call    change_task
 ,7 → 842,7
         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
 ,7 → 849,7
 ATAPI_IDE2_lock db 0
 ATAPI_IDE3_lock db 0
 ignore_CD_eject_wait db 0
+endg
 ;*************************************************
 ;* Ïîëó÷èòü ñîîáùåíèå î ñîáûòèè èëè ñîñòîÿíèè    *
 ;*                  óñòðîéñòâà                   *
 ,7 → 923,7
 clear_packet_buffer:
 ; Î÷èñòèòü áóôåð ïàêåòíîé êîìàíäû
-        mov     [PacketCommand],dword 0
-        mov     [PacketCommand+4],dword 0
-        mov     [PacketCommand+8],dword 0
+        and     [PacketCommand],dword 0
+        and     [PacketCommand+4],dword 0
+        and     [PacketCommand+8],dword 0
         ret
 Property changes:
 Modified: svn:keywords
 -Revision
 \ No newline at end of property
 +Rev
 \ No newline at end of property
 Added: svn:mergeinfo

/kernel/branches/net/blkdev/cdrom.inc
Property changes:
Modified: svn:keywords
-Revision
\ No newline at end of property
+Rev
\ No newline at end of property
Added: svn:mergeinfo

/kernel/branches/net/blkdev/fdc.inc
Property changes:
Modified: svn:keywords
-Revision
\ No newline at end of property
+Rev
\ No newline at end of property
Added: svn:mergeinfo

/kernel/branches/net/blkdev/flp_drv.inc
Property changes:
Modified: svn:keywords
-Revision
\ No newline at end of property
+Rev
\ No newline at end of property
Added: svn:mergeinfo

/kernel/branches/net/blkdev/hd_drv.inc
Property changes:
Modified: svn:keywords
-Revision
\ No newline at end of property
+Rev
\ No newline at end of property
Added: svn:mergeinfo

/kernel/branches/net/blkdev/ide_cache.inc
Property changes:
Modified: svn:keywords
-Revision
\ No newline at end of property
+Rev
\ No newline at end of property
Added: svn:mergeinfo

/kernel/branches/net/blkdev/rd.inc
Property changes:
Modified: svn:keywords
-Revision
\ No newline at end of property
+Rev
\ No newline at end of property
Added: svn:mergeinfo

/kernel/branches/net/blkdev/rdsave.inc
Property changes:
Modified: svn:keywords
-Revision
\ No newline at end of property
+Rev
\ No newline at end of property
Added: svn:mergeinfo

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 1375 → Rev 1376