ATAPI:

1) Fix - sectors read with errors now are not brought in the cache.
2) Timeout at absence of the disk in ATAPI drive is reduced about 10 seconds without lowering reliability of reading at presence of the disk. Earlier time the waiting could make 1-1.5 minutes.


git-svn-id: svn://kolibrios.org@628 a494cfbc-eb01-0410-851d-a64ba20cac60

kernel/trunk/blkdev/cd_drv.inc

@@ -34,29 +34,28 @@ NoTickWaitTime equ 0xfffff
 ReadCD:
 	pusha
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	mov	[CDBlockSize],2048 ;2352
+	mov	  [CDBlockSize],2048 ;2352
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 	call  clear_packet_buffer
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 	; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Read CD
-	mov	[PacketCommand],byte 0x28  ;0xBE
+	mov	  [PacketCommand],byte 0x28  ;0xBE
 	; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	mov	AX,word [CDSectorAddress+2]
+	mov   AX,word [CDSectorAddress+2]
-	xchg	AL,AH
+	xchg  AL,AH
-	mov	word [PacketCommand+2],AX
+	mov   word [PacketCommand+2],AX
-	mov	AX,word [CDSectorAddress]
+	mov   AX,word [CDSectorAddress]
-	xchg	AL,AH
+	xchg  AL,AH
-	mov	word [PacketCommand+4],AX
+	mov   word [PacketCommand+4],AX
 ;        mov   eax,[CDSectorAddress]
 ;        mov   [PacketCommand+2],eax
 	; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	mov	[PacketCommand+8],byte 1
+	mov	  [PacketCommand+8],byte 1
 	; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 ;        mov     [PacketCommand+9],byte 0xF8
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	call	SendPacketDatCommand
+	call  SendPacketDatCommand
-;        call test_mario79
 	popa
 	ret
 
@@ -97,6 +96,9 @@ ReadCDWRetr:
     pop   edi
 
     call  ReadCDWRetr_1
+    cmp   [DevErrorCode],0
+    jne   .exit
+
     mov   [CDDataBuf_pointer],ebx
     call  cd_calculate_cache_1
     lea   esi,[edi*8+esi]
@@ -113,6 +115,7 @@ ReadCDWRetr:
     mov   ecx,512   ;/4
     cld
     rep   movsd 		; move data
+.exit:
     popad
     ret
 
@@ -121,34 +124,34 @@ ReadCDWRetr_1:
 
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	mov	ECX,MaxRetr
+	mov	  ECX,MaxRetr
 @@NextRetr:
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	call	ReadCD
+	call  ReadCD
-	cmp	[DevErrorCode],0
+	cmp	  [DevErrorCode],0
-	je	@@End_4
+	je	  @@End_4
 
-	or		ecx,ecx 		;{SPraid.simba} (for cd load)
+	or    ecx,ecx 		;{SPraid.simba} (for cd load)
-	jz		@@End_4
+	jz    @@End_4
-	dec	ecx
+	dec   ecx
 
-	cmp    [timer_ticks_enable],0
+	cmp   [timer_ticks_enable],0
-	jne	@f
+	jne   @f
-	mov	eax,NoTickWaitTime
+	mov   eax,NoTickWaitTime
 .wait:
-	dec	eax
+	dec   eax
-	cmp	eax,0
+	cmp   eax,0
-	je	@@NextRetr
+	je    @@NextRetr
-	jmp	.wait
+	jmp	  .wait
 @@:
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> 2,5 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	mov	EAX,[timer_ticks]
+;	mov	EAX,[timer_ticks]
-	add	EAX,250 ;50
+;	add	EAX,50	;250
-@@Wait:
+;@@Wait:
-	call	change_task
+;	call	change_task
-	cmp	EAX,[timer_ticks]
+;	cmp	EAX,[timer_ticks]
-	ja	@@Wait
+;	ja	@@Wait
-	loop	@@NextRetr
+	loop  @@NextRetr
 @@End_4:
 	popad
 	ret
@@ -189,6 +192,7 @@ CDDataBuf_pointer dd 0
 ;****************************************************
 SendPacketDatCommand:
 	pushad
+	mov   [DevErrorCode],0
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CHS
 	mov	[ATAAddressMode],0
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ATA-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -301,7 +305,6 @@ SendPacketDatCommand:
 	jmp @@End_8
 @@Err6:
 	mov	[DevErrorCode],6
-
 @@End_8:
 	popad
 	ret
@@ -319,6 +322,7 @@ SendPacketDatCommand:
 ;***********************************************
 SendPacketNoDatCommand:
 	pushad
+    mov   [DevErrorCode],0
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CHS
 	mov	[ATAAddressMode],0
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ATA-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -367,7 +371,7 @@ SendPacketNoDatCommand:
 	out	DX,AX
 ;        sti
     cmp [ignore_CD_eject_wait],1
-    je  @@End_9
+    je	@@End_9
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 	mov	DX,[ATABasePortAddr]
 	add	DX,7   ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1<EFBFBD>7h
@@ -419,6 +423,7 @@ SendPacketNoDatCommand:
 ;****************************************************
 SendCommandToHDD_1:
 	pushad
+    mov   [DevErrorCode],0
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 	cmp	[ATAAddressMode],1
 	ja	@@Err2_4
@@ -815,21 +820,19 @@ ignore_CD_eject_wait db 0
 ;*************************************************
 GetEvent_StatusNotification:
 	pusha
-    mov  [CDDataBuf_pointer],CDDataBuf
+	mov	[CDDataBuf_pointer],CDDataBuf
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 	call  clear_packet_buffer
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	mov	[PacketCommand],word 4Ah
+	mov	[PacketCommand],byte 4Ah
 	mov	[PacketCommand+1],byte 00000001b
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 	mov	[PacketCommand+4],byte 00010000b
-; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	mov	[PacketCommand+7],byte 8
+	mov	[PacketCommand+7],byte 8h
-	mov	[PacketCommand+8],byte 0
+	mov	[PacketCommand+8],byte 0h
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-;    mov [timer_ticks_enable],0
 	call	SendPacketDatCommand
-;    mov [timer_ticks_enable],1
 	popa
 	ret
 
@@ -841,17 +844,17 @@ GetEvent_StatusNotification:
 ;* DiskNumber - <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.           *
 ;*************************************************
 ;ReadCapacity:
-;	pusha
+;       pusha
 ;; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-;	call  clear_packet_buffer
+;       call  clear_packet_buffer
 ;; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-;	mov	[CDBlockSize],8
+;       mov     [CDBlockSize],8
 ;; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> READ CAPACITY
-;	mov	[PacketCommand],word 25h
+;       mov     [PacketCommand],word 25h
 ;; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-;	call	SendPacketDatCommand
+;       call    SendPacketDatCommand
-;	popa
+;       popa
-;	ret
+;       ret
 
 clear_packet_buffer:
 ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -859,4 +862,3 @@ clear_packet_buffer:
 	mov	[PacketCommand+4],dword 0
 	mov	[PacketCommand+8],dword 0
 	ret
-

kernel/trunk/fs/iso9660.inc

@@ -492,6 +492,7 @@ fs_CdGetFileInfo:
 	xor	eax, eax
 	ret
 
+;----------------------------------------------------------------
 cd_find_lfn:
        mov   [cd_appl_data],0
 ; in: esi+ebp -> name
@@ -501,6 +502,11 @@ cd_find_lfn:
 ; 16 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 	mov  [CDSectorAddress],dword 15
        mov  [CDDataBuf_pointer],CDDataBuf
+       
+       call  WaitUnitReady
+       cmp   [DevErrorCode],0
+       jne   .access_denied
+       
        call  prevent_medium_removal
 .start:
 	inc  dword [CDSectorAddress]