Merge network device headers to network.h

2024-02-18 20:02:01 +03:00
parent 0b5bf60aaf
commit fc63c26e04
17 changed files with 58 additions and 161 deletions
--- a/src/network/net_3c501.c
+++ b/src/network/net_3c501.c
@@ -56,7 +56,6 @@
 #include <86box/thread.h>
 #include <86box/timer.h>
 #include <86box/network.h>
-#include <86box/net_3c501.h>
 #include <86box/bswap.h>
 #include <86box/plat_unused.h>

--- a/src/network/net_3c503.c
+++ b/src/network/net_3c503.c
@@ -60,7 +60,6 @@
 #include <86box/timer.h>
 #include <86box/network.h>
 #include <86box/net_dp8390.h>
-#include <86box/net_3c503.h>
 #include <86box/bswap.h>
 #include <86box/plat_unused.h>

--- a/src/network/net_plip.c
+++ b/src/network/net_plip.c
@@ -34,7 +34,6 @@
 #include <86box/thread.h>
 #include <86box/timer.h>
 #include <86box/network.h>
-#include <86box/net_plip.h>
 #include <86box/plat_unused.h>

 enum {
--- a/src/network/net_rtl8139.c
+++ b/src/network/net_rtl8139.c
@@ -43,7 +43,6 @@
 #include <86box/bswap.h>
 #include <86box/nvr.h>
 #include "cpu.h"
-#include <86box/net_rtl8139.h>
 #include <86box/plat_unused.h>

 #define PCI_PERIOD 30 /* 30 ns period = 33.333333 Mhz frequency */
--- a/src/network/net_tulip.c
+++ b/src/network/net_tulip.c
@@ -32,7 +32,6 @@
 #include <86box/thread.h>
 #include <86box/network.h>
 #include <86box/net_eeprom_nmc93cxx.h>
-#include <86box/net_tulip.h>
 #include <86box/bswap.h>
 #include <86box/plat_fallthrough.h>
 #include <86box/plat_unused.h>
--- a/src/network/network.c
+++ b/src/network/network.c
@@ -67,14 +67,9 @@
 #include <86box/ui.h>
 #include <86box/timer.h>
 #include <86box/network.h>
-#include <86box/net_3c501.h>
-#include <86box/net_3c503.h>
 #include <86box/net_ne2000.h>
 #include <86box/net_pcnet.h>
-#include <86box/net_plip.h>
 #include <86box/net_wd8003.h>
-#include <86box/net_tulip.h>
-#include <86box/net_rtl8139.h>

 #ifdef _WIN32
 #    define WIN32_LEAN_AND_MEAN