Changeset 985e26d2 in mainline for contrib/arch/uspace/srv/fb/fb.bp

Timestamp:

2010-01-07T19:06:59Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8190e63

Parents:

743e17b (diff), eca2435 (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:

• contrib/arch/uspace/srv/fb/fb.bp (modified) (1 diff)

contrib/arch/uspace/srv/fb/fb.bp

@@ -1 @@
-!ns.IPC_M_CONNECT_TO_ME ;
+?ipc_m_connect_me_to ;
 (
-        ?fb.IPC_M_CONNECT_ME_TO ;
         (
-                ?fb.IPC_M_SHARE_OUT +
-                
-                (
-                        ?fb.FB_PREPARE_SHM ;
-                        ?fb.IPC_M_AS_AREA_SEND ;
-                        ?fb.FB_DRAW_PPM ;
-                        ?fb.FB_DROP_SHM
-                ) +
-                
-                (
-                        ?fb.IPC_M_AS_AREA_SEND ;
-                        ?fb.FB_DRAW_TEXT_DATA
-                ) +
-                
-                ?fb.FB_SHM2PIXMAP +
-                
-                ?fb.FB_VP_DRAW_PIXMAP +
-                
-                ?fb.FB_VP2PIXMAP +
-                
-                ?fb.FB_DROP_PIXMAP +
-                
-                ?fb.FB_ANIM_CREATE +
-                
-                ?fb.FB_ANIM_DROP +
-                
-                ?fb.FB_ANIM_ADDPIXMAP +
-                
-                ?fb.FB_ANIM_CHGVP +
-                
-                ?fb.FB_ANIM_START +
-                
-                ?fb.FB_ANIM_STOP +
-                
-                ?fb.FB_PUTCHAR +
-                
-                ?fb.FB_CLEAR +
-                
-                ?fb.FB_CURSOR_GOTO +
-                
-                ?fb.FB_CURSOR_VISIBILITY +
-                
-                ?fb.FB_GET_CSIZE +
-                
-                ?fb.FB_GET_COLOR_CAP +
-                
-                ?fb.FB_SCROLL +
-                
-                ?fb.FB_VIEWPORT_SWITCH +
-                
-                ?fb.FB_VIEWPORT_CREATE +
-                
-                ?fb.FB_VIEWPORT_DELETE +
-                
-                ?fb.FB_SET_STYLE +
-                
-                ?fb.FB_SET_COLOR +
-                
-                ?fb.FB_SET_RGB_COLOR +
-                
-                ?fb.FB_GET_RESOLUTION +
-                
-                ?fb.FB_POINTER_MOVE +
-                
-                ?fb.FB_SCREEN_YIELD +
-                
-                ?fb.FB_SCREEN_RECLAIM
-        )* ;
-        ?fb.IPC_M_PHONE_HUNGUP
-)*
+                ?prepare_shm ;
+                ?ipc_m_share_out
+        ) +
+        ?ipc_m_share_out +
+        ?drop_shm +
+        ?get_resolution +
+        ?screen_yield +
+        ?screen_reclaim +
+        ?pointer_move +
+        ?viewport_create +
+        ?get_csize +
+        ?clear +
+        ?scroll +
+        ?viewport_switch +
+        ?viewport_delete +
+        ?get_color_cap +
+        ?set_style +
+        ?set_color +
+        ?set_rgb_color +
+        ?putchar +
+        ?cursor_visibility +
+        ?cursor_goto +
+        ?draw_ppm +
+        ?draw_text_data +
+        ?shm2pixmap +
+        ?vp2pixmap +
+        ?vp_draw_pixmap +
+        ?drop_pixmap +
+        ?anim_create +
+        ?anim_addpixmap +
+        ?anim_chgvp +
+        ?anim_start +
+        ?anim_stop +
+        ?anim_drop
+)* ;
+?ipc_m_phone_hungup