Changeset 8060a24c in mainline

Timestamp:

2006-06-10T20:31:55Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

e5dc7b8

Parents:

0182a665

Message:

Yet another fix with framebuffer.

Files:

• arch/ia32/src/interrupt.c (modified) (2 diffs)
• genarch/src/fb/fb.c (modified) (2 diffs)

arch/ia32/src/interrupt.c

@@ -186 +186 @@
 static void ipc_int(int n, istate_t *istate)
 {
+        ipc_irq_send_notif(n-IVT_IRQBASE);
         trap_virtual_eoi();
-        ipc_irq_send_notif(n-IVT_IRQBASE);
 }
 
@@ -196 +196 @@
         if (irq == IRQ_CLK)
                 return;
+        trap_virtual_enable_irqs(1 << irq);
         exc_register(IVT_IRQBASE+irq, "ipc_int", ipc_int);
 }

genarch/src/fb/fb.c

@@ -371 +371 @@
         columns = x / COL_WIDTH;
 
+        sysinfo_set_item_val("fb", NULL, true);
+        sysinfo_set_item_val("fb.kind", NULL, 1);
+        sysinfo_set_item_val("fb.width", NULL, xres);
+        sysinfo_set_item_val("fb.height", NULL, yres);
+        sysinfo_set_item_val("fb.bpp", NULL, bpp);
+        sysinfo_set_item_val("fb.scanline", NULL, scan);
+        sysinfo_set_item_val("fb.address.physical", NULL, addr);
+
         /* Allocate double buffer */
         int totsize = scanline * yres;
@@ -406 +414 @@
         stdout = &framebuffer;
         
-        sysinfo_set_item_val("fb", NULL, true);
-        sysinfo_set_item_val("fb.kind", NULL, 1);
-        sysinfo_set_item_val("fb.width", NULL, xres);
-        sysinfo_set_item_val("fb.height", NULL, yres);
-        sysinfo_set_item_val("fb.bpp", NULL, bpp);
-        sysinfo_set_item_val("fb.scanline", NULL, scan);
-        sysinfo_set_item_val("fb.address.physical", NULL, addr);
-
-}
+}