Changeset da0c91e7 in mainline for fb/fb.c

Timestamp:

2006-06-01T23:01:44Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

46bd593f

Parents:

c1d2c9d

Message:

Added very preliminary support for console on architectures
that do not support framebuffer.

File:

• fb/fb.c (modified) (4 diffs)

fb/fb.c

@@ -28 +28 @@
  */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <ddi.h>
-#include <task.h>
 #include <sysinfo.h>
 #include <align.h>
@@ -390 +388 @@
 }
 
-static int init_fb(void)
-{
-        __address fb_ph_addr;
-        unsigned int fb_width;
-        unsigned int fb_height;
-        unsigned int fb_bpp;
-        unsigned int fb_scanline;
-        __address fb_addr;
-        int a=0;
-        int i,j,k;
-        int w;
-        char text[]="HelenOS Framebuffer driver\non Virtual Framebuffer\nVFB ";
-
-        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");
-
-        fb_addr=ALIGN_UP(((__address)set_maxheapsize(USER_ADDRESS_SPACE_SIZE_ARCH>>1)),PAGE_SIZE);
-        
-        map_physmem(task_get_id(),(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);
-
-        return 0;
-}
-
 static void draw_char(int vp, char c, unsigned int row, unsigned int col)
 {
@@ -443 +411 @@
 }
 
-void client_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void fb_client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
         ipc_callid_t callid;
@@ -578 +546 @@
 }
 
-int main(int argc, char *argv[])
-{
-        char connected = 0;
-        int res;
-        ipcarg_t phonead;
-
-        if(!sysinfo_value("fb"))
-                return -1;
-
-        if ((res = ipc_connect_to_me(PHONE_NS, SERVICE_VIDEO, 0, &phonead)) != 0) 
-                return -1;
-        
-        if (init_fb() != 0)
-                return -1;
-
-        async_manager();
-        /* Never reached */
+int fb_init(void)
+{
+        __address fb_ph_addr;
+        unsigned int fb_width;
+        unsigned int fb_height;
+        unsigned int fb_bpp;
+        unsigned int fb_scanline;
+        __address fb_addr;
+
+        async_set_client_connection(fb_client_connection);
+
+        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");
+
+        fb_addr=ALIGN_UP(((__address)set_maxheapsize(USER_ADDRESS_SPACE_SIZE_ARCH>>1)),PAGE_SIZE);
+        
+        map_physmem(task_get_id(),(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);
+
         return 0;
 }
+