Fix calling machdevdde

* libmachdevdde/net.c (register_net): Rename to machdevdde_register_net.
* libmachdevdde/machdevdde.h (machdevdde_register_net): Add prototype.
* dde_e100/main.c: Include <hurd/machdevdde.h>.
(main): Call machdevdde_register_net instead of register_net, call
machdev_device_init instead of mach_device_init, call machdev_trivfs_init
instead of trivfs_init, call machdevdde_server instead of ds_server, call
machdev_trivfs_server instead of trivfs_server.
* dde_e1000/main.c: Likewise.
* dde_ne2k_pci/main.c: Likewise.
* dde_pcnet32/main.c: Likewise.
* dde_rtl8139/main.c: Likewise.

7 files changed, 32 insertions, 26 deletions

diff --git a/dde_e100/main.c b/dde_e100/main.c
index df8df1eb4..b88cf1e01 100644
--- a/dde_e100/main.c
+++ b/dde_e100/main.c
@@ -7,6 +7,7 @@
 #include <linux/delay.h> // msleep()
 
 #include <hurd/machdev.h>
+#include <hurd/machdevdde.h>
 
 int using_std = 1;
 
@@ -23,13 +24,13 @@ int main(int argc, char **argv)
 
 	l4dde26_do_initcalls();
 
-	register_net();
-	mach_device_init();
-	trivfs_init();
+	machdevdde_register_net();
+	machdev_device_init();
+	machdev_trivfs_init();
 
-	pthread_create (&thread, NULL, ds_server, NULL);
+	pthread_create (&thread, NULL, machdevdde_server, NULL);
 	pthread_detach (thread);
-	trivfs_server();
+	machdev_trivfs_server();
 
 	return 0;
 }
diff --git a/dde_e1000/main.c b/dde_e1000/main.c
index df8df1eb4..b88cf1e01 100644
--- a/dde_e1000/main.c
+++ b/dde_e1000/main.c
@@ -7,6 +7,7 @@
 #include <linux/delay.h> // msleep()
 
 #include <hurd/machdev.h>
+#include <hurd/machdevdde.h>
 
 int using_std = 1;
 
@@ -23,13 +24,13 @@ int main(int argc, char **argv)
 
 	l4dde26_do_initcalls();
 
-	register_net();
-	mach_device_init();
-	trivfs_init();
+	machdevdde_register_net();
+	machdev_device_init();
+	machdev_trivfs_init();
 
-	pthread_create (&thread, NULL, ds_server, NULL);
+	pthread_create (&thread, NULL, machdevdde_server, NULL);
 	pthread_detach (thread);
-	trivfs_server();
+	machdev_trivfs_server();
 
 	return 0;
 }
diff --git a/dde_ne2k_pci/main.c b/dde_ne2k_pci/main.c
index df8df1eb4..b88cf1e01 100644
--- a/dde_ne2k_pci/main.c
+++ b/dde_ne2k_pci/main.c
@@ -7,6 +7,7 @@
 #include <linux/delay.h> // msleep()
 
 #include <hurd/machdev.h>
+#include <hurd/machdevdde.h>
 
 int using_std = 1;
 
@@ -23,13 +24,13 @@ int main(int argc, char **argv)
 
 	l4dde26_do_initcalls();
 
-	register_net();
-	mach_device_init();
-	trivfs_init();
+	machdevdde_register_net();
+	machdev_device_init();
+	machdev_trivfs_init();
 
-	pthread_create (&thread, NULL, ds_server, NULL);
+	pthread_create (&thread, NULL, machdevdde_server, NULL);
 	pthread_detach (thread);
-	trivfs_server();
+	machdev_trivfs_server();
 
 	return 0;
 }
diff --git a/dde_pcnet32/main.c b/dde_pcnet32/main.c
index df8df1eb4..b88cf1e01 100644
--- a/dde_pcnet32/main.c
+++ b/dde_pcnet32/main.c
@@ -7,6 +7,7 @@
 #include <linux/delay.h> // msleep()
 
 #include <hurd/machdev.h>
+#include <hurd/machdevdde.h>
 
 int using_std = 1;
 
@@ -23,13 +24,13 @@ int main(int argc, char **argv)
 
 	l4dde26_do_initcalls();
 
-	register_net();
-	mach_device_init();
-	trivfs_init();
+	machdevdde_register_net();
+	machdev_device_init();
+	machdev_trivfs_init();
 
-	pthread_create (&thread, NULL, ds_server, NULL);
+	pthread_create (&thread, NULL, machdevdde_server, NULL);
 	pthread_detach (thread);
-	trivfs_server();
+	machdev_trivfs_server();
 
 	return 0;
 }
diff --git a/dde_rtl8139/main.c b/dde_rtl8139/main.c
index 7007b075a..02e79d54b 100644
--- a/dde_rtl8139/main.c
+++ b/dde_rtl8139/main.c
@@ -7,6 +7,7 @@
 #include <linux/delay.h> // msleep()
 
 #include <hurd/machdev.h>
+#include <hurd/machdevdde.h>
 
 int using_std = 1;
 
@@ -23,13 +24,13 @@ int main(int argc, char **argv)
 
 	l4dde26_do_initcalls();
 
-	register_net();
-	mach_device_init();
-	trivfs_init();
+	machdevdde_register_net();
+	machdev_device_init();
+	machdev_trivfs_init();
 
-	pthread_create (&thread, NULL, ds_server, NULL;
+	pthread_create (&thread, NULL, machdevdde_server, NULL;
 	pthread_detach (thread);
-	trivfs_server();
+	machdev_trivfs_server();
 
 	return 0;
 }
diff --git a/libmachdevdde/machdevdde.h b/libmachdevdde/machdevdde.h
index 2b26a9c90..e7e830f99 100644
--- a/libmachdevdde/machdevdde.h
+++ b/libmachdevdde/machdevdde.h
@@ -23,6 +23,7 @@
 #ifndef __MACHDEVDDE_H__
 #define __MACHDEVDDE_H__
 
+void machdevdde_register_net(void);
 void * machdevdde_server(void *arg);
 
 #endif
diff --git a/libmachdevdde/net.c b/libmachdevdde/net.c
index 585c97259..613ee48f1 100644
--- a/libmachdevdde/net.c
+++ b/libmachdevdde/net.c
@@ -654,7 +654,7 @@ static struct machdev_device_emulation_ops linux_net_emulation_ops =
   NULL
 };
 
-void register_net()
+void machdevdde_register_net()
 {
   machdev_register (&linux_net_emulation_ops);
 }