diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-25 23:49:58 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-25 23:49:58 +0000 |
commit | 4ba1188ef5ef2caf46cfedb522e83abf9d59fc54 (patch) | |
tree | 38588eaa8b400d7abf384a17e21dea75b104b177 /dde_ne2k_pci | |
parent | 26221ccfc107472e3be0de79817efcd296d052a3 (diff) | |
parent | 36318d1929e9437df0402a78ff63a70f78d6a89e (diff) |
Merge branch 'dde' into dde-clean
Diffstat (limited to 'dde_ne2k_pci')
-rw-r--r-- | dde_ne2k_pci/Makefile | 2 | ||||
-rw-r--r-- | dde_ne2k_pci/main.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/dde_ne2k_pci/Makefile b/dde_ne2k_pci/Makefile index 5bb27da9..932d5ad0 100644 --- a/dde_ne2k_pci/Makefile +++ b/dde_ne2k_pci/Makefile @@ -9,7 +9,7 @@ TARGET = dde_ne2k_pci SRC_C = main.c ne2k-pci.c 8390.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_ne2k_pci/main.c b/dde_ne2k_pci/main.c index 98f4452a..df8df1eb 100644 --- a/dde_ne2k_pci/main.c +++ b/dde_ne2k_pci/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; |