Changeset 03362fbd in mainline for abi/include/fb/visuals.h

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• abi/include/fb/visuals.h (modified) (2 diffs)

abi/include/fb/visuals.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Martin Decky
+ * Copyright (c) 2011 Petr Koupy
  * All rights reserved.
  *
@@ -46 +47 @@
         VISUAL_BGR_0_8_8_8,
         VISUAL_BGR_8_8_8_0,
+        VISUAL_ABGR_8_8_8_8,
+        VISUAL_BGRA_8_8_8_8,
         VISUAL_RGB_8_8_8,
         VISUAL_RGB_0_8_8_8,
-        VISUAL_RGB_8_8_8_0
+        VISUAL_RGB_8_8_8_0,
+        VISUAL_ARGB_8_8_8_8,
+        VISUAL_RGBA_8_8_8_8
 } visual_t;