Changeset bd5f3b7 in mainline for uspace/lib/c/include/ipc/fb.h

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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/lib/c/include/ipc/fb.h (modified) (1 diff)

uspace/lib/c/include/ipc/fb.h

@@ -55 +55 @@
         FB_DRAW_TEXT_DATA,
         FB_FLUSH,
-        FB_DRAW_PPM,
+        FB_DRAW_IMGMAP,
         FB_PREPARE_SHM,
         FB_DROP_SHM,
-        FB_SHM2PIXMAP,
-        FB_VP_DRAW_PIXMAP,
-        FB_VP2PIXMAP,
-        FB_DROP_PIXMAP,
+        FB_SHM2IMGMAP,
+        FB_VP_DRAW_IMGMAP,
+        FB_VP2IMGMAP,
+        FB_DROP_IMGMAP,
         FB_ANIM_CREATE,
         FB_ANIM_DROP,
-        FB_ANIM_ADDPIXMAP,
+        FB_ANIM_ADDIMGMAP,
         FB_ANIM_CHGVP,
         FB_ANIM_START,