summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/netdev/taptun.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd/modules/netdev/taptun.cpp')
-rw-r--r--src/osd/modules/netdev/taptun.cpp25
1 files changed, 17 insertions, 8 deletions
diff --git a/src/osd/modules/netdev/taptun.cpp b/src/osd/modules/netdev/taptun.cpp
index 10ca76fb2d0..a1b8d4d84ce 100644
--- a/src/osd/modules/netdev/taptun.cpp
+++ b/src/osd/modules/netdev/taptun.cpp
@@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Carl
+#include "netdev_module.h"
+
+#include "modules/osdmodule.h"
+
#if defined(OSD_NET_USE_TAPTUN)
#if defined(_WIN32)
@@ -16,8 +20,6 @@
#include "emu.h"
#include "dinetwork.h"
#include "osdnet.h"
-#include "modules/osdmodule.h"
-#include "netdev_module.h"
#include "unicode.h"
#ifdef __linux__
@@ -32,6 +34,10 @@
#define PRODUCT_TAP_WIN_COMPONENT_ID "tap0901"
#endif
+namespace osd {
+
+namespace {
+
// Ethernet minimum frame length
static constexpr int ETHERNET_MIN_FRAME = 64;
@@ -44,7 +50,7 @@ public:
}
virtual ~taptun_module() { }
- virtual int init(const osd_options &options);
+ virtual int init(osd_interface &osd, const osd_options &options);
virtual void exit();
virtual bool probe() { return true; }
@@ -343,7 +349,7 @@ static CREATE_NETDEV(create_tap)
return dynamic_cast<osd_netdev *>(dev);
}
-int taptun_module::init(const osd_options &options)
+int taptun_module::init(osd_interface &osd, const osd_options &options)
{
#if defined(_WIN32)
for (std::wstring &id : get_tap_adapters())
@@ -359,13 +365,16 @@ void taptun_module::exit()
clear_netdev();
}
+} // anonymous namespace
+
+} // namespace osd
+
#else
- #include "modules/osdmodule.h"
- #include "netdev_module.h"
- MODULE_NOT_SUPPORTED(taptun_module, OSD_NETDEV_PROVIDER, "taptun")
+namespace osd { namespace { MODULE_NOT_SUPPORTED(taptun_module, OSD_NETDEV_PROVIDER, "taptun") } }
+
#endif
-MODULE_DEFINITION(NETDEV_TAPTUN, taptun_module)
+MODULE_DEFINITION(NETDEV_TAPTUN, osd::taptun_module)