Changeset b419162 in mainline

Timestamp:

2006-03-13T19:37:24Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

7fc78da

Parents:

a3aa1e1

Message:

Added very basic IPC userspace stuff.

Files:

• Makefile (modified) (1 diff)
• init/Makefile (modified) (2 diffs)
• init/init.c (modified) (1 diff)
• libc/Makefile (modified) (1 diff)
• libc/arch/mips32/src/syscall.c (modified) (1 diff)
• libc/generic/io.c (modified) (1 diff)
• libc/include/libc.h (modified) (1 diff)
• libipc/Makefile (added)
• libipc/generic/ipc.c (added)
• libipc/include/ipc.h (added)
• uspace.config (modified) (1 diff)

Makefile

@@ -34 +34 @@
 DIRS = \
         libc \
+        libipc \
         init \
         softfloat

init/Makefile

@@ -31 +31 @@
 
 LIBC_PREFIX = ../libc
+LIBIPC_PREFIX = ../libipc
 include $(LIBC_PREFIX)/Makefile.toolchain
+
+CFLAGS += -I../libipc/include
 
 ## Sources
@@ -56 +59 @@
 
 $(OUTPUT): $(OBJECTS)
-        $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBC_PREFIX)/libc.a -o $@ -Map $(OUTPUT).map
+        $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBC_PREFIX)/libc.a $(LIBIPC_PREFIX)/libipc.a -o $@ -Map $(OUTPUT).map
 
 disasm:

init/init.c

@@ -28 +28 @@
 
 #include "version.h"
+#include <ipc.h>
 
 int main(int argc, char *argv[])
 {
         version_print();
+
+        ipc_call_sync(0, 1, 2);
+
         return 0;
 }

libc/Makefile

@@ -50 +50 @@
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
 
-.PHONY: all clean depend
+.PHONY: all clean depend kerninc
 
-all: libc.a arch/$(ARCH)/_link.ld
+all: kerninc libc.a arch/$(ARCH)/_link.ld
+
+kerninc:
+        ln -sf ../../../kernel/generic/include include/kernel
 
 -include Makefile.depend
 
 clean:
-        -rm -f libc.a arch/$(ARCH)/_link.ld Makefile.depend
+        -rm -f include/kernel libc.a arch/$(ARCH)/_link.ld Makefile.depend
         find generic/ arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \;
 

libc/arch/mips32/src/syscall.c

@@ -29 +29 @@
 #include <libc.h>
 
-sysarg_t __syscall(const syscall_t id, const sysarg_t p1, const sysarg_t p2, const sysarg_t p3)
+sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2, 
+                   const sysarg_t p3, const syscall_t id)
 {
         register sysarg_t __mips_reg_a0 asm("$4") = p1;

libc/generic/io.c

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

libc/include/libc.h

@@ -32 +32 @@
 #include <types.h>
 
+#include <kernel/syscall/syscall.h>
 
-#define __SYSCALL0(id) __syscall(id, 0, 0, 0)
-#define __SYSCALL1(id, p1) __syscall(id, p1, 0, 0)
-#define __SYSCALL2(id, p1, p2) __syscall(id, p1, p2, 0)
-
-
-typedef enum {
-        SYS_CTL = 0,
-        SYS_IO  = 1
-} syscall_t;
-
+#define __SYSCALL0(id) __syscall(0, 0, 0, id)
+#define __SYSCALL1(id, p1) __syscall(p1, 0, 0, id)
+#define __SYSCALL2(id, p1, p2) __syscall(p1, p2, 0, id)
+#define __SYSCALL3(id, p1, p2, p3) __syscall(p1,p2,p3,id)
 
 extern void __main(void);
 extern void __exit(void);
-extern sysarg_t __syscall(const syscall_t id, const sysarg_t p1, const sysarg_t p2, const sysarg_t p3);
+extern sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2, 
+                          const sysarg_t p3, const syscall_t id);
 
 

uspace.config

@@ -3 +3 @@
 # Architecture
 @ "ia32" Intel IA-32
+@ "amd64" AMD64/Intel EM64T
 @ "ia64" Intel IA-64
-@ "amd64" AMD64/Intel EM64T
 @ "mips32" MIPS 32-bit Little Endian
 @ "mips32eb" MIPS 32-bit Big Endian