Changeset e45f81a in mainline for genarch/src/fb/fb.c

Timestamp:

2006-06-26T10:07:05Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

7ee0e2f

Parents:

430f12c

Message:

Changed frame_alloc call, cleaned a lot of stuff, fixed some not-perfectly-correct error handling.

File:

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

genarch/src/fb/fb.c

@@ -389 +389 @@
         int pages = SIZE2FRAMES(totsize);
         int order;
-        int rc;
         if (pages == 1)
                 order = 0;
@@ -395 +394 @@
                 order = fnzb(pages-1)+1;
 
-        dbbuffer = frame_alloc_rc(order,FRAME_ATOMIC | FRAME_KA, &rc);
+        dbbuffer = frame_alloc(order,FRAME_ATOMIC | FRAME_KA);
         if (!dbbuffer)
                 printf("Failed to allocate scroll buffer.\n");
@@ -402 +401 @@
         /* Initialized blank line */
         blankline = (__u8 *) malloc(ROW_BYTES, FRAME_ATOMIC);
-        ASSERT(blankline);
+        if (!blankline)
+                panic("Failed to allocate blank line for framebuffer.");
         for (y=0; y < FONT_SCANLINES; y++)
                 for (x=0; x < xres; x++)