Changeset 83b1d61 in mainline

Timestamp:

2006-06-02T13:30:37Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

bb51e9a8

Parents:

bd929cfb

Message:

Added mmap, munmap calls.
Added possibility to access framebuffer using shared memory.

Files:

• fb/fb.c (modified) (4 diffs)
• fb/main.c (modified) (1 diff)
• fb/main.h (added)
• libc/Makefile (modified) (1 diff)
• libc/arch/amd64/include/types.h (modified) (1 diff)
• libc/arch/ia32/include/types.h (modified) (1 diff)
• libc/arch/ia64/include/types.h (modified) (1 diff)
• libc/arch/mips32/include/types.h (modified) (1 diff)
• libc/arch/ppc32/include/types.h (modified) (1 diff)
• libc/arch/ppc64/include/types.h (modified) (1 diff)
• libc/generic/as.c (modified) (2 diffs)
• libc/generic/mmap.c (added)
• libc/include/ipc/fb.h (modified) (1 diff)
• libc/include/sys/mman.h (added)

fb/fb.c

@@ -41 +41 @@
 #include <kernel/errno.h>
 #include <async.h>
+
 #include "font-8x16.h"
 #include "helenos.xbm"
 #include "fb.h"
+#include "main.h"
+#include "../console/screenbuffer.h"
 
 #define DEFAULT_BGCOLOR                0x000080
@@ -459 +462 @@
 }
 
+static void draw_text_data(int vp, keyfield_t *data)
+{
+        viewport_t *vport = &viewports[vp];
+        int i;
+        char c;
+
+        clear_port(vp);
+        for (i=0; i < vport->cols * vport->rows; i++) {
+                if (data[i].character == ' ') /* TODO: && data[i].style==vport->style */
+                        continue;
+                draw_char(vp, data[i].character, i/vport->rows, i % vport->cols);
+        }
+        cursor_print(vp);
+}
+
+
 /** Function for handling connections to FB
  *
@@ -470 +489 @@
         unsigned int row,col;
         char c;
+        keyfield_t *interbuffer = NULL;
+        size_t intersize = 0;
 
         int vp = 0;
@@ -495 +516 @@
                         ipc_answer_fast(callid,0,0,0);
                         return; /* Exit thread */
+                case IPC_M_AS_AREA_SEND:
+                        /* We accept one area for data interchange */
+                        intersize = IPC_GET_ARG2(call);
+                        receive_comm_area(callid,&call,(void **)&interbuffer,
+                                          sizeof(*interbuffer)*viewports[0].cols*viewports[0].rows);
+                        continue;
+
+                case FB_DRAW_TEXT_DATA:
+                        if (!interbuffer) {
+                                retval = EINVAL;
+                                break;
+                        }
+                        if (intersize < vport->cols*vport->rows*sizeof(*interbuffer)) {
+                                retval = EINVAL;
+                                break;
+                        }
+                        draw_text_data(vp, interbuffer);
+                        retval = 0;
+                        break;
                 case FB_PUTCHAR:
                         c = IPC_GET_ARG1(call);

fb/main.c

@@ -31 +31 @@
 #include <sysinfo.h>
 #include <async.h>
+#include <as.h>
+#include <align.h>
+#include <errno.h>
 
 #include "fb.h"
 #include "sysio.h"
 #include "ega.h"
+#include "main.h"
+
+void receive_comm_area(ipc_callid_t callid, ipc_call_t *call, void **area,
+                       size_t maxsize)
+{
+        void *dest;
+
+        if (*area) {
+                ipc_answer_fast(callid, ELIMIT, 0, 0);
+                return;
+        }
+        if (IPC_GET_ARG2(*call) > ALIGN_UP(maxsize, PAGE_SIZE)) {
+                ipc_answer_fast(callid, EINVAL, 0, 0);
+                return;
+        }
+        
+        dest = as_get_mappable_page(maxsize);
+        if (ipc_answer_fast(callid, 0, (sysarg_t)dest, 0) == 0)
+                *area = dest;
+}
 
 int main(int argc, char *argv[])

libc/Makefile

@@ -72 +72 @@
         generic/time.c \
         generic/err.c \
-        generic/stdlib.c
+        generic/stdlib.c \
+        generic/mmap.c
 
 ARCH_SOURCES += \

libc/arch/amd64/include/types.h

@@ -33 +33 @@
 typedef unsigned long size_t;
 typedef signed long ssize_t;
+typedef ssize_t off_t;
 
 typedef char int8_t;

libc/arch/ia32/include/types.h

@@ -33 +33 @@
 typedef unsigned int size_t;
 typedef signed int ssize_t;
+typedef ssize_t off_t;
 
 typedef char int8_t;

libc/arch/ia64/include/types.h

@@ -33 +33 @@
 typedef unsigned long size_t;
 typedef signed long ssize_t;
+typedef ssize_t off_t;
 
 typedef char int8_t;

libc/arch/mips32/include/types.h

@@ -33 +33 @@
 typedef unsigned int size_t;
 typedef signed int ssize_t;
+typedef ssize_t off_t;
 
 typedef char int8_t;

libc/arch/ppc32/include/types.h

@@ -33 +33 @@
 typedef unsigned int size_t;
 typedef signed int ssize_t;
+typedef ssize_t off_t;
 
 typedef char int8_t;

libc/arch/ppc64/include/types.h

@@ -33 +33 @@
 typedef unsigned long size_t;
 typedef signed long ssize_t;
+typedef ssize_t off_t;
 
 typedef char int8_t;

libc/generic/as.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */ 
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <ddi.h>
-#include <sysinfo.h>
-#include <align.h>
-#include <as.h>
-#include <ipc/fb.h>
-#include <ipc/ipc.h>
-#include <ipc/ns.h>
-#include <ipc/services.h>
-#include <kernel/errno.h>
-
 
 #include <as.h>
@@ -134 +120 @@
 }
 
+/* TODO: make this type defined somewhere else */
+typedef sysarg_t __address;
+
 /** Return pointer to some unmapped area, where fits new as_area
  *

libc/include/ipc/fb.h

@@ -18 +18 @@
 #define FB_SET_STYLE         1034
 #define FB_GET_RESOLUTION    1035
+#define FB_DRAW_TEXT_DATA    1036
 
 #endif