Changeset 371bd7d in mainline for uspace/srv/hid/console/gcons.c

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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.

File:

• uspace/srv/hid/console/gcons.c (moved) (moved from uspace/srv/console/gcons.c ) (4 diffs)

uspace/srv/hid/console/gcons.c

@@ -38 +38 @@
 #include <stdio.h>
 #include <sys/mman.h>
-#include <string.h>
+#include <str.h>
 #include <align.h>
 #include <bool.h>
@@ -241 +241 @@
 
 /** Return x, where left <= x <= right && |a-x| == min(|a-x|) is smallest */
-static inline int limit(size_t a, size_t left, size_t right)
+static inline ssize_t limit(ssize_t a, ssize_t left, ssize_t right)
 {
         if (a < left)
@@ -261 +261 @@
         mouse_x = limit(mouse_x + dx, 0, xres);
         mouse_y = limit(mouse_y + dy, 0, yres);
-        
-        async_msg_2(fbphone, FB_POINTER_MOVE, mouse_x, mouse_y);
+
+        if (active_console != KERNEL_CONSOLE)
+                async_msg_2(fbphone, FB_POINTER_MOVE, mouse_x, mouse_y);
 }
 
@@ -447 +448 @@
         
         int pm = make_pixmap(_binary_gfx_anim_1_ppm_start,
-            (int) &_binary_gfx_anim_1_ppm_size);
+            (size_t) &_binary_gfx_anim_1_ppm_size);
         async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
         
         pm = make_pixmap(_binary_gfx_anim_2_ppm_start,
-            (int) &_binary_gfx_anim_2_ppm_size);
+            (size_t) &_binary_gfx_anim_2_ppm_size);
         async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
         
         pm = make_pixmap(_binary_gfx_anim_3_ppm_start,
-            (int) &_binary_gfx_anim_3_ppm_size);
+            (size_t) &_binary_gfx_anim_3_ppm_size);
         async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
         
         pm = make_pixmap(_binary_gfx_anim_4_ppm_start,
-            (int) &_binary_gfx_anim_4_ppm_size);
+            (size_t) &_binary_gfx_anim_4_ppm_size);
         async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);