| /uspace/trunk/libipc/generic/ipc.c |
|---|
| File deleted |
| /uspace/trunk/libipc/Makefile |
|---|
| File deleted |
| /uspace/trunk/libipc/include/ipc.h |
|---|
| File deleted |
| /uspace/trunk/libc/arch/mips32/src/syscall.c |
|---|
| 28,8 → 28,7 |
| #include <libc.h> |
| sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2, |
| const sysarg_t p3, const syscall_t id) |
| sysarg_t __syscall(const syscall_t id, const sysarg_t p1, const sysarg_t p2, const sysarg_t p3) |
| { |
| register sysarg_t __mips_reg_a0 asm("$4") = p1; |
| register sysarg_t __mips_reg_a1 asm("$5") = p2; |
| /uspace/trunk/libc/Makefile |
|---|
| 49,17 → 49,14 |
| GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES))) |
| ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES))) |
| .PHONY: all clean depend kerninc |
| .PHONY: all clean depend |
| all: kerninc libc.a arch/$(ARCH)/_link.ld |
| all: libc.a arch/$(ARCH)/_link.ld |
| kerninc: |
| ln -sf ../../../kernel/generic/include include/kernel |
| -include Makefile.depend |
| clean: |
| -rm -f include/kernel libc.a arch/$(ARCH)/_link.ld Makefile.depend |
| -rm -f libc.a arch/$(ARCH)/_link.ld Makefile.depend |
| find generic/ arch/$(ARCH)/ -name '*.o' -follow -exec rm \{\} \; |
| depend: |
| /uspace/trunk/libc/include/libc.h |
|---|
| 31,17 → 31,21 |
| #include <types.h> |
| #include <kernel/syscall/syscall.h> |
| #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) |
| #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; |
| extern void __main(void); |
| extern void __exit(void); |
| extern sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2, |
| const sysarg_t p3, const syscall_t id); |
| extern sysarg_t __syscall(const syscall_t id, const sysarg_t p1, const sysarg_t p2, const sysarg_t p3); |
| #endif |
| /uspace/trunk/libc/generic/io.c |
|---|
| 47,5 → 47,5 |
| 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); |
| return (ssize_t) __syscall(SYS_IO, (sysarg_t) fd, (sysarg_t) buf, (sysarg_t) count); |
| } |
| /uspace/trunk/init/Makefile |
|---|
| 30,11 → 30,8 |
| # |
| LIBC_PREFIX = ../libc |
| LIBIPC_PREFIX = ../libipc |
| include $(LIBC_PREFIX)/Makefile.toolchain |
| CFLAGS += -I../libipc/include |
| ## Sources |
| # |
| 58,7 → 55,7 |
| $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend |
| $(OUTPUT): $(OBJECTS) |
| $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBC_PREFIX)/libc.a $(LIBIPC_PREFIX)/libipc.a -o $@ -Map $(OUTPUT).map |
| $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBC_PREFIX)/libc.a -o $@ -Map $(OUTPUT).map |
| disasm: |
| $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm |
| /uspace/trunk/init/init.c |
|---|
| 27,13 → 27,9 |
| */ |
| #include "version.h" |
| #include <ipc.h> |
| int main(int argc, char *argv[]) |
| { |
| version_print(); |
| ipc_call_sync(0, 1, 2); |
| return 0; |
| } |
| /uspace/trunk/uspace.config |
|---|
| 2,8 → 2,8 |
| # Architecture |
| @ "ia32" Intel IA-32 |
| @ "ia64" Intel IA-64 |
| @ "amd64" AMD64/Intel EM64T |
| @ "ia64" Intel IA-64 |
| @ "mips32" MIPS 32-bit Little Endian |
| @ "mips32eb" MIPS 32-bit Big Endian |
| ! ARCH (choice) |
| /uspace/trunk/Makefile |
|---|
| 33,7 → 33,6 |
| DIRS = \ |
| libc \ |
| libipc \ |
| init \ |
| softfloat |