Changeset 7bdcc45 in mainline for uspace/srv/hid/fb

Timestamp:

2010-12-16T16:38:49Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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.

Location:

uspace/srv/hid/fb

Files:

• ega.c (modified) (5 diffs)
• fb.c (modified) (9 diffs)
• main.c (modified) (1 diff)
• serial_console.c (modified) (9 diffs)
• serial_console.h (modified) (1 diff)

uspace/srv/hid/fb/ega.c

@@ -230 +230 @@
 static int save_screen(void)
 {
-        ipcarg_t i;
+        sysarg_t i;
         
         /* Find empty screen */
@@ -245 +245 @@
 }
 
-static int print_screen(ipcarg_t i)
+static int print_screen(sysarg_t i)
 {
         if ((i >= MAX_SAVED_SCREENS) || (saved_screens[i].data))
@@ -276 +276 @@
                 wchar_t c;
                 
-                ipcarg_t col;
-                ipcarg_t row;
-                ipcarg_t w;
-                ipcarg_t h;
+                sysarg_t col;
+                sysarg_t row;
+                sysarg_t w;
+                sysarg_t h;
                 
                 ssize_t rows;
@@ -290 +290 @@
                 uint32_t bg_rgb;
                 
-                ipcarg_t scr;
+                sysarg_t scr;
                 int retval;
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         client_connected = 0;
@@ -370 +370 @@
                         
                         if (rows >= 0) {
-                                if ((ipcarg_t) rows > scr_height) {
+                                if ((sysarg_t) rows > scr_height) {
                                         retval = EINVAL;
                                         break;
                                 }
                         } else {
-                                if ((ipcarg_t) (-rows) > scr_height) {
+                                if ((sysarg_t) (-rows) > scr_height) {
                                         retval = EINVAL;
                                         break;

uspace/srv/hid/fb/fb.c

@@ -199 +199 @@
 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,
@@ -1072 +1072 @@
         
         static unsigned char *shm = NULL;
-        static ipcarg_t shm_id = 0;
+        static sysarg_t shm_id = 0;
         static size_t shm_size;
         
@@ -1083 +1083 @@
         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 */
@@ -1360 +1360 @@
         int newval;
         
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case FB_ANIM_CREATE:
                 nvp = IPC_GET_ARG1(*call);
@@ -1435 +1435 @@
                         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;
@@ -1459 +1459 @@
         int i, nvp;
         
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case FB_VP_DRAW_PIXMAP:
                 nvp = IPC_GET_ARG1(*call);
@@ -1529 +1529 @@
 }
 
-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);
@@ -1562 +1562 @@
 }
 
-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);
@@ -1621 +1621 @@
                         continue;
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         client_connected = false;

uspace/srv/hid/fb/main.c

@@ -114 +114 @@
                 return -1;
         
-        ipcarg_t phonead;
+        sysarg_t phonead;
         if (ipc_connect_to_me(PHONE_NS, SERVICE_VIDEO, 0, 0, &phonead) != 0) 
                 return -1;

uspace/srv/hid/fb/serial_console.c

@@ -47 +47 @@
 #include <io/style.h>
 #include <str.h>
+#include <inttypes.h>
 #include <io/screenbuffer.h>
 
@@ -54 +55 @@
 #define MAX_CONTROL 20
 
-static ipcarg_t scr_width;
-static ipcarg_t scr_height;
+static sysarg_t scr_width;
+static sysarg_t scr_height;
 static bool color = true;    /**< True if producing color output. */
 static bool utf8 = false;    /**< True if producing UTF8 output. */
 static putc_function_t putc_function;
 
-static ipcarg_t lastcol = 0;
-static ipcarg_t lastrow = 0;
+static sysarg_t lastcol = 0;
+static sysarg_t lastrow = 0;
 static attrs_t cur_attr = {
         .t = at_style,
@@ -129 +130 @@
 }
 
-void serial_goto(const ipcarg_t col, const ipcarg_t row)
+void serial_goto(const sysarg_t col, const sysarg_t row)
 {
         if ((col > scr_width) || (row > scr_height))
@@ -135 +136 @@
         
         char control[MAX_CONTROL];
-        snprintf(control, MAX_CONTROL, "\033[%u;%uf", row + 1, col + 1);
+        snprintf(control, MAX_CONTROL, "\033[%" PRIun ";%" PRIun "f",
+            row + 1, col + 1);
         serial_puts(control);
 }
@@ -250 +252 @@
 
 /** Set scrolling region. */
-void serial_set_scroll_region(ipcarg_t last_row)
+void serial_set_scroll_region(sysarg_t last_row)
 {
         char control[MAX_CONTROL];
-        snprintf(control, MAX_CONTROL, "\033[0;%ur", last_row);
+        snprintf(control, MAX_CONTROL, "\033[0;%" PRIun "r", last_row);
         serial_puts(control);
 }
@@ -267 +269 @@
 }
 
-void serial_console_init(putc_function_t putc_fn, ipcarg_t w, ipcarg_t h)
+void serial_console_init(putc_function_t putc_fn, sysarg_t w, sysarg_t h)
 {
         scr_width = w;
@@ -284 +286 @@
  *
  */
-static void draw_text_data(keyfield_t *data, ipcarg_t x0, ipcarg_t y0,
-    ipcarg_t width, ipcarg_t height)
+static void draw_text_data(keyfield_t *data, sysarg_t x0, sysarg_t y0,
+    sysarg_t width, sysarg_t height)
 {
         attrs_t *a0 = &data[0].attrs;
         serial_set_attrs(a0);
         
-        ipcarg_t y;
+        sysarg_t y;
         for (y = 0; y < height; y++) {
                 serial_goto(x0, y0 + y);
                 
-                ipcarg_t x;
+                sysarg_t x;
                 for (x = 0; x < width; x++) {
                         attrs_t *attr = &data[y * width + x].attrs;
@@ -335 +337 @@
                 
                 wchar_t c;
-                ipcarg_t col;
-                ipcarg_t row;
-                ipcarg_t w;
-                ipcarg_t h;
+                sysarg_t col;
+                sysarg_t row;
+                sysarg_t w;
+                sysarg_t h;
                 ssize_t rows;
                 
                 int retval;
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         client_connected = 0;
@@ -440 +442 @@
                         
                         if (rows >= 0) {
-                                if ((ipcarg_t) rows > scr_height) {
+                                if ((sysarg_t) rows > scr_height) {
                                         retval = EINVAL;
                                         break;
                                 }
                         } else {
-                                if ((ipcarg_t) (-rows) > scr_height) {
+                                if ((sysarg_t) (-rows) > scr_height) {
                                         retval = EINVAL;
                                         break;

uspace/srv/hid/fb/serial_console.h

@@ -44 +44 @@
 
 extern void serial_puts(const char *);
-extern void serial_goto(const ipcarg_t, const ipcarg_t);
+extern void serial_goto(const sysarg_t, const sysarg_t);
 extern void serial_clrscr(void);
 extern void serial_scroll(ssize_t);
 extern void serial_cursor_disable(void);
 extern void serial_cursor_enable(void);
-extern void serial_set_scroll_region(ipcarg_t);
-extern void serial_console_init(putc_function_t, ipcarg_t, ipcarg_t);
+extern void serial_set_scroll_region(sysarg_t);
+extern void serial_console_init(putc_function_t, sysarg_t, sysarg_t);
 extern void serial_client_connection(ipc_callid_t, ipc_call_t *);