Changeset 3604

Timestamp:

09/26/08 20:36:26 (3 months ago)

Author:

stepan

Message:

* factor out serial hardware init
* add reverse color support for serial
* add cursor enable/disable support for serial
* fix tinycurses compilation if serial is disabled
* add functions to query whether serial or vga console is enabled in tinycurses
* initialize uninitialized COLOR_PAIRS variable
* implement has_colors(), wredrawln() functions in curses

Signed-off-by: Stefan Reinauer <stepan@…>
Acked-by: Jordan Crouse <jordan.crouse@…>

Location:

trunk/payloads/libpayload

Files:

• curses/keyboard.c (modified) (4 diffs)
• curses/tinycurses.c (modified) (16 diffs)
• drivers/serial.c (modified) (4 diffs)
• include/curses.h (modified) (1 diff)
• include/libpayload.h (modified) (2 diffs)

trunk/payloads/libpayload/curses/keyboard.c

@@ -45 +45 @@
 /* ============== Serial ==================== */
 
+#ifdef CONFIG_SERIAL_CONSOLE
 /* We treat serial like a vt100 terminal.  For now we
    do the cooking in here, but we should probably eventually
@@ -136 +137 @@
         }
 }
+#endif
 
 /* ================ Keyboard ================ */
@@ -216 +218 @@
                 curses_flags &= ~F_ENABLE_CONSOLE;
 }
+
+int curses_vga_enabled(void)
+{
+        return (curses_flags & F_ENABLE_CONSOLE) != 0;
+}
 #else
 void curses_enable_vga(int state) { }
+int curses_vga_enabled(void) { return 0; }
 #endif
 
@@ -228 +236 @@
                 curses_flags &= ~F_ENABLE_SERIAL;
 }
+
+int curses_serial_enabled(void)
+{
+        return (curses_flags & F_ENABLE_SERIAL) != 0;
+}
+
 #else
 void curses_enable_serial(int state) { }
-#endif
-
+int curses_serial_enabled(void) { return 0; }
+#endif
+

trunk/payloads/libpayload/curses/tinycurses.c

@@ -78 +78 @@
 /* Globals */
 int COLORS;             /* Currently unused? */
-int COLOR_PAIRS;
+int COLOR_PAIRS = 255;
 WINDOW *stdscr;
 WINDOW *curscr;
@@ -112 +112 @@
         };
 
+#ifdef CONFIG_SERIAL_CONSOLE
 #ifdef CONFIG_SERIAL_ACS_FALLBACK
 chtype serial_acs_map[128];
@@ -136 +137 @@
         };
 #endif
-
+#endif
+
+#ifdef CONFIG_VIDEO_CONSOLE
 /* See acsc of linux. */
 chtype console_acs_map[128] =
@@ -157 +160 @@
         '\263', '\363', '\362', '\343', '\330', '\234', '\376', 0,
         };
+#endif
 
 // FIXME: Ugly (and insecure!) hack!
@@ -197 +201 @@
 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;
@@ -285 +292 @@
 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) {}
@@ -301 +308 @@
         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 */
@@ -312 +320 @@
                 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);
         // TODO: curscr, newscr?
 
@@ -694 +703 @@
 int wnoutrefresh(WINDOW *win)
 {
+#ifdef CONFIG_SERIAL_CONSOLE
         // FIXME.
         int serial_is_bold = 0;
+        int serial_is_reverse = 0;
         int serial_is_altcharset = 0;
         int serial_cur_pair = 0;
 
+        int need_altcharset;
+        short fg, bg;
+#endif
         int x, y;
         chtype ch;
-        int need_altcharset;
-        short fg, bg;
-
+
+#ifdef CONFIG_SERIAL_CONSOLE
         serial_end_bold();
         serial_end_altcharset();
+#endif
 
         for (y = 0; y <= win->_maxy; y++) {
@@ -714 +728 @@
                 /* Position the serial cursor */
 
+#ifdef CONFIG_SERIAL_CONSOLE
                 if (curses_flags & F_ENABLE_SERIAL)
                         serial_set_cursor(win->_begy + y, win->_begx +
                                         win->_line[y].firstchar);
+#endif
 
                 for (x = win->_line[y].firstchar; x <= win->_line[y].lastchar; x++) {
@@ -724 +740 @@
                                 ((int)color_pairs[PAIR_NUMBER(attr)]) << 8;
 
+#ifdef CONFIG_SERIAL_CONSOLE
                         if (curses_flags & F_ENABLE_SERIAL) {
                                 ch = win->_line[y].text[x].chars[0];
@@ -732 +749 @@
                                                 serial_is_bold = 1;
                                         }
-                                }
-                                else {
+                                } else {
                                         if (serial_is_bold) {
                                                 serial_end_bold();
+                                                serial_is_bold = 0;
+                                                /* work around serial.c
+                                                 * shortcoming:
+                                                 */
+                                                serial_is_reverse = 0;
+                                                serial_cur_pair = 0;
+                                        }
+                                }
+
+                                if (attr & A_REVERSE) {
+                                        if (!serial_is_reverse) {
+                                                serial_start_reverse();
+                                                serial_is_reverse = 1;
+                                        }
+                                } else {
+                                        if (serial_is_reverse) {
+                                                serial_end_reverse();
+                                                serial_is_reverse = 0;
+                                                /* work around serial.c
+                                                 * shortcoming:
+                                                 */
                                                 serial_is_bold = 0;
                                                 serial_cur_pair = 0;
@@ -768 +805 @@
 
                         }
-
+#endif
+#ifdef CONFIG_VIDEO_CONSOLE
                         c = SWAP_RED_BLUE(c);
 
@@ -800 +838 @@
                                 video_console_putc(win->_begy + y, win->_begx + x, c);
                         }
+#endif
                 }
                 win->_line[y].firstchar = _NOCHANGE;
@@ -805 +844 @@
         }
 
+#ifdef CONFIG_SERIAL_CONSOLE
         if (curses_flags & F_ENABLE_SERIAL)
                 serial_set_cursor(win->_begy + win->_cury, win->_begx + win->_curx);
-
+#endif
+
+#ifdef CONFIG_VIDEO_CONSOLE
         if (curses_flags & F_ENABLE_CONSOLE)
                 video_console_set_cursor(win->_begx + win->_curx, win->_begy + win->_cury);
+#endif
 
         return OK;
@@ -824 +867 @@
         return code;
 }
-// int wredrawln (WINDOW *,int,int) {}
+
+int wredrawln (WINDOW *win, int beg_line, int num_lines)
+{
+        int i;
+
+        for (i = beg_line; i < beg_line + num_lines; i++) {
+                win->_line[i].firstchar = 0;
+                win->_line[i].lastchar = win->_maxx;
+        }
+
+        return OK;
+}
+
 int wrefresh(WINDOW *win)
 {

trunk/payloads/libpayload/drivers/serial.c

@@ -33 +33 @@
 
 #define IOBASE lib_sysinfo.ser_ioport
+#define DIVISOR(x) (115200 / x)
 
-#ifdef CONFIG_SERIAL_SET_SPEED
-#define DIVISOR (115200 / CONFIG_SERIAL_BAUD_RATE)
-#endif
+void serial_hardware_init(int port, int speed, int word_bits, int parity, int stop_bits)
+{
+        unsigned char reg;
+
+        /* We will assume 8n1 for now. Does anyone use anything else these days? */
+
+        /* Disable interrupts. */
+        outb(0, port + 0x01);
+
+        /* Assert RTS and DTR. */
+        outb(3, port + 0x04);
+
+        /* Set the divisor latch. */
+        reg = inb(port + 0x03);
+        outb(reg | 0x80, port + 0x03);
+
+        /* Write the divisor. */
+        outb(DIVISOR(speed) & 0xFF, port);
+        outb(DIVISOR(speed) >> 8 & 0xFF, port + 1);
+
+        /* Restore the previous value of the divisor. */
+        outb(reg &= ~0x80, port + 0x03);
+}
 
 void serial_init(void)
 {
 #ifdef CONFIG_SERIAL_SET_SPEED
-        unsigned char reg;
-
-        /* Disable interrupts. */
-        outb(0, IOBASE + 0x01);
-
-        /* Assert RTS and DTR. */
-        outb(3, IOBASE + 0x04);
-
-        /* Set the divisor latch. */
-        reg = inb(IOBASE + 0x03);
-        outb(reg | 0x80, IOBASE + 0x03);
-
-        /* Write the divisor. */
-        outb(DIVISOR & 0xFF, IOBASE);
-        outb(DIVISOR >> 8 & 0xFF, IOBASE + 1);
-
-        /* Restore the previous value of the divisor. */
-        outb(reg &= ~0x80, IOBASE + 0x03);
+        serial_hardware_init(IOBASE, CONFIG_SERIAL_BAUD_RATE, 8, 0, 1);
 #endif
 }
@@ -82 +86 @@
 
 #define VT100_CLEAR       "\e[H\e[J"
+/* These defines will fail if you use bold and reverse at the same time.
+ * Switching off one of them will switch off both. tinycurses knows about
+ * this and does the right thing.
+ */
 #define VT100_SBOLD       "\e[1m"
 #define VT100_EBOLD       "\e[m"
+#define VT100_SREVERSE    "\e[7m"
+#define VT100_EREVERSE    "\e[m"
 #define VT100_CURSOR_ADDR "\e[%d;%dH"
+#define VT100_CURSOR_ON   "\e[?25l"
+#define VT100_CURSOR_OFF  "\e[?25h"
 /* The following smacs/rmacs are actually for xterm; a real vt100 has
    enacs=\E(B\E)0, smacs=^N, rmacs=^O.  */
@@ -111 +123 @@
 {
         serial_putcmd(VT100_EBOLD);
+}
+
+void serial_start_reverse(void)
+{
+        serial_putcmd(VT100_SREVERSE);
+}
+
+void serial_end_reverse(void)
+{
+        serial_putcmd(VT100_EREVERSE);
 }
 
@@ -142 +164 @@
         serial_putcmd(buffer);
 }
+
+void serial_cursor_enable(int state)
+{
+        if (state)
+                serial_putcmd(VT100_CURSOR_ON);
+        else
+                serial_putcmd(VT100_CURSOR_OFF);
+}

trunk/payloads/libpayload/include/curses.h

@@ -1674 +1674 @@
 void curses_enable_serial(int);
 
+int curses_vga_enabled(void);
+int curses_serial_enabled(void);
+
 #endif /* _CURSES_H */

trunk/payloads/libpayload/include/libpayload.h

@@ -132 +132 @@
  */
 void serial_init(void);
+void serial_hardware_init(int port, int speed, int word_bits, int parity, int stop_bits);
 void serial_putchar(unsigned char c);
 int serial_havechar(void);
@@ -138 +139 @@
 void serial_start_bold(void);
 void serial_end_bold(void);
+void serial_start_reverse(void);
+void serial_end_reverse(void);
 void serial_start_altcharset(void);
 void serial_end_altcharset(void);
 void serial_set_color(short fg, short bg);
+void serial_cursor_enable(int state);
 void serial_set_cursor(int y, int x);
 /** @} */