Changeset da0c91e7 in mainline

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.

Files:

• console/console.c (modified) (2 diffs)
• fb/Makefile (modified) (1 diff)
• fb/fb.c (modified) (4 diffs)
• fb/fb.h (modified) (1 diff)
• fb/main.c (added)
• fb/sysio.c (added)
• fb/sysio.h (added)
• libc/generic/async.c (modified) (3 diffs)
• libc/generic/io/stream.c (modified) (3 diffs)
• libc/include/async.h (modified) (2 diffs)

console/console.c

@@ -116 +116 @@
                         
                         conn = &connections[active_console];
-                        if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 + CONSOLE_COUNT)) {
+//                      if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 + CONSOLE_COUNT)) {
+                        if ((c >= '1') && (c < '1' + CONSOLE_COUNT)) {
                                 /*FIXME: draw another console content from buffer */
 
-                                active_console = c - KBD_KEY_F1;
+                                active_console = c - '1';
                                 conn = &connections[active_console];
 
@@ -232 +233 @@
         ipcarg_t retval, arg1 = 0xdead, arg2 = 0xbeef;
         int i;
+
+        async_set_client_connection(client_connection);
         
         /* Connect to keyboard driver */

fb/Makefile

@@ -47 +47 @@
 SOURCES = \
         fb.c \
-        font-8x16.c
+        font-8x16.c \
+        main.c \
+        sysio.c
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))

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;
 }
+

fb/fb.h

@@ -30 +30 @@
 #define _FB_H_
 
-#include <types.h>
-#include <arch/types.h>
+int fb_init(void);
 
 #endif

libc/generic/async.c

@@ -129 +129 @@
 } connection_t;
 
+
 __thread connection_t *PS_connection;
+
+static void default_client_connection(ipc_callid_t callid, ipc_call_t *call);
+static async_client_conn_t client_connection = default_client_connection;
 
 /** Add microseconds to give timeval */
@@ -273 +277 @@
  * user code.
  */
-void client_connection(ipc_callid_t callid, ipc_call_t *call)
+static void default_client_connection(ipc_callid_t callid, ipc_call_t *call)
 {
         ipc_answer_fast(callid, ENOENT, 0, 0);
@@ -671 +675 @@
         free(msg);
 }
+
+/** Set function that is called, IPC_M_CONNECT_ME_TO is received
+ *
+ * @param conn Function that will form new psthread.
+ */
+void async_set_client_connection(async_client_conn_t conn)
+{
+        client_connection = conn;
+}

libc/generic/io/stream.c

@@ -53 +53 @@
 stream_t streams[FDS] = {{0, 0, 0}};
 
-/*
-ssize_t write_stdout(void *param, const void * buf, size_t count);
-ssize_t write_stdout(void *param, const void * buf, size_t count)
-{
-        return (ssize_t) __SYSCALL3(SYS_IO, 1, (sysarg_t) buf, (sysarg_t) count);
-}*/
-
 static ssize_t write_stderr(void *param, const void *buf, size_t count)
 {
         return count;
-        //return (ssize_t) __SYSCALL3(SYS_IO, 1, (sysarg_t) buf, (sysarg_t) count);
 }
 
@@ -78 +70 @@
         }
         return i;
-        //return (ssize_t) __SYSCALL3(SYS_IO, 1, (sysarg_t) buf, (sysarg_t) count);
 }
 
@@ -90 +81 @@
         
         return count;
-        //return (ssize_t) __SYSCALL3(SYS_IO, 1, (sysarg_t) buf, (sysarg_t) count);
 }
 

libc/include/async.h

@@ -36 +36 @@
 
 typedef ipc_callid_t aid_t;
+typedef void (*async_client_conn_t)(ipc_callid_t callid, ipc_call_t *call);
 
 int async_manager(void);
@@ -73 +74 @@
 void async_create_manager(void);
 void async_destroy_manager(void);
+void async_set_client_connection(async_client_conn_t conn);
 int _async_init(void);
 
 /* Should be defined by application */
-void client_connection(ipc_callid_t callid, ipc_call_t *call) __attribute__((weak));
 void interrupt_received(ipc_call_t *call)  __attribute__((weak));