Changeset b1b723e in mainline

Timestamp:

2006-05-14T15:00:24Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

68965ec5

Parents:

749122b

Message:

split framebuffer initialization and sysinfo registration

Files:

• arch/ia32/src/drivers/vesa.c (modified) (1 diff)
• arch/ppc32/include/console.h (modified) (1 diff)
• arch/ppc32/src/console.c (modified) (1 diff)
• arch/ppc32/src/ppc32.c (modified) (1 diff)
• genarch/include/fb/fb.h (modified) (1 diff)
• genarch/src/fb/fb.c (modified) (3 diffs)
• generic/include/syscall/syscall.h (modified) (1 diff)

arch/ia32/src/drivers/vesa.c

@@ -81 +81 @@
         fb_init(vram_lin_addr, vesa_width, vesa_height, vesa_bpp, vesa_scanline);
         
-        sysinfo_set_item_val("Framebuffer.address.physical",NULL,vesa_ph_addr);
+        fb_register();
+        sysinfo_set_item_val("fb.address.physical", NULL, vesa_ph_addr);
 }
 

arch/ppc32/include/console.h

@@ -31 +31 @@
 
 extern void ppc32_console_init(void);
+extern void ppc32_console_register(void);
 
 #endif

arch/ppc32/src/console.c

@@ -40 +40 @@
         fb_init(0xf0000000 + (bootinfo.screen.addr & ((__address) ~0 >> 15)), bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline);
 }
+
+
+void ppc32_console_register(void)
+{
+        fb_register();
+}

arch/ppc32/src/ppc32.c

@@ -63 +63 @@
                 /* Merge all zones to 1 big zone */
                 zone_merge_all();
+                
+                ppc32_console_register();
         }
 }

genarch/include/fb/fb.h

@@ -35 +35 @@
 extern spinlock_t fb_lock;
 void fb_init(__address addr, unsigned int x, unsigned int y, unsigned int bpp, unsigned int scan);
+void fb_register(void);
 
 #endif

genarch/src/fb/fb.c

@@ -48 +48 @@
 static unsigned int yres = 0;
 static unsigned int scanline = 0;
+static unsigned int bitspp = 0;
 static unsigned int pixelbytes = 0;
 
@@ -349 +350 @@
         xres = x;
         yres = y;
+        bitspp = bpp;
         scanline = scan;
         
@@ -360 +362 @@
         chardev_initialize("fb", &framebuffer, &fb_ops);
         stdout = &framebuffer;
-        
-        sysinfo_set_item_val("Framebuffer",NULL,true);
-        sysinfo_set_item_val("Framebuffer.width",NULL,x);
-        sysinfo_set_item_val("Framebuffer.height",NULL,y);
-        sysinfo_set_item_val("Framebuffer.scanline",NULL,scan);
-        sysinfo_set_item_val("Framebuffer.bpp",NULL,bpp);
-        sysinfo_set_item_val("Framebuffer.address.virtual",NULL,addr);
-        
-
-
-}
+}
+
+
+/** Register framebuffer in sysinfo
+ *
+ */
+void fb_register(void)
+{
+        sysinfo_set_item_val("fb", NULL, true);
+        sysinfo_set_item_val("fb.width", NULL, xres);
+        sysinfo_set_item_val("fb.height", NULL, yres);
+        sysinfo_set_item_val("fb.scanline", NULL, scanline);
+        sysinfo_set_item_val("fb.bpp", NULL, bitspp);
+        sysinfo_set_item_val("fb.address.virtual", NULL, (__address) fbaddress);
+}

generic/include/syscall/syscall.h

@@ -32 +32 @@
 typedef enum {
         SYS_IO = 0,
-        SYS_TLS_SET = 1, /* Hardcoded in AMD64,IA32 uspace - psthread.S */
+        SYS_TLS_SET = 1, /* Hardcoded in AMD64, IA32 uspace - psthread.S */
         SYS_THREAD_CREATE,
         SYS_THREAD_EXIT,