Chameleon Commit Details - 253 - Chameleon open source boot loader project.

Date:

2010-07-26 01:28:58 (13 years 8 months ago)

Author:

Tamás Kosárszky

Commit:

253

Parents:

252

Message:

Renamed getDeviceStringFromBVR() to getDeviceDescription() and always initializing the output string.

Changes:

M	/branches/zef/i386/libsaio/saio_internal.h
M	/branches/zef/i386/libsaio/sys.c
M	/branches/zef/i386/libsaio/hfs.c
M	/branches/zef/i386/libsaio/msdos.c
M	/branches/zef/i386/boot2/gui.c
M	/branches/zef/i386/libsaio/disk.c

File differences

-299
300 300
301 301
302 
302
303 303
304 304
305 305
+␉return -1;␊
    }␊
␊
    getDeviceStringFromBVR(ih, devStr);␊
    getDeviceDescription(ih, devStr);␊
    verbose("Read HFS%s file: [%s/%s] %d bytes.\n",␊
            (gIsHFSPlus ? "+" : ""), devStr, filePath, (uint32_t)length);␊
␉␊
 ␉return -1;␊
     }␊
 ␊
-    getDeviceStringFromBVR(ih, devStr);␊
+    getDeviceDescription(ih, devStr);␊
     verbose("Read HFS%s file: [%s/%s] %d bytes.\n",␊
             (gIsHFSPlus ? "+" : ""), devStr, filePath, (uint32_t)length);␊
 ␉␊

-1076
1077 1077
1078 1078
1079 
1079
1080
1081
1082
1080 1083
1081 1084
1082 1085
1086
1087
1083 1088
1084 1089
1085 
1090
1091
1092
1086 1093
1087 
1088 
1089 
1090 
1091 
1094
1092 1095
1093 1096
1094 1097
+    return bvr ? bvr : bvr1;␊
}␊
␊
int getDeviceStringFromBVR(const BVRef bvr, char *str)␊
//==========================================================================␊
// getDeviceDescription() - Extracts unit number and partition number␊
// from bvr structure into "dw(u,p)" format.␊
int getDeviceDescription(BVRef bvr, char *str)␊
{␊
␉const struct devsw *dp;␊
␉␊
␉*str = '\0';␊
␊
␉if (bvr)␊
␉{␊
␉␉*str = '\0';␊
␉␉for (dp = devsw; dp->name && bvr->biosdev >= dp->biosdev; dp++);␊
␉␉dp--;␊
␉␉if (dp->name) sprintf(str, "%s(%d,%d)", dp->name, bvr->biosdev - dp->biosdev, bvr->part_no);␊
␉␉␊
␉    for (dp = devsw; dp->name && bvr->biosdev >= dp->biosdev; dp++);␊
␉    dp--;␊
␉    if (dp->name) sprintf(str, "%s(%d,%d)", dp->name, bvr->biosdev - dp->biosdev, bvr->part_no);␊
␉␉␊
␉    return true;␊
␉␉return true;␊
␉}␊
␉␊
␉return false;␊
     return bvr ? bvr : bvr1;␊
 }␊
 ␊
-int getDeviceStringFromBVR(const BVRef bvr, char *str)␊
+//==========================================================================␊
+// getDeviceDescription() - Extracts unit number and partition number␊
+// from bvr structure into "dw(u,p)" format.␊
+int getDeviceDescription(BVRef bvr, char *str)␊
 {␊
 ␉const struct devsw *dp;␊
 ␉␊
+␉*str = '\0';␊
+␊
 ␉if (bvr)␊
 ␉{␊
-␉␉*str = '\0';␊
+␉␉for (dp = devsw; dp->name && bvr->biosdev >= dp->biosdev; dp++);␊
+␉␉dp--;␊
+␉␉if (dp->name) sprintf(str, "%s(%d,%d)", dp->name, bvr->biosdev - dp->biosdev, bvr->part_no);␊
 ␉␉␊
-␉    for (dp = devsw; dp->name && bvr->biosdev >= dp->biosdev; dp++);␊
-␉    dp--;␊
-␉    if (dp->name) sprintf(str, "%s(%d,%d)", dp->name, bvr->biosdev - dp->biosdev, bvr->part_no);␊
-␉␉␊
-␉    return true;␊
+␉␉return true;␊
 ␉}␊
 ␉␊
 ␉return false;␊

-1707
1708 1708
1709 1709
1710 
1710
1711
1711 1712
1712 1713
1713 1714
+␉␊
    p = str;␊
    if (verbose) {␊
      sprintf( str, "hd(%d,%d) ", BIOS_DEV_UNIT(bvr), bvr->part_no);␊
      getDeviceDescription(bvr, str);␊
      strcat(str, " ");␊
      for (; strMaxLen > 0 && *p != '\0'; p++, strMaxLen--);␊
    }␊
␊
 ␉␊
     p = str;␊
     if (verbose) {␊
-      sprintf( str, "hd(%d,%d) ", BIOS_DEV_UNIT(bvr), bvr->part_no);␊
+      getDeviceDescription(bvr, str);␊
+      strcat(str, " ");␊
       for (; strMaxLen > 0 && *p != '\0'; p++, strMaxLen--);␊
     }␊
 ␊

-757
758 758
759 759
760 
760
761 761
762 762
763 763
+␉␉toread-=msdosclustersize;␊
␉}␊
␉␊
  getDeviceStringFromBVR(ih, devStr);␊
  getDeviceDescription(ih, devStr);␊
␉verbose("Read FAT%d file: [%s/%s] %d bytes.\n",␊
            msdosfatbits, devStr, filePath, (uint32_t)( toread<0 ) ? wastoread : wastoread-toread);␊
␉free (buf);␊
 ␉␉toread-=msdosclustersize;␊
 ␉}␊
 ␉␊
-  getDeviceStringFromBVR(ih, devStr);␊
+  getDeviceDescription(ih, devStr);␊
 ␉verbose("Read FAT%d file: [%s/%s] %d bytes.\n",␊
             msdosfatbits, devStr, filePath, (uint32_t)( toread<0 ) ? wastoread : wastoread-toread);␊
 ␉free (buf);␊

-202
203 203
204 204
205 
205
206 206
207 207
208 208
+extern void   getBootVolumeDescription(BVRef bvr, char *str, long strMaxLen, bool verbose);␊
extern void   setRootVolume(BVRef volume);␊
extern void   setBootGlobals(BVRef chain);␊
extern int    getDeviceStringFromBVR(const BVRef volume, char *str);␊
extern int    getDeviceDescription(BVRef volume, char *str);␊
␊
extern int    gBIOSDev;␊
extern int    gBootFileType;␊
 extern void   getBootVolumeDescription(BVRef bvr, char *str, long strMaxLen, bool verbose);␊
 extern void   setRootVolume(BVRef volume);␊
 extern void   setBootGlobals(BVRef chain);␊
-extern int    getDeviceStringFromBVR(const BVRef volume, char *str);␊
+extern int    getDeviceDescription(BVRef volume, char *str);␊
 ␊
 extern int    gBIOSDev;␊
 extern int    gBootFileType;␊

Download the corresponding diff file