From 3aef6957c38c5f6fcdcadc878ae16fb690485f95 Mon Sep 17 00:00:00 2001 From: Richard Braun Date: Sun, 25 Nov 2012 23:12:41 +0100 Subject: Move DDE to pthreads Makefiles, headers, types, macros and function calls are renamed where appropriate. ds_server now takes a void* and returns a void*. * dde26_test/Makefile: Switch from cthreads to pthreads. * dde_e100/Makefile: Likewise. * dde_e100/main.c: Likewise. * dde26_test/Makefile: Likewise. * dde_e100/Makefile: Likewise. * dde_e100/main.c: Likewise. * dde_e1000/Makefile: Likewise. * dde_e1000/main.c: Likewise. * dde_ne2k_pci/Makefile: Likewise. * dde_ne2k_pci/main.c: Likewise. * dde_pcnet32/Makefile: Likewise. * dde_pcnet32/main.c: Likewise. * dde_pcnet32_test/Makefile: Likewise. * dde_rtl8139/Makefile: Likewise. * dde_rtl8139/main.c: Likewise. * libbpf/Makefile: Likewise. * libddekit/Makefile: Likewise. * libddekit/condvar.c: Likewise. * libddekit/lock.c: Likewise. * libddekit/pgtab.c: Likewise. * libddekit/thread.c: Likewise. * libddekit/timer.c: Likewise. * libhurd-slab/Makefile: Likewise. * libhurd-slab/slab.c: Likewise. * libhurd-slab/slab.h: Likewise. * libmachdev/Makefile: Likewise. * libmachdev/dev_hdr.h: Likewise. * libmachdev/ds_routines.c: Likewise. * libmachdev/if_hdr.h: Likewise. * libmachdev/io_req.h: Likewise. * libmachdev/machdev.h: Likewise. * libmachdev/net.c: Likewise. * libmachdev/queue.h: Likewise. --- dde_rtl8139/Makefile | 2 +- dde_rtl8139/main.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'dde_rtl8139') diff --git a/dde_rtl8139/Makefile b/dde_rtl8139/Makefile index f2c49547..95b6fa0a 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 -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path) +LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -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; -- cgit v1.2.3