diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-26 00:03:30 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-26 00:03:30 +0000 |
| commit | eaa76a8dee2236d7f3f493ada113576d0e47f453 (patch) | |
| tree | c7be406c4f644834b7be5a1d8de338f04a979818 /dde_e1000 | |
| parent | 0fd99adfaf0255df26a540817e9eb09a456aeb45 (diff) | |
| parent | 393b762d63721cfb68e7efe54578370c18c7d0d3 (diff) | |
Merge branch 'upstream-merged'
Diffstat (limited to 'dde_e1000')
| -rw-r--r-- | dde_e1000/Makefile | 2 | ||||
| -rw-r--r-- | dde_e1000/main.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/dde_e1000/Makefile b/dde_e1000/Makefile index fecd94d4..e0a1524b 100644 --- a/dde_e1000/Makefile +++ b/dde_e1000/Makefile @@ -7,7 +7,7 @@ TARGET = dde_e1000 SRC_C = main.c e1000_ethtool.c e1000_hw.c e1000_main.c e1000_param.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_e1000/main.c b/dde_e1000/main.c index 98f4452a..df8df1eb 100644 --- a/dde_e1000/main.c +++ b/dde_e1000/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; |