Changeset 1787e527 in mainline for kernel/genarch/include/fb/fb.h

Timestamp:

2009-11-16T21:22:54Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5ebdf94

Parents:

fcbd1be (diff), 9c70ed6 (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:

merged with head (unstable)

File:

• kernel/genarch/include/fb/fb.h (modified) (3 diffs)

kernel/genarch/include/fb/fb.h

@@ -37 +37 @@
 
 #include <arch/types.h>
-#include <synch/spinlock.h>
+#include <console/chardev.h>
+#include <genarch/fb/visuals.h>
 
 /**
@@ -45 +46 @@
         /** Physical address of the framebuffer device. */
         uintptr_t addr;
-
+        
         /**
          * Address where the first (top left) pixel is mapped,
@@ -51 +52 @@
          */
         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;
+        visual_t visual;
 } fb_properties_t;
 
-SPINLOCK_EXTERN(fb_lock);
-
-void fb_redraw(void);
-void fb_init(fb_properties_t *props);
+outdev_t *fb_init(fb_properties_t *props);
 
 #endif