WebSVN – HelenOS – Path Comparison – /

Ignore whitespace Rev 1689 → Rev 1690

 /kernel/trunk/genarch/src/fb/fb.c
 ,6 → 370,14
     rows = y / FONT_SCANLINES;
     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;
     int pages = SIZE2FRAMES(totsize);
 ,12 → 413,4
     chardev_initialize("fb", &framebuffer, &fb_ops);
     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);
 }

 /kernel/trunk/arch/ia32/src/interrupt.c
 ,8 → 185,8
 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);
 }
 ,5 → 195,6
 {
     if (irq == IRQ_CLK)
         return;
+    trap_virtual_enable_irqs(1 << irq);
     exc_register(IVT_IRQBASE+irq, "ipc_int", ipc_int);
 }