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

Date:

2015-01-24 16:36:39 (9 years 3 months ago)

Author:

ErmaC

Commit:

2543

Parents:

2542

Message:

Improve detection for HD4200, HD4400 and HD4600 (gma.c)

Changes:

M	/trunk/i386/libsaio/acpi_patcher.c
M	/trunk/i386/libsaio/console.c
M	/trunk/i386/libsaio/gma.c
M	/trunk/i386/libsaio/saio_internal.h

File differences

-129
130 130
131 131
132
133
132 134
133 135
134 
136
135 137
136 138
137 139
138 140
139 141
140 142
141 
143
142 144
143 145
144 146
145 147
146 
148
147 149
148 150
149 151
... ...
152 154
153 155
154 156
157
158
155 159
156 160
157 161
... ...
224 228
225 229
226 230
227 
231
228 232
229 233
230 234
... ...
241 245
242 246
243 247
244 
248
245 249
246 250
247 251
+␉bzero(msgbuf, BOOTER_LOG_SIZE);␊
␉cursor = msgbuf;␊
␉msglog("%s\n", "Chameleon " I386BOOT_CHAMELEONVERSION " (svn-r" I386BOOT_CHAMELEONREVISION ")" " [" I386BOOT_BUILDDATE "]");␊
␉getRTCdatetime();␊
␉verbose("Logging started: %04d/%02d/%02d, %02d:%02d:%02d\n", datetime.year, datetime.mon, datetime.day, datetime.hour, datetime.mins, datetime.secs);␊
}␊
␊
void msglog(const char * fmt, ...)␊
int msglog(const char * fmt, ...)␊
{␊
␉va_list ap;␊
␉struct putc_info pi;␊
␊
␉if (!msgbuf)␊
␉{␊
␉␉return;␊
␉␉return 0;␊
␉}␊
␊
␉if (((cursor - msgbuf) > (BOOTER_LOG_SIZE - SAFE_LOG_SIZE)))␊
␉{␊
␉␉return;␊
␉␉return 0;␊
␉}␊
␊
␉va_start(ap, fmt);␊

␉prf(fmt, ap, sputc, &pi);␊
␉va_end(ap);␊
␉cursor += strlen((char *)cursor);␊
␊
␉return 0;␊
}␊
␊
void setupBooterLog(void)␊

␉{␊
␉␉vprf(fmt, ap);␊
␉}␊
␊
/*␊
␉{␊
␉␉// Kabyl: BooterLog␊
␉␉struct putc_info pi;␊

␉␉prf(fmt, ap, sputc, &pi);␊
␉␉cursor +=  strlen((char *)cursor);␊
␉}␊
␊
*/␊
␉va_end(ap);␊
␉return 0;␊
}␊
 ...
 ...
 ...
 ␉bzero(msgbuf, BOOTER_LOG_SIZE);␊
 ␉cursor = msgbuf;␊
 ␉msglog("%s\n", "Chameleon " I386BOOT_CHAMELEONVERSION " (svn-r" I386BOOT_CHAMELEONREVISION ")" " [" I386BOOT_BUILDDATE "]");␊
+␉getRTCdatetime();␊
+␉verbose("Logging started: %04d/%02d/%02d, %02d:%02d:%02d\n", datetime.year, datetime.mon, datetime.day, datetime.hour, datetime.mins, datetime.secs);␊
 }␊
 ␊
-void msglog(const char * fmt, ...)␊
+int msglog(const char * fmt, ...)␊
 {␊
 ␉va_list ap;␊
 ␉struct putc_info pi;␊
 ␊
 ␉if (!msgbuf)␊
 ␉{␊
-␉␉return;␊
+␉␉return 0;␊
 ␉}␊
 ␊
 ␉if (((cursor - msgbuf) > (BOOTER_LOG_SIZE - SAFE_LOG_SIZE)))␊
 ␉{␊
-␉␉return;␊
+␉␉return 0;␊
 ␉}␊
 ␊
 ␉va_start(ap, fmt);␊
 ␉prf(fmt, ap, sputc, &pi);␊
 ␉va_end(ap);␊
 ␉cursor += strlen((char *)cursor);␊
+␊
+␉return 0;␊
 }␊
 ␊
 void setupBooterLog(void)␊
 ␉{␊
 ␉␉vprf(fmt, ap);␊
 ␉}␊
-␊
+/*␊
 ␉{␊
 ␉␉// Kabyl: BooterLog␊
 ␉␉struct putc_info pi;␊
 ␉␉prf(fmt, ap, sputc, &pi);␊
 ␉␉cursor +=  strlen((char *)cursor);␊
 ␉}␊
-␊
+*/␊
 ␉va_end(ap);␊
 ␉return 0;␊
 }␊

-104
105 105
106 106
107 
107
108 108
109 109
110 110
+␊
␉// Try finding 'filename' in the usual places␊
␉// Start searching any potential location for ACPI Table␊
␉snprintf(dirSpec, sizeof(dirSpec), "%s", filename); ␊
␉snprintf(dirSpec, sizeof(dirSpec), "%s", filename);␊
␉fd = open(dirSpec, 0);␊
␉if (fd < 0)␊
␉{␊
 ␊
 ␉// Try finding 'filename' in the usual places␊
 ␉// Start searching any potential location for ACPI Table␊
-␉snprintf(dirSpec, sizeof(dirSpec), "%s", filename); ␊
+␉snprintf(dirSpec, sizeof(dirSpec), "%s", filename);␊
 ␉fd = open(dirSpec, 0);␊
 ␉if (fd < 0)␊
 ␉{␊

-88
89 89
90 90
91 
91
92 92
93 93
94 94
+extern bool   gVerboseMode;␊
extern bool   gErrors;␊
extern void   initBooterLog(void);␊
extern void   msglog(const char * format, ...);␊
extern int    msglog(const char * format, ...);␊
extern void   setupBooterLog(void);␊
extern int    putchar(int ch);␊
extern int    getchar(void);␊
 extern bool   gVerboseMode;␊
 extern bool   gErrors;␊
 extern void   initBooterLog(void);␊
-extern void   msglog(const char * format, ...);␊
+extern int    msglog(const char * format, ...);␊
 extern void   setupBooterLog(void);␊
 extern int    putchar(int ch);␊
 extern int    getchar(void);␊

Download the corresponding diff file