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

Date:

2011-08-16 07:13:14 (11 years 7 months ago)

Author:

Evan Lojewski

Commit:

1402

Parents:

1401

Message:

Cause Wait=y to use the showTextBuf function. Allow space for next page when in gui mode. Resolves issue #141

Changes:

File differences

-86
87 87
88 88
89
90
91
89 92
93
90 94
91 95
92 96
... ...
174 178
175 179
176 180
177 
178 
181
179 182
180 183
181 184
+static unsigned long␉Adler32(unsigned char *buffer, long length);␊
//static void␉␉␉selectBiosDevice(void);␊
␊
/** options.c **/␊
extern char* msgbuf;␊
void showTextBuffer(char *buf, int size);␊
␊
␊
//==========================================================================␊
// Zero the BSS.␊
␊

␉␊
␉bool dummyVal;␊
␉if (getBoolForKey(kWaitForKeypressKey, &dummyVal, &bootInfo->chameleonConfig) && dummyVal) {␊
␉␉printf("(Wait) ");␊
␉␉pause();␊
␉␉showTextBuffer(msgbuf, strlen(msgbuf));␊
␉}␊
␉␊
␉usb_loop();␊
 ...
 static unsigned long␉Adler32(unsigned char *buffer, long length);␊
 //static void␉␉␉selectBiosDevice(void);␊
 ␊
+/** options.c **/␊
+extern char* msgbuf;␊
+void showTextBuffer(char *buf, int size);␊
 ␊
+␊
 //==========================================================================␊
 // Zero the BSS.␊
 ␊
 ␉␊
 ␉bool dummyVal;␊
 ␉if (getBoolForKey(kWaitForKeypressKey, &dummyVal, &bootInfo->chameleonConfig) && dummyVal) {␊
-␉␉printf("(Wait) ");␊
-␉␉pause();␊
+␉␉showTextBuffer(msgbuf, strlen(msgbuf));␊
 ␉}␊
 ␉␊
 ␉usb_loop();␊

-1583
1584 1584
1585 1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1586 1595
1587 1596
1588 1597
+␉␉␉updateVRAM();␊
␉␉␉break;␊
␉␉}␊
␉␉␊
␉␉if(key == ' ') // spacebar = next page␊
␉␉{␊
␉␉␉if( lines > ( currentline + visiblelines ) ) ␊
␉␉␉␉currentline += visiblelines;␊
␉␉␉␊
␉␉␉if(lines < (currentline + visiblelines))␊
␉␉␉␉currentline = lines - visiblelines;␊
␉␉}␊
␉}␊
}␊
␊
 ␉␉␉updateVRAM();␊
 ␉␉␉break;␊
 ␉␉}␊
+␉␉␊
+␉␉if(key == ' ') // spacebar = next page␊
+␉␉{␊
+␉␉␉if( lines > ( currentline + visiblelines ) ) ␊
+␉␉␉␉currentline += visiblelines;␊
+␉␉␉␊
+␉␉␉if(lines < (currentline + visiblelines))␊
+␉␉␉␉currentline = lines - visiblelines;␊
+␉␉}␊
 ␉}␊
 }␊
 ␊

-1337
1338 1338
1339 1339
1340 
1340
1341 1341
1342 1342
1343 1343
... ...
1345 1345
1346 1346
1347 1347
1348 
1348
1349 1349
1350 1350
1351 1351
+//==========================================================================␊
// Load the help file and display the file contents on the screen.␊
␊
static void showTextBuffer(char *buf, int size)␊
void showTextBuffer(char *buf, int size)␊
{␊
␉char␉*bp;␊
␉int␉line;␊

␉int␉c;␊
␊
␉if (bootArgs->Video.v_display != VGA_TEXT_MODE) {␊
␉␉showInfoBox( "Press q to quit\n",buf );␊
␉␉showInfoBox( "Press q to continue, space for next page.\n",buf );␊
␉␉return;␊
␉}␊
␊
 ...
 //==========================================================================␊
 // Load the help file and display the file contents on the screen.␊
 ␊
-static void showTextBuffer(char *buf, int size)␊
+void showTextBuffer(char *buf, int size)␊
 {␊
 ␉char␉*bp;␊
 ␉int␉line;␊
 ␉int␉c;␊
 ␊
 ␉if (bootArgs->Video.v_display != VGA_TEXT_MODE) {␊
-␉␉showInfoBox( "Press q to quit\n",buf );␊
+␉␉showInfoBox( "Press q to continue, space for next page.\n",buf );␊
 ␉␉return;␊
 ␉}␊
 ␊