(tinybit) fix a bug that erroneously hooked/unhooked non-fb drives.

chenall · Nov 19, 2014 · f58722c · f58722c
1 parent f020968
commit f58722c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/ChangeLog_GRUB4DOS.txt b/ChangeLog_GRUB4DOS.txt
@@ -1,3 +1,4 @@
+2014-11-19 (tinybit) fix a bug that erroneously hooked/unhooked non-fb drives.
 2014-11-10 supported initrdfs.
 2014-11-03 (tinybit) mask off non-booting floppy drives in order to gain more stability.
 2014-11-02 (tinybit) fix offset nestification problem for virtual drives built on another in-situ virtual drive.

diff --git a/stage2/fsys_fb.c b/stage2/fsys_fb.c
@@ -180,7 +180,7 @@ static int fb_init (void)
 
 	fb_drive_virtual = is_virtual(fb_drive);
 
-	if (fb_drive_virtual)
+	if (fb_drive_virtual && fb_drive == (unsigned char)(fb_status >> 8))
 		quick_hook (0);
 
 	ret = rawread (fb_drive, 0, 0, 512, (unsigned long long)(unsigned int)&m, 0xedde0d90);
@@ -259,7 +259,7 @@ static int fb_init (void)
 
 init_end:
 
-	if (fb_drive_virtual)
+	if (fb_drive_virtual && fb_drive == (unsigned char)(fb_status >> 8))
 		quick_hook (fb_drive_virtual);
 
 	return ret;
@@ -325,14 +325,14 @@ fb_read (unsigned long long buf, unsigned long long len, unsigned long write)
     {
       sector = cur_file->data_start + (filepos >> 9) - fb_ofs;
 
-      if (fb_drive_virtual)
+      if (fb_drive_virtual && fb_drive == (unsigned char)(fb_status >> 8))
 		quick_hook (0);
 
       disk_read_func = disk_read_hook;
       ret = rawread (fb_drive, sector, filepos & 0x1ff, len, buf, write);
       disk_read_func = NULL;
 
-      if (fb_drive_virtual)
+      if (fb_drive_virtual && fb_drive == (unsigned char)(fb_status >> 8))
 		quick_hook (fb_drive_virtual);
 
       if (ret)
@@ -351,7 +351,7 @@ fb_read (unsigned long long buf, unsigned long long len, unsigned long write)
   ofs = (unsigned long) filepos % 510;
   saved_len = len;
 
-  if (fb_drive_virtual)
+  if (fb_drive_virtual && fb_drive == (unsigned char)(fb_status >> 8))
 	quick_hook (0);
 
   while (len)
@@ -373,7 +373,7 @@ fb_read (unsigned long long buf, unsigned long long len, unsigned long write)
       len -= n;
     }
 
-  if (fb_drive_virtual)
+  if (fb_drive_virtual && fb_drive == (unsigned char)(fb_status >> 8))
 	quick_hook (fb_drive_virtual);
 
   if (! ret)