Changeset 5035eeb7 in mainline

Timestamp:

2006-09-05T16:47:59Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e2bf639

Parents:

d681c17

Message:

Pass "fb.bpp-align" property to userspace so that our fb task works properly even on
framebuffers used in some Sun hardware.

Files:

• kernel/genarch/src/fb/fb.c (modified) (1 diff)
• uspace/fb/fb.c (modified) (5 diffs)

kernel/genarch/src/fb/fb.c

@@ -395 +395 @@
         sysinfo_set_item_val("fb.height", NULL, yres);
         sysinfo_set_item_val("fb.bpp", NULL, bpp);
+        sysinfo_set_item_val("fb.bpp-align", NULL, align);
         sysinfo_set_item_val("fb.scanline", NULL, scan);
         sysinfo_set_item_val("fb.address.physical", NULL, addr);

uspace/fb/fb.c

@@ -454 +454 @@
  * @param bpp  Bits per pixel (8, 16, 24, 32)
  * @param scan Bytes per one scanline
- *
- */
-static void screen_init(void *addr, unsigned int xres, unsigned int yres, unsigned int bpp, unsigned int scan)
+ * @param align Alignment for 24bpp mode.
+ *
+ */
+static void
+screen_init(void *addr, unsigned int xres, unsigned int yres, unsigned int bpp, unsigned int scan, int align)
 {
         switch (bpp) {
@@ -472 +474 @@
                         screen.rgb2scr = rgb_3byte;
                         screen.scr2rgb = byte3_rgb;
-                        screen.pixelbytes = 3;
+                        if (!align)
+                                screen.pixelbytes = 3;
+                        else
+                                screen.pixelbytes = 4;
                         break;
                 case 32:
@@ -1217 +1222 @@
         unsigned int fb_height;
         unsigned int fb_bpp;
+        unsigned int fb_bpp_align;
         unsigned int fb_scanline;
         void *fb_addr;
@@ -1227 +1233 @@
         fb_height=sysinfo_value("fb.height");
         fb_bpp=sysinfo_value("fb.bpp");
+        fb_bpp_align=sysinfo_value("fb.bpp-align");
         fb_scanline=sysinfo_value("fb.scanline");
 
@@ -1235 +1242 @@
                     AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
         
-        screen_init(fb_addr, fb_width, fb_height, fb_bpp, fb_scanline);
+        screen_init(fb_addr, fb_width, fb_height, fb_bpp, fb_scanline, fb_bpp_align);
 
         return 0;