Changeset afa6e74 in mainline for libc

Timestamp:

2006-05-16T23:37:58Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

04a73cdf

Parents:

6efe0ddf

Message:

Earliest version of Userspace Framebuffer driver, with stream support in libc.
Also Virtual framebuffers made as split on main fb and its usage by streams

(please test it and report)

Location:

libc

Files:

• Makefile (modified) (1 diff)
• Makefile.toolchain (modified) (1 diff)
• generic/as.c (modified) (3 diffs)
• generic/io/io.c (modified) (1 diff)
• generic/io/stream.c (added)
• generic/libc.c (modified) (2 diffs)
• include/as.h (modified) (1 diff)
• include/io/stream.h (added)
• include/ipc/fb.h (added)
• include/ipc/services.h (modified) (1 diff)

libc/Makefile

@@ -53 +53 @@
         generic/io/io.c \
         generic/io/printf.c \
+        generic/io/stream.c \
         generic/io/sprintf.c \
         generic/io/snprintf.c \

libc/Makefile.toolchain

@@ -28 +28 @@
 
 DEFS = -DARCH=$(ARCH)
-CFLAGS = -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include
+CFLAGS = -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes  -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include
 LFLAGS = -M -N $(SOFTINT_PREFIX)/softint.a
 AFLAGS =
-
+#-Werror
 
 ## Setup platform configuration

libc/generic/as.c

@@ -70 +70 @@
 
 static size_t heapsize = 0;
+static size_t maxheapsize = (size_t)(-1);
 /* Start of heap linker symbol */
 extern char _heap;
@@ -92 +93 @@
         if (incr < 0 && incr+heapsize > heapsize)
                 return NULL;
+        /* Check for user limit */
+        if ((maxheapsize!=(size_t)(-1)) && (heapsize + incr)>maxheapsize) return NULL;
 
         rc = as_area_resize(&_heap, heapsize + incr,0);
@@ -104 +107 @@
         return res;
 }
+
+void *set_maxheapsize(size_t mhs)
+{
+        maxheapsize=mhs;
+        /* Return pointer to area not managed by sbrk */
+        return (void *)&_heap + maxheapsize;
+
+}

libc/generic/io/io.c

@@ -93 +93 @@
         return EOF;
 }
-
+/*
 ssize_t write(int fd, const void * buf, size_t count)
 {
         return (ssize_t) __SYSCALL3(SYS_IO, (sysarg_t) fd, (sysarg_t) buf, (sysarg_t) count);
-}
+}*/
 
 
+
+

libc/generic/libc.c

@@ -32 +32 @@
 #include <malloc.h>
 #include <psthread.h>
+#include <io/stream.h>
+
+int __DONT_OPEN_STDIO__;
 
 /* We should probably merge libc and libipc together */
@@ -42 +45 @@
 void __main(void) {
         tcb_t *tcb;
+        
+        if(!__DONT_OPEN_STDIO__)
+        {
+                open("stdin",0);
+                open("stdout",0);
+                open("stderr",0);
+        }       
         
         tcb = __make_tls();

libc/include/as.h

@@ -32 +32 @@
 #include <types.h>
 #include <task.h>
+#include <kernel/arch/mm/as.h>
 #include <kernel/mm/as.h>
+
+#define USER_ADDRESS_SPACE_SIZE_ARCH (USER_ADDRESS_SPACE_END_ARCH-USER_ADDRESS_SPACE_START_ARCH+1)
 
 extern void *as_area_create(void *address, size_t size, int flags);
 extern int as_area_resize(void *address, size_t size, int flags);
 extern int as_area_destroy(void *address);
+extern void *set_maxheapsize(size_t mhs);
 
 #endif

libc/include/ipc/services.h

@@ -38 +38 @@
 #define SERVICE_FRAME_BUFFER    2
 #define SERVICE_KEYBOARD        3
+#define SERVICE_VIDEO   4
 
 #endif