Changeset 04803bf in mainline for uspace/srv/hid/fb/fb.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes (needs fixes).

File:

• uspace/srv/hid/fb/fb.c (moved) (moved from uspace/srv/fb/fb.c ) (27 diffs)

uspace/srv/hid/fb/fb.c

@@ -41 +41 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 #include <ddi.h>
 #include <sysinfo.h>
@@ -47 +47 @@
 #include <as.h>
 #include <ipc/fb.h>
-#include <ipc/ipc.h>
 #include <ipc/ns.h>
 #include <ipc/services.h>
@@ -59 +58 @@
 #include <stdio.h>
 #include <byteorder.h>
+#include <io/screenbuffer.h>
 
 #include "font-8x16.h"
 #include "fb.h"
 #include "main.h"
-#include "../console/screenbuffer.h"
 #include "ppm.h"
 
@@ -72 +71 @@
 #define DEFAULT_FGCOLOR  0x000000
 
-#define GLYPH_UNAVAIL    '?'
-
-#define MAX_ANIM_LEN     8
-#define MAX_ANIMATIONS   4
-#define MAX_PIXMAPS      256  /**< Maximum number of saved pixmaps */
-#define MAX_VIEWPORTS    128  /**< Viewport is a rectangular area on the screen */
+#define GLYPH_UNAVAIL  '?'
+
+#define MAX_ANIM_LEN    8
+#define MAX_ANIMATIONS  4
+#define MAX_PIXMAPS     256  /**< Maximum number of saved pixmaps */
+#define MAX_VIEWPORTS   128  /**< Viewport is a rectangular area on the screen */
 
 /** Function to render a pixel from a RGB value. */
@@ -199 +198 @@
 static int rgb_from_attr(attr_rgb_t *rgb, const attrs_t *a);
 static int rgb_from_style(attr_rgb_t *rgb, int style);
-static int rgb_from_idx(attr_rgb_t *rgb, ipcarg_t fg_color,
-    ipcarg_t bg_color, ipcarg_t flags);
-
-static int fb_set_color(viewport_t *vport, ipcarg_t fg_color,
-    ipcarg_t bg_color, ipcarg_t attr);
+static int rgb_from_idx(attr_rgb_t *rgb, sysarg_t fg_color,
+    sysarg_t bg_color, sysarg_t flags);
+
+static int fb_set_color(viewport_t *vport, sysarg_t fg_color,
+    sysarg_t bg_color, sysarg_t attr);
 
 static void draw_glyph_aligned(unsigned int x, unsigned int y, bool cursor,
@@ -956 +955 @@
         bb_cell_t *bbp;
         attrs_t *a;
-        attr_rgb_t rgb;
         
         for (j = 0; j < h; j++) {
@@ -966 +964 @@
                         
                         a = &data[j * w + i].attrs;
+                        
+                        attr_rgb_t rgb;
+                        rgb.fg_color = 0;
+                        rgb.bg_color = 0;
                         rgb_from_attr(&rgb, a);
                         
@@ -1069 +1071 @@
         
         static unsigned char *shm = NULL;
-        static ipcarg_t shm_id = 0;
+        static sysarg_t shm_id = 0;
         static size_t shm_size;
         
@@ -1080 +1082 @@
         unsigned int h;
         
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case IPC_M_SHARE_OUT:
                 /* We accept one area for data interchange */
@@ -1086 +1088 @@
                         void *dest = as_get_mappable_page(IPC_GET_ARG2(*call));
                         shm_size = IPC_GET_ARG2(*call);
-                        if (ipc_answer_1(callid, EOK, (sysarg_t) dest)) {
+                        if (async_answer_1(callid, EOK, (sysarg_t) dest)) {
                                 shm_id = 0;
                                 return false;
@@ -1163 +1165 @@
         
         if (handled)
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         return handled;
 }
@@ -1344 +1346 @@
 {
         mouse_hide();
-        pointer_x = x;
-        pointer_y = y;
+        pointer_x = x % screen.xres;
+        pointer_y = y % screen.yres;
         mouse_show();
 }
@@ -1357 +1359 @@
         int newval;
         
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case FB_ANIM_CREATE:
                 nvp = IPC_GET_ARG1(*call);
@@ -1432 +1434 @@
                         break;
                 }
-                newval = (IPC_GET_METHOD(*call) == FB_ANIM_START);
+                newval = (IPC_GET_IMETHOD(*call) == FB_ANIM_START);
                 if (newval ^ animations[i].enabled) {
                         animations[i].enabled = newval;
@@ -1442 +1444 @@
         }
         if (handled)
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         return handled;
 }
@@ -1456 +1458 @@
         int i, nvp;
         
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case FB_VP_DRAW_PIXMAP:
                 nvp = IPC_GET_ARG1(*call);
@@ -1495 +1497 @@
         
         if (handled)
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         return handled;
         
@@ -1511 +1513 @@
                 rgb->bg_color = color_table[COLOR_WHITE];
                 break;
+        case STYLE_INVERTED:
+                rgb->fg_color = color_table[COLOR_WHITE];
+                rgb->bg_color = color_table[COLOR_BLACK];
+                break;
+        case STYLE_SELECTED:
+                rgb->fg_color = color_table[COLOR_WHITE];
+                rgb->bg_color = color_table[COLOR_RED];
+                break;
         default:
                 return EINVAL;
         }
-
+        
         return EOK;
 }
 
-static int rgb_from_idx(attr_rgb_t *rgb, ipcarg_t fg_color,
-    ipcarg_t bg_color, ipcarg_t flags)
+static int rgb_from_idx(attr_rgb_t *rgb, sysarg_t fg_color,
+    sysarg_t bg_color, sysarg_t flags)
 {
         fg_color = (fg_color & 7) | ((flags & CATTR_BRIGHT) ? 8 : 0);
@@ -1551 +1561 @@
 }
 
-static int fb_set_style(viewport_t *vport, ipcarg_t style)
+static int fb_set_style(viewport_t *vport, sysarg_t style)
 {
         return rgb_from_style(&vport->attr, (int) style);
 }
 
-static int fb_set_color(viewport_t *vport, ipcarg_t fg_color,
-    ipcarg_t bg_color, ipcarg_t flags)
+static int fb_set_color(viewport_t *vport, sysarg_t fg_color,
+    sysarg_t bg_color, sysarg_t flags)
 {
         return rgb_from_idx(&vport->attr, fg_color, bg_color, flags);
@@ -1571 +1581 @@
         
         if (client_connected) {
-                ipc_answer_0(iid, ELIMIT);
+                async_answer_0(iid, ELIMIT);
                 return;
         }
@@ -1577 +1587 @@
         /* Accept connection */
         client_connected = true;
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         while (true) {
@@ -1610 +1620 @@
                         continue;
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         client_connected = false;
@@ -1630 +1640 @@
                                 break;
                         }
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         
                         draw_char(vport, ch, col, row);
@@ -1663 +1673 @@
                         break;
                 case FB_GET_CSIZE:
-                        ipc_answer_2(callid, EOK, vport->cols, vport->rows);
+                        async_answer_2(callid, EOK, vport->cols, vport->rows);
                         continue;
                 case FB_GET_COLOR_CAP:
-                        ipc_answer_1(callid, EOK, FB_CCAP_RGB);
+                        async_answer_1(callid, EOK, FB_CCAP_RGB);
                         continue;
                 case FB_SCROLL:
@@ -1731 +1741 @@
                         break;
                 case FB_GET_RESOLUTION:
-                        ipc_answer_2(callid, EOK, screen.xres, screen.yres);
+                        async_answer_2(callid, EOK, screen.xres, screen.yres);
                         continue;
                 case FB_POINTER_MOVE:
@@ -1745 +1755 @@
                         retval = ENOENT;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }
@@ -1756 +1766 @@
         async_set_client_connection(fb_client_connection);
         
-        void *fb_ph_addr = (void *) sysinfo_value("fb.address.physical");
-        unsigned int fb_offset = sysinfo_value("fb.offset");
-        unsigned int fb_width = sysinfo_value("fb.width");
-        unsigned int fb_height = sysinfo_value("fb.height");
-        unsigned int fb_scanline = sysinfo_value("fb.scanline");
-        unsigned int fb_visual = sysinfo_value("fb.visual");
-
-        unsigned int fbsize = fb_scanline * fb_height;
+        sysarg_t fb_ph_addr;
+        if (sysinfo_get_value("fb.address.physical", &fb_ph_addr) != EOK)
+                return -1;
+        
+        sysarg_t fb_offset;
+        if (sysinfo_get_value("fb.offset", &fb_offset) != EOK)
+                fb_offset = 0;
+        
+        sysarg_t fb_width;
+        if (sysinfo_get_value("fb.width", &fb_width) != EOK)
+                return -1;
+        
+        sysarg_t fb_height;
+        if (sysinfo_get_value("fb.height", &fb_height) != EOK)
+                return -1;
+        
+        sysarg_t fb_scanline;
+        if (sysinfo_get_value("fb.scanline", &fb_scanline) != EOK)
+                return -1;
+        
+        sysarg_t fb_visual;
+        if (sysinfo_get_value("fb.visual", &fb_visual) != EOK)
+                return -1;
+        
+        sysarg_t fbsize = fb_scanline * fb_height;
         void *fb_addr = as_get_mappable_page(fbsize);
-
-        if (physmem_map(fb_ph_addr + fb_offset, fb_addr,
+        
+        if (physmem_map((void *) fb_ph_addr + fb_offset, fb_addr,
             ALIGN_UP(fbsize, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE) != 0)
                 return -1;
-
+        
         if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual))
                 return 0;
-
+        
         return -1;
 }