secc
/
l4ka-pistachio
mirror of https://github.com/l4ka/pistachio.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow sigma0.h to be used from pure C. Kudos to Вульф амовски.

This commit is contained in:
Jan Stoess 2010-07-12 18:18:01 +02:00
parent 2a76a4e641
commit 452b9b8f16
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
user/Mk/l4.build.mk
View File

@ -59,7 +59,7 @@ OBJS+= ${filter %crt0.o crt0%, $(_OBJS)} \
.c.o: $(MKFILE_DEPS) .c.o: $(MKFILE_DEPS)
@$(ECHO_MSG) `echo $< | sed s,^$(top_srcdir)/,,` @$(ECHO_MSG) `echo $< | sed s,^$(top_srcdir)/,,`
$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ $(CC) $(CPPFLAGS) $(CFLAGS) -std=c99 -c $< -o $@
.S.o: $(MKFILE_DEPS) .S.o: $(MKFILE_DEPS)
@$(ECHO_MSG) `echo $< | sed s,^$(top_srcdir)/,,` @$(ECHO_MSG) `echo $< | sed s,^$(top_srcdir)/,,`

4
user/include/l4/sigma0.h
View File

@ -117,7 +117,7 @@ L4_INLINE void *L4_Sigma0_GetSpecial(L4_Word_t type, void* address, L4_Word_t pa
address = (void *) start; address = (void *) start;
} }
if ( L4_Myself() == sigma0 ) if ( L4_IsThreadEqual(L4_Myself(), sigma0) )
return 0; return 0;
@ -128,7 +128,7 @@ L4_INLINE void *L4_Sigma0_GetSpecial(L4_Word_t type, void* address, L4_Word_t pa
L4_Fpage_t rcvfpage = L4_Fpage( rcvstart, pagesize ); L4_Fpage_t rcvfpage = L4_Fpage( rcvstart, pagesize );
fpage.X.rwx = L4_ReadWriteOnly; fpage.X.rwx = L4_ReadWriteOnly;
fpage = L4_Sigma0_GetPage( sigma0, fpage, rcvfpage ); fpage = L4_Sigma0_GetPage_RcvWindow( sigma0, fpage, rcvfpage );
if( L4_IsNilFpage(fpage) ) if( L4_IsNilFpage(fpage) )
return address; return address;