From 3cd0677d7eaa0c113b31216f889ce903035c7cf0 Mon Sep 17 00:00:00 2001 From: "Evgeny Grechnikov (Diamond)" Date: Mon, 4 Jun 2007 09:29:32 +0000 Subject: [PATCH] Fixed work with CD broken in svn.521 git-svn-id: svn://kolibrios.org@533 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/const.inc | 1 + kernel/trunk/fs/iso9660.inc | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/kernel/trunk/const.inc b/kernel/trunk/const.inc index 6513333204..522e106c38 100644 --- a/kernel/trunk/const.inc +++ b/kernel/trunk/const.inc @@ -192,6 +192,7 @@ TASK_DATA equ (OS_BASE+0x0003020) TASK_EVENT equ (OS_BASE+0x0003020) mouseunder equ (OS_BASE+0x0006900) +CDDataBuf equ (OS_BASE+0x0007000) FLOPPY_BUFF equ (OS_BASE+0x0008000) ACTIVE_PROC_STACK equ (OS_BASE+0x000A400) ;unused idts equ (OS_BASE+0x000B100) diff --git a/kernel/trunk/fs/iso9660.inc b/kernel/trunk/fs/iso9660.inc index d3145bc529..c927648093 100644 --- a/kernel/trunk/fs/iso9660.inc +++ b/kernel/trunk/fs/iso9660.inc @@ -15,8 +15,6 @@ IDE_Channel_1 db 0 IDE_Channel_2 db 0 endg -CDDataBuf equ 0x7000 - reserve_cd: cli @@ -533,8 +531,10 @@ cd_find_lfn: call ReadCDWRetr ; читаем сектор директории cmp [DevErrorCode],0 jne .access_denied - call cd_find_name_in_buffer - jnc .found + push ebp + call cd_find_name_in_buffer + pop ebp + jnc .found sub eax,2048 ; директория закончилась? cmp eax,0 @@ -571,9 +571,9 @@ cd_find_name_in_buffer: mov [cd_current_pointer_of_input_2],CDDataBuf .start: call cd_get_name - jc .not_found + jc .not_found call cd_compare_name - jc .start + jc .start .found: clc ret