Changeset 965dc18 in mainline for kernel/genarch/include

Timestamp:

2008-12-05T19:59:03Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

49093a4

Parents:

0258e67

Message:

Merge sparc branch to trunk.

Location:

kernel/genarch/include

Files:

• fb/fb.h (modified) (1 diff)
• fb/visuals.h (modified) (1 diff)
• ofw/ofw_tree.h (modified) (1 diff)

kernel/genarch/include/fb/fb.h

@@ -39 +39 @@
 #include <synch/spinlock.h>
 
+/**
+ * Properties of the framebuffer device.
+ */
+typedef struct fb_properties {
+        /** Physical address of the framebuffer device. */
+        uintptr_t addr;
+
+        /**
+         * Address where the first (top left) pixel is mapped,
+         * relative to "addr".
+         */
+        unsigned int offset;    
+
+        /** Screen width in pixels. */
+        unsigned int x;
+
+        /** Screen height in pixels. */
+        unsigned int y;
+
+        /** Bytes per one scanline. */
+        unsigned int scan;
+
+        /** Color model. */
+        unsigned int visual;
+} fb_properties_t;
+
 SPINLOCK_EXTERN(fb_lock);
-void fb_init(uintptr_t addr, unsigned int x, unsigned int y, unsigned int scan, unsigned int visual);
+void fb_init(fb_properties_t *props);
 
 #endif

kernel/genarch/include/fb/visuals.h

@@ -45 +45 @@
 
 #define VISUAL_BGR_0_8_8_8      6
+#define VISUAL_SB1500_PALETTE   7
 
 #endif

kernel/genarch/include/ofw/ofw_tree.h

@@ -173 +173 @@
 extern ofw_tree_node_t *ofw_tree_find_peer_by_device_type(ofw_tree_node_t *,
     const char *);
+extern ofw_tree_node_t *ofw_tree_find_peer_by_name(ofw_tree_node_t *node,
+    const char *name);
 extern ofw_tree_node_t *ofw_tree_find_node_by_handle(ofw_tree_node_t *,
     uint32_t);