diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-25 23:58:08 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-25 23:58:08 +0000 |
commit | 630bf55d4bcd45540ca397d6b83c9465380dd008 (patch) | |
tree | 56ead8cdd2b5595b57d1dad38f24b08657c6f413 /dde_e100 | |
parent | b474ef57e5e75f798250c42e88639fc25595142b (diff) | |
parent | 4ba1188ef5ef2caf46cfedb522e83abf9d59fc54 (diff) |
Merge branch 'dde-clean' into upstream-merged
Diffstat (limited to 'dde_e100')
-rw-r--r-- | dde_e100/Makefile | 2 | ||||
-rw-r--r-- | dde_e100/main.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/dde_e100/Makefile b/dde_e100/Makefile index eaed375f..1f3c4c03 100644 --- a/dde_e100/Makefile +++ b/dde_e100/Makefile @@ -7,7 +7,7 @@ TARGET = dde_e100 SRC_C = main.c e100.c -LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lz -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path) +LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lz -lpthread -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path) CFLAGS += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include # DDE configuration diff --git a/dde_e100/main.c b/dde_e100/main.c index 98f4452a..df8df1eb 100644 --- a/dde_e100/main.c +++ b/dde_e100/main.c @@ -12,6 +12,8 @@ int using_std = 1; int main(int argc, char **argv) { + pthread_t thread; + l4dde26_init(); l4dde26_process_init(); l4dde26_softirq_init(); @@ -25,7 +27,8 @@ int main(int argc, char **argv) mach_device_init(); trivfs_init(); - cthread_detach (cthread_fork (ds_server, NULL)); + pthread_create (&thread, NULL, ds_server, NULL); + pthread_detach (thread); trivfs_server(); return 0; |