Changeset 22870b2 in mainline

Timestamp:

2006-06-08T21:23:25Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

208259c

Parents:

85d24f61

Message:

Eliminate deadlock condition from fb.

File:

• genarch/src/fb/fb.c (modified) (3 diffs)

genarch/src/fb/fb.c

@@ -166 +166 @@
 static void scroll_screen(void)
 {
-        unsigned int i;
         __u8 *lastline = &fbaddress[(rows - 1) * ROW_BYTES];
 
@@ -172 +171 @@
 
         /* Clear last row */
-        if (blankline) {
-                memcpy((void *) lastline, (void *) blankline, ROW_BYTES);
-        } else {
-                for (i = 0; i < FONT_SCANLINES; i++)
-                        clear_line((rows - 1) * FONT_SCANLINES + i);
-
-                if (config.mm_initialized) {
-                        /* Save a blank line aside. */
-                        blankline = (__u8 *) malloc(ROW_BYTES, FRAME_ATOMIC);
-                        if (blankline)
-                                memcpy((void *) blankline, (void *) lastline, ROW_BYTES);
-                }
-        }
+        memcpy((void *) lastline, (void *) blankline, ROW_BYTES);
 }
 
@@ -362 +349 @@
 
         clear_screen();
+        blankline = (__u8 *) malloc(ROW_BYTES, FRAME_ATOMIC);
+        ASSERT(blankline);
+        memcpy((void *) blankline, (void *) &fbaddress[(rows - 1) * ROW_BYTES], ROW_BYTES);
+        
         draw_logo(xres - helenos_width, 0);
         invert_cursor();