Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 1501 → Rev 1500

/uspace/trunk/fb/fb.c
359,7 → 359,7
* @param scan Bytes per one scanline
*
*/
static void screen_init(void *addr, unsigned int xres, unsigned int yres, unsigned int bpp, unsigned int scan)
static void screen_init(__address addr, unsigned int xres, unsigned int yres, unsigned int bpp, unsigned int scan)
{
switch (bpp) {
case 8:
597,26 → 597,25
/** Initialization of framebuffer */
int fb_init(void)
{
void *fb_ph_addr;
__address fb_ph_addr;
unsigned int fb_width;
unsigned int fb_height;
unsigned int fb_bpp;
unsigned int fb_scanline;
void *fb_addr;
size_t asz;
__address fb_addr;
 
async_set_client_connection(fb_client_connection);
 
fb_ph_addr=(void *)sysinfo_value("fb.address.physical");
fb_ph_addr=sysinfo_value("fb.address.physical");
fb_width=sysinfo_value("fb.width");
fb_height=sysinfo_value("fb.height");
fb_bpp=sysinfo_value("fb.bpp");
fb_scanline=sysinfo_value("fb.scanline");
 
asz = fb_scanline*fb_height;
fb_addr = as_get_mappable_page(asz);
fb_addr=ALIGN_UP(((__address)set_maxheapsize(USER_ADDRESS_SPACE_SIZE_ARCH>>1)),PAGE_SIZE);
map_physmem(fb_ph_addr, fb_addr, ALIGN_UP(asz,PAGE_SIZE) >>PAGE_WIDTH,
map_physmem((void *)((__address)fb_ph_addr),(void *)fb_addr,
(fb_scanline*fb_height+PAGE_SIZE-1)>>PAGE_WIDTH,
AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
screen_init(fb_addr, fb_width, fb_height, fb_bpp, fb_scanline);
/uspace/trunk/fb/ega.c
111,7 → 111,6
int ega_init(void)
{
void *ega_ph_addr;
size_t sz;
 
 
ega_ph_addr=(void *)sysinfo_value("fb.address.physical");
118,12 → 117,15
scr_width=sysinfo_value("fb.width");
scr_height=sysinfo_value("fb.height");
 
sz = scr_width*scr_height*2;
scr_addr = as_get_mappable_page(sz);
scr_addr=(void *)ALIGN_UP(((__address)set_maxheapsize(USER_ADDRESS_SPACE_SIZE_ARCH>>1)),PAGE_SIZE);
 
map_physmem(ega_ph_addr, scr_addr, ALIGN_UP(sz,PAGE_SIZE)>>PAGE_WIDTH,
if (ega_ph_addr != ALIGN_DOWN((unsigned long)ega_ph_addr, PAGE_SIZE))
return -1;
map_physmem(ega_ph_addr, scr_addr, (scr_width*scr_height*2+PAGE_SIZE-1)>>PAGE_WIDTH,
AS_AREA_READ | AS_AREA_WRITE);
 
 
async_set_client_connection(ega_client_connection);
 
clrscr();