Subversion Repositories Kolibri OS

Rev

Rev 7451 | Rev 8241 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7451 Rev 7756
Line 103... Line 103...
103 
	lea	ecx, [ecx + ecx * 4]
 103 
	lea	ecx, [ecx + ecx * 4]
104 
	lea	ecx, [eax + ecx * 2 - '0']
 104 
	lea	ecx, [eax + ecx * 2 - '0']
105 
	jmp	.convert
 105 
	jmp	.convert
106 
.converted:
 106 
.converted:
107 
	mov	[delay], ecx
 107 
	mov	[delay], ecx
- 
 
 108 
;--------------------------------------
- 
 
 109 
	DEBUGF	1, "Searchap: get basic file\n"
- 
 
 110 
	call	load_file	; download the master file
- 
 
 111 
	xor	eax,eax
- 
 
 112 
	cmp	[fs_error],eax
- 
 
 113 
	jne	exit
- 
 
 114 
	mov	eax,[fileinfo.size]
- 
 
 115 
	mov	[basic_file_size],eax
108 
.params_done:
 116 
.params_done:
109 
;--------------------------------------
 117 
;--------------------------------------
110 
	;mcall	5,[delay]	;first mount attempt without delay
 - 
 
111 
	mov	ebx,start_dir
 118 
	mov	ebx,start_dir
112 
	mov	ax,[ebx]
 119 
	mov	ax,[ebx]
113 
	mov	ebx,read_folder_name
 120 
	mov	ebx,read_folder_name
114 
	mov	[ebx],ax
 121 
	mov	[ebx],ax
115 
	mov	ebx,read_folder_1_name
 122 
	mov	ebx,read_folder_1_name
116 
	mov	[ebx],ax
 123 
	mov	[ebx],ax
117 
	call	device_detect_f70
 124 
	call	device_detect_f70
118 
;--------------------------------------
 125 
;--------------------------------------
119 
	call	print_retrieved_devices_table
 126 
	call	print_retrieved_devices_table
120 
	DEBUGF	1, "Searchap: get basic file\n"
 - 
 
121 
;--------------------------------------
 - 
 
122 
	call	load_file	; download the master file
 - 
 
123 
	xor	eax,eax
 - 
 
124 
	cmp	[fs_error],eax
 - 
 
125 
	jne	exit
 - 
 
126 
	mov	eax,[fileinfo.size]
 - 
 
127 
	mov	[basic_file_size],eax
 - 
 
128 
 
 - 
 
129 
	call	search_and_load_pointer_file_label
 127 
	call	search_and_load_pointer_file_label
130 
;---------------------------------------------------------------------
 128 
;---------------------------------------------------------------------
131 
exit:
 129 
exit:
132 
;--------------------------------------
 130 
;--------------------------------------
133 
	DEBUGF	1, "Searchap: just exit\n"
 131 
	DEBUGF	1, "Searchap: just exit\n"
Line 135... Line 133...
135 
	cmp [mount_dir],1
 133 
	cmp [mount_dir],1
136 
	je @f
 134 
	je @f
137 
	cmp [mount_attempt], 1
 135 
	cmp [mount_attempt], 1
138 
	je @f
 136 
	je @f
139 
	mov [mount_attempt], 1 ;second mount attempt with delay
 137 
	mov [mount_attempt], 1 ;second mount attempt with delay
- 
 
 138 
	DEBUGF	2, "Searchap: second attempt after 5 seconds!\n"
140 
	mcall	5,[delay]
 139 
	mcall	5,[delay]
141 
	jmp START.params_done
 140 
	jmp START.params_done
142 
@@:
 141 
@@:
143 
	mcall	-1
 142 
	mcall	-1
144 
;---------------------------------------------------------------------
 143 
;---------------------------------------------------------------------
Line 327... Line 326...
327 
;--------------------------------------
 326 
;--------------------------------------
328 
	DEBUGF	2, "Searchap: additional partition is not found!\n"
 327 
	DEBUGF	2, "Searchap: additional partition is not found!\n"
329 
;--------------------------------------
 328 
;--------------------------------------
330 
	ret
 329 
	ret
331 
.sucess:
 330 
.sucess:
332 
	call	compare_files_and_mount
 331 
	;call	compare_files_and_mount
- 
 
 332 
	call	compare_files_and_mount.mount_now ;no need to compare files content
333 
	cmp	[compare_flag],byte 0
 333 
	cmp	[compare_flag],byte 0
334 
	jne	@b
 334 
	jne	@b
335 
	cmp	[mount_dir],1
 335 
	cmp	[mount_dir],1
336 
	je	@f
 336 
	je	@f
337 
	DEBUGF	2, "Searchap: sorry, but the additional partition is not found!\n"
 337 
	DEBUGF	2, "Searchap: sorry, but the additional partition is not found!\n"
Line 350... Line 350...
350 
	inc	edi
 350 
	inc	edi
351 
	cmp	al,ah
 351 
	cmp	al,ah
352 
	jne	.not_match
 352 
	jne	.not_match
353 
	dec	ecx
 353 
	dec	ecx
354 
	jnz	.next_char
 354 
	jnz	.next_char
355 
	mov	[compare_flag],byte 0
 - 
 
356 
	pop	esi ecx
 355 
	pop	esi ecx
- 
 
 356 
.mount_now:
- 
 
 357 
	mov	[compare_flag],byte 0
357 
;--------------------------------------
 358 
;--------------------------------------
358 
	DEBUGF	2, "Searchap: compare files - success!\n"
 359 
	DEBUGF	2, "Searchap: compare files - success!\n"
359 
	DEBUGF	2, "Searchap: mount directory: %s\n",esi
 360 
	DEBUGF	2, "Searchap: mount directory: %s\n",esi
360 
	mov	[mount_dir],1
 361 
	mov	[mount_dir],1
361 
;--------------------------------------
 362 
;--------------------------------------