Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 953 → Rev 954

/uspace/trunk/libipc/include/ipc.h
0,0 → 1,43
/*
* Copyright (C) 2006 Ondrej Palkovsky
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* - The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
#ifndef __LIBIPC_IPC_H__
#define __LIBIPC_IPC_H__
 
#include <kernel/ipc/ipc.h>
#include <libc.h>
 
typedef sysarg_t ipc_data_t[IPC_CALL_LEN];
typedef sysarg_t ipc_callid_t;
 
 
extern int ipc_call_sync(int phoneid, int arg1, int arg2);
extern int ipc_wait_for_call(ipc_data_t *data, int flags);
 
 
#endif
/uspace/trunk/libipc/generic/ipc.c
0,0 → 1,73
/*
* Copyright (C) 2006 Ondrej Palkovsky
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* - The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
#include <ipc.h>
#include <libc.h>
 
static inline ipc_callid_t _ipc_call(int phoneid, int arg1, int arg2)
{
__SYSCALL3(SYS_IPC_CALL, phoneid, arg1, arg2);
}
 
int ipc_call_sync(int phoneid, int arg1, int arg2)
{
ipc_data_t resdata;
 
_ipc_call(phoneid, arg1, arg2);
ipc_wait_for_call(&resdata,0);
}
 
/*
int ipc_call_async()
{
}
 
int ipc_answer()
{
}
*/
 
/** Call syscall function sys_ipc_wait_for_call */
static inline ipc_callid_t _ipc_wait_for_call(ipc_data_t *data, int flags)
{
return __SYSCALL2(SYS_IPC_WAIT, (sysarg_t)data, flags);
}
 
/** Wait for IPC call and return
*
* - dispatch ASYNC reoutines in the background
*/
int ipc_wait_for_call(ipc_data_t *data, int flags)
{
ipc_callid_t callid;
 
callid = _ipc_wait_for_call(data, flags);
/* TODO: Handle async replies etc.. */
return callid;
}
/uspace/trunk/libipc/Makefile
0,0 → 1,73
#
# Copyright (C) 2005 Martin Decky
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# - Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# - Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# - The name of the author may not be used to endorse or promote products
# derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
 
## Common compiler flags
#
 
LIBC_PREFIX = ../libc
 
## Setup toolchain
#
 
include $(LIBC_PREFIX)/Makefile.toolchain
 
CFLAGS += -Iinclude
 
## Sources
#
 
GENERIC_SOURCES = \
generic/ipc.c
ARCH_SOURCES =
 
GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
 
.PHONY: all clean depend
 
all: libipc.a
 
-include Makefile.depend
 
clean:
-rm -f libipcc.a Makefile.depend
find generic/ -name '*.o' -follow -exec rm \{\} \;
 
depend:
$(CC) $(DEFS) $(CFLAGS) -M $(ARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend
 
libipc.a: depend $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
$(AR) rc libipc.a $(ARCH_OBJECTS) $(GENERIC_OBJECTS)
 
%.o: %.S
$(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
 
%.o: %.s
$(AS) $(AFLAGS) $< -o $@
 
%.o: %.c
$(CC) $(DEFS) $(CFLAGS) -c $< -o $@
/uspace/trunk/init/init.c
27,9 → 27,13
*/
 
#include "version.h"
#include <ipc.h>
 
int main(int argc, char *argv[])
{
version_print();
 
ipc_call_sync(0, 1, 2);
 
return 0;
}
/uspace/trunk/init/Makefile
30,8 → 30,11
#
 
LIBC_PREFIX = ../libc
LIBIPC_PREFIX = ../libipc
include $(LIBC_PREFIX)/Makefile.toolchain
 
CFLAGS += -I../libipc/include
 
## Sources
#
 
55,7 → 58,7
$(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 
$(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:
$(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
/uspace/trunk/uspace.config
2,8 → 2,8
 
# 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
! ARCH (choice)
/uspace/trunk/libc/include/libc.h
31,21 → 31,17
 
#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)
#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)
 
 
typedef enum {
SYS_CTL = 0,
SYS_IO = 1
} syscall_t;
 
 
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);
 
 
#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) __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);
}
/uspace/trunk/libc/Makefile
49,14 → 49,17
GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
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 \{\} \;
 
depend:
/uspace/trunk/libc/arch/mips32/src/syscall.c
28,7 → 28,8
 
#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;
register sysarg_t __mips_reg_a1 asm("$5") = p2;
/uspace/trunk/Makefile
33,6 → 33,7
 
DIRS = \
libc \
libipc \
init \
softfloat