[coreboot] r3604 - in trunk/payloads/libpayload: curses drivers include

[Stefan Reinauer]

Ulf Jordan wrote:
> Hello!
>
> This revision introduced a regression, see below.
>
> On Fri, 26 Sep 2008, svn at coreboot.org wrote:
>
>> Modified: trunk/payloads/libpayload/curses/tinycurses.c
>> ===================================================================
>> --- trunk/payloads/libpayload/curses/tinycurses.c    2008-09-26
>> 17:41:34 UTC (rev 3603)
>> +++ trunk/payloads/libpayload/curses/tinycurses.c    2008-09-26
>> 18:36:26 UTC (rev 3604)
>> @@ -77,7 +77,7 @@
>>
>> /* Globals */
>> int COLORS;        /* Currently unused? */
>> -int COLOR_PAIRS;
>> +int COLOR_PAIRS = 255;
>> WINDOW *stdscr;
>> WINDOW *curscr;
>> WINDOW *newscr;
>> @@ -111,6 +111,7 @@
>>     '|',    '<',    '>',    '*',    '!',    'f',    'o',    ' ',
>>     };
>>
>> +#ifdef CONFIG_SERIAL_CONSOLE
>> #ifdef CONFIG_SERIAL_ACS_FALLBACK
>> chtype serial_acs_map[128];
>> #else
>> @@ -135,7 +136,9 @@
>>     'x',    'y',    'z',    '{',    '|',    '}',    '~',    0,
>>     };
>> #endif
>> +#endif
>>
>> +#ifdef CONFIG_VIDEO_CONSOLE
>> /* See acsc of linux. */
>> chtype console_acs_map[128] =
>>     {
>> @@ -156,6 +159,7 @@
>>     '\304',    '\304',    '\304',    '_',    '\303', '\264',
>> '\301',    '\302',
>>     '\263',    '\363',    '\362',    '\343',    '\330',    '\234',   
>> '\376',    0,
>>     };
>> +#endif
>>
>> // FIXME: Ugly (and insecure!) hack!
>> char sprintf_tmp[1024];
>> @@ -196,13 +200,16 @@
>> // int color_content(short color, short *r, short *g, short *b) {}
>> int curs_set(int on)
>> {
>> +#ifdef CONFIG_SERIAL_CONSOLE
>>     if (curses_flags & F_ENABLE_SERIAL) {
>> -        // TODO
>> +        serial_cursor_enable(on);
>>     }
>> -
>> +#endif
>> +#ifdef CONFIG_VIDEO_CONSOLE
>>     if (curses_flags & F_ENABLE_CONSOLE) {
>>         video_console_cursor_enable(on);
>>     }
>> +#endif
>>
>>     return OK;
>> }
>> @@ -284,7 +291,7 @@
>> // int flash(void) {}
>> int flushinp(void) { /* TODO */ return 0; }
>> // WINDOW *getwin (FILE *) {}
>> -bool has_colors (void) { /* TODO */ return(*(bool *)0); }
>> +bool has_colors (void) { return(TRUE); }
>> // bool has_ic (void) {}
>> // bool has_il (void) {}
>> // void idcok (WINDOW *, bool) {}
>> @@ -300,21 +307,23 @@
>>
>>     for (i = 0; i < 128; i++)
>>       acs_map[i] = (chtype) i | A_ALTCHARSET;
>> -
>> +#ifdef CONFIG_SERIAL_CONSOLE
>>     if (curses_flags & F_ENABLE_SERIAL) {
>>         serial_clear();
>>     }
>> -
>> +#endif
>> +#ifdef CONFIG_VIDEO_CONSOLE
>>     if (curses_flags & F_ENABLE_CONSOLE) {
>>         /* Clear the screen and kill the cursor */
>>
>>         video_console_clear();
>>         video_console_cursor_enable(0);
>>     }
>> +#endif
>>
>>     // Speaker init?
>>
>> -    stdscr = newwin(SCREEN_Y, SCREEN_X, 0, 0);
>> +    stdscr = newwin(SCREEN_Y, SCREEN_X + 1, 0, 0);
>
> This last line accidentally reverts r3598, please change it back.
>
Thanks, fixed.


-- 
coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br.
      Tel.: +49 761 7668825 • Fax: +49 761 7664613
Email: info at coresystems.de  • http://www.coresystems.de/
Registergericht: Amtsgericht Freiburg • HRB 7656
Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866