Changeset 0b9ac3c in mainline for uspace/srv/hid/console/gcons.c

Timestamp:

2010-02-23T19:03:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (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 (modified) (1 diff)

uspace/srv/hid/console/gcons.c

@@ -448 +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);