Changeset edf5774 in mainline for kernel/genarch/src/fb/fb.c

Timestamp:

2008-12-25T17:08:23Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

68a4442

Parents:

c484842

Message:

cstyle

File:

• kernel/genarch/src/fb/fb.c (modified) (6 diffs)

kernel/genarch/src/fb/fb.c

@@ -235 +235 @@
                         unsigned int col;
                         
-                        for (col = 0, x = 0; col < cols; col++, x += FONT_WIDTH) {
+                        for (col = 0, x = 0; col < cols; col++,
+                            x += FONT_WIDTH) {
                                 uint8_t glyph;
                                 
                                 if (row < rows - 1) {
-                                        if (backbuf[BB_POS(col, row)] == backbuf[BB_POS(col, row + 1)])
+                                        if (backbuf[BB_POS(col, row)] ==
+                                            backbuf[BB_POS(col, row + 1)])
                                                 continue;
                                         
@@ -247 +249 @@
                                 
                                 memcpy(&fb_addr[FB_POS(x, y + yd)],
-                                    &glyphs[GLYPH_POS(glyph, yd)], glyphscanline);
+                                    &glyphs[GLYPH_POS(glyph, yd)],
+                                    glyphscanline);
                         }
                 }
@@ -296 +299 @@
                 cursor_remove();
                 do {
-                        glyph_draw((uint8_t) ' ', position % cols, position / cols);
+                        glyph_draw((uint8_t) ' ', position % cols,
+                            position / cols);
                         position++;
                 } while ((position % 8) && (position < cols * rows));
@@ -338 +342 @@
                         unsigned int x;
                         
-                        for (x = 0; x < FONT_WIDTH; x++)
-                                rgb_conv(&glyphs[GLYPH_POS(glyph, y) + x * pixelbytes],
-                                    (fb_font[ROW2Y(glyph) + y] & (1 << (7 - x))) ? FG_COLOR : BG_COLOR);
+                        for (x = 0; x < FONT_WIDTH; x++) {
+                                void *dst = &glyphs[GLYPH_POS(glyph, y) +
+                                    x * pixelbytes];
+                                uint32_t rgb = (fb_font[ROW2Y(glyph) + y] &
+                                    (1 << (7 - x))) ? FG_COLOR : BG_COLOR;
+                                rgb_conv(dst, rgb);
+                        }
                 }
         }
@@ -365 +373 @@
                         for (x = 0; x < xres; x++)
                                 rgb_conv(&fb_addr[FB_POS(x, y)],
-                                    (x < LOGO_WIDTH) ? fb_logo[y * LOGO_WIDTH + x] : LOGO_COLOR);
+                                    (x < LOGO_WIDTH) ?
+                                    fb_logo[y * LOGO_WIDTH + x] :
+                                    LOGO_COLOR);
                 }
         }
@@ -379 +389 @@
                         unsigned int col;
                         
-                        for (col = 0, x = 0; col < cols; col++, x += FONT_WIDTH)
-                                memcpy(&fb_addr[FB_POS(x, y + yd)],
-                            &glyphs[GLYPH_POS(backbuf[BB_POS(col, row)], yd)],
-                            glyphscanline);
+                        for (col = 0, x = 0; col < cols;
+                            col++, x += FONT_WIDTH) {
+                                void *d = &fb_addr[FB_POS(x, y + yd)];
+                                void *s = &glyphs[GLYPH_POS(backbuf[BB_POS(col,
+                                    row)], yd)];
+                                memcpy(d, s, glyphscanline);
+                        }
                 }
         }