Changeset 50cfa6c in mainline for uspace/srv

Timestamp:

2009-07-14T21:25:13Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bf5443d

Parents:

7d88587

Message:

Method for getting console color capabilities. Use to fix invisible tetris pieces.

Location:

uspace/srv

Files:

• console/console.c (modified) (6 diffs)
• fb/ega.c (modified) (1 diff)
• fb/fb.c (modified) (1 diff)
• fb/serial_console.c (modified) (1 diff)

uspace/srv/console/console.c

@@ -70 +70 @@
         ipcarg_t cols;  /**< Framebuffer columns */
         ipcarg_t rows;  /**< Framebuffer rows */
+        int color_cap;  /**< Color capabilities (FB_CCAP_xxx) */
 } fb_info;
 
@@ -171 +172 @@
                 break;
         }
+}
+
+int ccap_fb_to_con(int ccap_fb, int *ccap_con)
+{
+        switch (ccap_fb) {
+        case FB_CCAP_NONE: *ccap_con = CONSOLE_CCAP_NONE; break;
+        case FB_CCAP_STYLE: *ccap_con = CONSOLE_CCAP_STYLE; break;
+        case FB_CCAP_INDEXED: *ccap_con = CONSOLE_CCAP_INDEXED; break;
+        case FB_CCAP_RGB: *ccap_con = CONSOLE_CCAP_RGB; break;
+        default: return EINVAL;
+        }
+
+        return EOK;
 }
 
@@ -527 +541 @@
         ipcarg_t arg2;
         ipcarg_t arg3;
+
+        int cons_ccap;
+        int rc;
         
         async_serialize_start();
@@ -589 +606 @@
                         arg2 = fb_info.rows;
                         break;
+                case CONSOLE_GET_COLOR_CAP:
+                        rc = ccap_fb_to_con(fb_info.color_cap, &cons_ccap);
+                        if (rc != EOK) {
+                                ipc_answer_0(callid, rc);
+                                continue;
+                        }
+                        arg1 = cons_ccap;
+                        break;
                 case CONSOLE_SET_STYLE:
                         fb_pending_flush();
@@ -640 +665 @@
 static bool console_init(void)
 {
+        ipcarg_t color_cap;
+
         /* Connect to keyboard driver */
         kbd_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
@@ -675 +702 @@
         async_req_0_0(fb_info.phone, FB_FLUSH);
         async_req_0_2(fb_info.phone, FB_GET_CSIZE, &fb_info.cols, &fb_info.rows);
+        async_req_0_1(fb_info.phone, FB_GET_COLOR_CAP, &color_cap);
+        fb_info.color_cap = color_cap;
         
         /* Set up shared memory buffer. */

uspace/srv/fb/ega.c

@@ -320 +320 @@
                         ipc_answer_2(callid, EOK, scr_width, scr_height);
                         continue;
+                case FB_GET_COLOR_CAP:
+                        ipc_answer_1(callid, EOK, FB_CCAP_INDEXED);
+                        continue;
                 case FB_CLEAR:
                         clrscr();

uspace/srv/fb/fb.c

@@ -1648 +1648 @@
                         ipc_answer_2(callid, EOK, vport->cols, vport->rows);
                         continue;
+                case FB_GET_COLOR_CAP:
+                        ipc_answer_1(callid, EOK, FB_CCAP_RGB);
+                        continue;
                 case FB_SCROLL:
                         scroll = IPC_GET_ARG1(call);

uspace/srv/fb/serial_console.c

@@ -389 +389 @@
                         ipc_answer_2(callid, EOK, scr_width, scr_height);
                         continue;
+                case FB_GET_COLOR_CAP:
+                        ipc_answer_1(callid, EOK, color ? FB_CCAP_INDEXED :
+                            FB_CCAP_STYLE);
+                        continue;
                 case FB_CLEAR:
                         serial_clrscr();