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

Date:

2010-02-17 21:56:39 (14 years 2 months ago)

Author:

Rekursor

Commit:

Parents:

Message:

Added more optimization, prepared code to receive a future mem. detection algorithm

Changes:

M	/trunk/i386/libsaio/SMBIOS.h
M	/trunk/i386/libsaio/smbios_patcher.c
M	/trunk/i386/boot2/graphics.c
M	/trunk/i386/libsa/libsa.h
M	/trunk/i386/libsaio/smbios_patcher.h
M	/trunk/i386/libsaio/fake_efi.c
M	/trunk/i386/libsaio/platform.h
M	/trunk/i386/libsa/printf.c
M	/trunk/CHANGES
M	/trunk/i386/libsa/string.c
M	/trunk/i386/libsaio/pci_root.c

File differences

-
2
3
4
5
1 6
2 7
3 8
+- Factorized code to prepare a dynamic memory detection algorithm ...␊
- Optimized smbios table address search␊
- Optimized cursor spinout in textmode if no verbose mode is set␊
- Added ram table structures definitions␊
- Added getSmbios() a param permitting to select between orig and new smbios entries␊
- Changed "Default Partition" behaviour to accept only native system volumes or foreign partitions.␊
- Added NVIDIA new NVCAP customization support and support for ION gfx cards from aserebln␊
- Added ATI new framebuffers support and new cards from PCEFI10.6␊
+- Factorized code to prepare a dynamic memory detection algorithm ...␊
+- Optimized smbios table address search␊
+- Optimized cursor spinout in textmode if no verbose mode is set␊
+- Added ram table structures definitions␊
+- Added getSmbios() a param permitting to select between orig and new smbios entries␊
 - Changed "Default Partition" behaviour to accept only native system volumes or foreign partitions.␊
 - Added NVIDIA new NVCAP customization support and support for ION gfx cards from aserebln␊
 - Added ATI new framebuffers support and new cards from PCEFI10.6␊

-80
81 81
82 82
83 
83
84 84
85 85
86 86
+␉{␉  ␊
␉  verbose("No DSDT found, using 0 as uid value.\n");␊
␉  rootuid = 0;␊
␉  return rootuid;␊
␉  goto out;␊
␉}␊
␉␊
␉fsize = file_size(fd);␊
 ␉{␉  ␊
 ␉  verbose("No DSDT found, using 0 as uid value.\n");␊
 ␉  rootuid = 0;␊
-␉  return rootuid;␊
+␉  goto out;␊
 ␉}␊
 ␉␊
 ␉fsize = file_size(fd);␊

-1172
1173 1173
1174 1174
1175 
1176 1175
1177 1176
1178 1177
... ...
1181 1180
1182 1181
1183 1182
1184 
1185 
1186 
1183
1187 1184
1188 1185
1189 1186
... ...
1198 1195
1199 1196
1200 1197
1201 
1202 
1203 
1204 
1205 
1206 
1207 
1208 
1209 
1210 
1211 
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1212 1213
1213 1214
1214 1215
+// Display and clear the activity indicator.␊
␊
static char indicator[] = {'-', '\\', '|', '/', '-', '\\', '|', '/', '\0'};␊
#define kNumIndicators (sizeof(indicator) - 1)␊
␊
// To prevent a ridiculously fast-spinning indicator,␊
// ensure a minimum of 1/9 sec between animation frames.␊

void␊
spinActivityIndicator(int sectors)␊
{␊
    static unsigned long lastTickTime = 0;␊
    unsigned long        currentTickTime = time18();␊
    static char          string[3] = {'\0', '\b', '\0'};␊
    static unsigned long lastTickTime = 0, currentTickTime;␊
    ␊
␉if (previewTotalSectors && previewSaveunder)␊
␉{␊

␉␉return;␊
␉}␊
 ␊
␉if (currentTickTime < lastTickTime + MIN_TICKS)␊
        return;␊
    else␊
        lastTickTime = currentTickTime;␊
␊
    if ( getVideoMode() == VGA_TEXT_MODE )␊
    {␊
        if (currentIndicator >= kNumIndicators) currentIndicator = 0;␊
        string[0] = indicator[currentIndicator++];␊
        verbose(string);␊
    }␊
␉if (gVerboseMode) {␊
            currentTickTime = time18(); // late binding␊
            if (currentTickTime < lastTickTime + MIN_TICKS) {␊
                return;␊
            } else {␊
                lastTickTime = currentTickTime;␊
            }␊
            ␊
            if (getVideoMode() == VGA_TEXT_MODE) {␊
                if (currentIndicator >= sizeof(indicator)) {␊
                    currentIndicator = 0;␊
                }␊
                printf("%c\b", indicator[currentIndicator++]);␊
            }␊
        }␊
}␊
␊
void␊
 ...
 ...
 // Display and clear the activity indicator.␊
 ␊
 static char indicator[] = {'-', '\\', '|', '/', '-', '\\', '|', '/', '\0'};␊
-#define kNumIndicators (sizeof(indicator) - 1)␊
 ␊
 // To prevent a ridiculously fast-spinning indicator,␊
 // ensure a minimum of 1/9 sec between animation frames.␊
 void␊
 spinActivityIndicator(int sectors)␊
 {␊
-    static unsigned long lastTickTime = 0;␊
-    unsigned long        currentTickTime = time18();␊
-    static char          string[3] = {'\0', '\b', '\0'};␊
+    static unsigned long lastTickTime = 0, currentTickTime;␊
     ␊
 ␉if (previewTotalSectors && previewSaveunder)␊
 ␉{␊
 ␉␉return;␊
 ␉}␊
  ␊
-␉if (currentTickTime < lastTickTime + MIN_TICKS)␊
-        return;␊
-    else␊
-        lastTickTime = currentTickTime;␊
-␊
-    if ( getVideoMode() == VGA_TEXT_MODE )␊
-    {␊
-        if (currentIndicator >= kNumIndicators) currentIndicator = 0;␊
-        string[0] = indicator[currentIndicator++];␊
-        verbose(string);␊
-    }␊
+␉if (gVerboseMode) {␊
+            currentTickTime = time18(); // late binding␊
+            if (currentTickTime < lastTickTime + MIN_TICKS) {␊
+                return;␊
+            } else {␊
+                lastTickTime = currentTickTime;␊
+            }␊
+            ␊
+            if (getVideoMode() == VGA_TEXT_MODE) {␊
+                if (currentIndicator >= sizeof(indicator)) {␊
+                    currentIndicator = 0;␊
+                }␊
+                printf("%c\b", indicator[currentIndicator++]);␊
+            }␊
+        }␊
 }␊
 ␊
 void␊

-91
92 92
93 93
94
94 95
95 96
96 97
+extern int    strlen(const char * str);␊
extern char * strcat(char * s1, const char * s2);␊
extern char * strncat(char * s1, const char * s2, size_t n);␊
extern char * strdup(const char *s1);␊
␊
#if STRNCASECMP␊
extern int    strncasecmp(const char * s1, const char * s2, size_t n);␊
 extern int    strlen(const char * str);␊
 extern char * strcat(char * s1, const char * s2);␊
 extern char * strncat(char * s1, const char * s2, size_t n);␊
+extern char * strdup(const char *s1);␊
 ␊
 #if STRNCASECMP␊
 extern int    strncasecmp(const char * s1, const char * s2, size_t n);␊

-45
46 46
47 47
48
48 49
49 50
50 51
... ...
56 57
57 58
58 59
59 
60
60 61
61 62
62 63
+}␊
␊
/*VARARGS1*/␊
/* now slprintf() return the length of the string as in man sprintf()*/␊
int sprintf(char * str, const char * fmt, ...)␊
{␊
    va_list ap;␊

    prf(fmt, ap, sputc, &pi);␊
    *pi.str = '\0';␊
    va_end(ap);␊
    return 0;␊
    return (pi.str - str);␊
}␊
␊
/*VARARGS1*/␊
 ...
 }␊
 ␊
 /*VARARGS1*/␊
+/* now slprintf() return the length of the string as in man sprintf()*/␊
 int sprintf(char * str, const char * fmt, ...)␊
 {␊
     va_list ap;␊
     prf(fmt, ap, sputc, &pi);␊
     *pi.str = '\0';␊
     va_end(ap);␊
-    return 0;␊
+    return (pi.str - str);␊
 }␊
 ␊
 /*VARARGS1*/␊

-241
242 242
243 243
244
245
246
247
248
244 249
245 250
246 251
+␉return(strncat(s1, s2, strlen(s2)));␊
}␊
␊
char *strdup(const char *s1)␊
{␊
␉return strcpy(malloc(strlen(s1) + 1), s1);␊
}␊
␊
#if STRNCASECMP␊
int strncasecmp(const char *s1, const char *s2, size_t len)␊
{␊
 ␉return(strncat(s1, s2, strlen(s2)));␊
 }␊
 ␊
+char *strdup(const char *s1)␊
+{␊
+␉return strcpy(malloc(strlen(s1) + 1), s1);␊
+}␊
+␊
 #if STRNCASECMP␊
 int strncasecmp(const char *s1, const char *s2, size_t len)␊
 {␊

Download the corresponding diff file