Changeset 253f35a1 in mainline for uspace

Timestamp:

2006-09-07T19:56:44Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ab1ae2d9

Parents:

801579fe

Message:

sparc64 work.

• Changes to enable userspace keyboard drivers.
• Fix z8530 initialization (i.e. clear any pending Tx interrupts).
• Experimental support for framebuffers with inverted colors.

File:

• uspace/fb/fb.c (modified) (12 diffs)

uspace/fb/fb.c

@@ -71 +71 @@
 
 struct {
-        uint8_t *fbaddress ;
-
-        unsigned int xres ;
-        unsigned int yres ;
-        unsigned int scanline ;
-        unsigned int pixelbytes ;
+        uint8_t *fbaddress;
+
+        unsigned int xres;
+        unsigned int yres;
+        unsigned int scanline;
+        unsigned int pixelbytes;
+        unsigned int invert_colors;
 
         conv2scr_fn_t rgb2scr;
@@ -141 +142 @@
 #define POINTPOS(x, y)  ((y) * screen.scanline + (x) * screen.pixelbytes)
 
+static inline int COLOR(int color)
+{
+        return screen.invert_colors ? ~color : color;
+}
+
 /* Conversion routines between different color representations */
 static void rgb_4byte(void *dst, int rgb)
@@ -164 +170 @@
         scr[0] = BLUE(rgb, 8);
 #endif
-
-
 }
 
@@ -218 +222 @@
 
         if (! (vport->paused && vport->dbdata))
-                (*screen.rgb2scr)(&screen.fbaddress[POINTPOS(dx,dy)],color);
+                (*screen.rgb2scr)(&screen.fbaddress[POINTPOS(dx,dy)], COLOR(color));
 
         if (vport->dbdata) {
                 int dline = (y + vport->dboffset) % vport->height;
                 int doffset = screen.pixelbytes * (dline * vport->width + x);
-                (*screen.rgb2scr)(&vport->dbdata[doffset],color);
+                (*screen.rgb2scr)(&vport->dbdata[doffset], COLOR(color));
         }
 }
@@ -233 +237 @@
         int dy = vport->y + y;
 
-        return (*screen.scr2rgb)(&screen.fbaddress[POINTPOS(dx,dy)]);
+        return COLOR((*screen.scr2rgb)(&screen.fbaddress[POINTPOS(dx,dy)]));
 }
 
@@ -239 +243 @@
                                 int color)
 {
-        (*screen.rgb2scr)(&mem[POINTPOS(x,y)],color);
+        (*screen.rgb2scr)(&mem[POINTPOS(x,y)], COLOR(color));
 }
 
@@ -455 +459 @@
  * @param scan Bytes per one scanline
  * @param align Alignment for 24bpp mode.
+ * @param invert_colors Inverted colors.
  *
  */
 static void
-screen_init(void *addr, unsigned int xres, unsigned int yres, unsigned int bpp, unsigned int scan, int align)
+screen_init(void *addr, unsigned int xres, unsigned int yres, unsigned int bpp, unsigned int scan,
+        int align, int invert_colors)
 {
         switch (bpp) {
@@ -491 +497 @@
         screen.yres = yres;
         screen.scanline = scan;
+        screen.invert_colors = invert_colors;
         
         /* Create first viewport */
@@ -594 +601 @@
         int pos = (y * pmap->width + x) * screen.pixelbytes;
 
-        (*screen.rgb2scr)(&pmap->data[pos],color);
+        (*screen.rgb2scr)(&pmap->data[pos],COLOR(color));
 }
 
@@ -1224 +1231 @@
         unsigned int fb_bpp_align;
         unsigned int fb_scanline;
+        unsigned int fb_invert_colors;
         void *fb_addr;
         size_t asz;
@@ -1235 +1243 @@
         fb_bpp_align=sysinfo_value("fb.bpp-align");
         fb_scanline=sysinfo_value("fb.scanline");
+        fb_invert_colors=sysinfo_value("fb.invert-colors");
 
         asz = fb_scanline*fb_height;
@@ -1242 +1251 @@
                     AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
         
-        screen_init(fb_addr, fb_width, fb_height, fb_bpp, fb_scanline, fb_bpp_align);
+        screen_init(fb_addr, fb_width, fb_height, fb_bpp, fb_scanline, fb_bpp_align, fb_invert_colors);
 
         return 0;