Changeset b1b723e in mainline


Ignore:
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:
7 edited

Legend:

Unmodified
Added
Removed
  • arch/ia32/src/drivers/vesa.c

    r749122b rb1b723e  
    8181        fb_init(vram_lin_addr, vesa_width, vesa_height, vesa_bpp, vesa_scanline);
    8282       
    83         sysinfo_set_item_val("Framebuffer.address.physical",NULL,vesa_ph_addr);
     83        fb_register();
     84        sysinfo_set_item_val("fb.address.physical", NULL, vesa_ph_addr);
    8485}
    8586
  • arch/ppc32/include/console.h

    r749122b rb1b723e  
    3131
    3232extern void ppc32_console_init(void);
     33extern void ppc32_console_register(void);
    3334
    3435#endif
  • arch/ppc32/src/console.c

    r749122b rb1b723e  
    4040        fb_init(0xf0000000 + (bootinfo.screen.addr & ((__address) ~0 >> 15)), bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline);
    4141}
     42
     43
     44void ppc32_console_register(void)
     45{
     46        fb_register();
     47}
  • arch/ppc32/src/ppc32.c

    r749122b rb1b723e  
    6363                /* Merge all zones to 1 big zone */
    6464                zone_merge_all();
     65               
     66                ppc32_console_register();
    6567        }
    6668}
  • genarch/include/fb/fb.h

    r749122b rb1b723e  
    3535extern spinlock_t fb_lock;
    3636void fb_init(__address addr, unsigned int x, unsigned int y, unsigned int bpp, unsigned int scan);
     37void fb_register(void);
    3738
    3839#endif
  • genarch/src/fb/fb.c

    r749122b rb1b723e  
    4848static unsigned int yres = 0;
    4949static unsigned int scanline = 0;
     50static unsigned int bitspp = 0;
    5051static unsigned int pixelbytes = 0;
    5152
     
    349350        xres = x;
    350351        yres = y;
     352        bitspp = bpp;
    351353        scanline = scan;
    352354       
     
    360362        chardev_initialize("fb", &framebuffer, &fb_ops);
    361363        stdout = &framebuffer;
    362        
    363         sysinfo_set_item_val("Framebuffer",NULL,true);
    364         sysinfo_set_item_val("Framebuffer.width",NULL,x);
    365         sysinfo_set_item_val("Framebuffer.height",NULL,y);
    366         sysinfo_set_item_val("Framebuffer.scanline",NULL,scan);
    367         sysinfo_set_item_val("Framebuffer.bpp",NULL,bpp);
    368         sysinfo_set_item_val("Framebuffer.address.virtual",NULL,addr);
    369        
    370 
    371 
    372 }
     364}
     365
     366
     367/** Register framebuffer in sysinfo
     368 *
     369 */
     370void fb_register(void)
     371{
     372        sysinfo_set_item_val("fb", NULL, true);
     373        sysinfo_set_item_val("fb.width", NULL, xres);
     374        sysinfo_set_item_val("fb.height", NULL, yres);
     375        sysinfo_set_item_val("fb.scanline", NULL, scanline);
     376        sysinfo_set_item_val("fb.bpp", NULL, bitspp);
     377        sysinfo_set_item_val("fb.address.virtual", NULL, (__address) fbaddress);
     378}
  • generic/include/syscall/syscall.h

    r749122b rb1b723e  
    3232typedef enum {
    3333        SYS_IO = 0,
    34         SYS_TLS_SET = 1, /* Hardcoded in AMD64,IA32 uspace - psthread.S */
     34        SYS_TLS_SET = 1, /* Hardcoded in AMD64, IA32 uspace - psthread.S */
    3535        SYS_THREAD_CREATE,
    3636        SYS_THREAD_EXIT,
Note: See TracChangeset for help on using the changeset viewer.