diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-25 23:49:29 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-25 23:49:29 +0000 |
| commit | 36318d1929e9437df0402a78ff63a70f78d6a89e (patch) | |
| tree | 38588eaa8b400d7abf384a17e21dea75b104b177 /dde_rtl8139 | |
| parent | eaa21da4ea94937a1bc2157c042a233d524d17ce (diff) | |
| parent | d261675a592f6109826ccbdb07c7f485c4c88683 (diff) | |
Merge branch 'dde-upstream' into dde
Conflicts:
dde_e100/Makefile
dde_e1000/Makefile
dde_ne2k_pci/Makefile
dde_pcnet32/Makefile
dde_rtl8139/Makefile
Diffstat (limited to 'dde_rtl8139')
| -rw-r--r-- | dde_rtl8139/Makefile | 2 | ||||
| -rw-r--r-- | dde_rtl8139/main.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/dde_rtl8139/Makefile b/dde_rtl8139/Makefile index 0a9b1b71..91a7df93 100644 --- a/dde_rtl8139/Makefile +++ b/dde_rtl8139/Makefile @@ -9,7 +9,7 @@ TARGET = dde_rtl8139 SRC_C = main.c 8139cp.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_rtl8139/main.c b/dde_rtl8139/main.c index 98f4452a..7007b075 100644 --- a/dde_rtl8139/main.c +++ b/dde_rtl8139/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; |