Windows compatibility fixes

Author: vertexodessa

CMakeLists.txt

@@ -1,70 +1,68 @@
 cmake_minimum_required(VERSION 3.15)
 
-# This should go before project declaration.
-if (WIN32)
+# Set the toolchain file for vcpkg on Windows.
+if(WIN32)
     set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake")
-endif ()
+endif()
 
 project(Rtl8812auNet)
 
-# the `pkg_check_modules` function is created with this call
+# Find pkg-config and then use it to locate libusb.
 find_package(PkgConfig REQUIRED)
-
-# this calls create special `PkgConfig::LIBUSB` variables
-pkg_check_modules(LIBUSB REQUIRED IMPORTED_TARGET libusb-1.0)
+pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0)
 
 add_library(WiFiDriver
-        src/logger.h
+    src/logger.h
 
-        hal/Hal8812PhyReg.h
-        hal/Hal8812PwrSeq.c
-        hal/Hal8812PwrSeq.h
-        hal/basic_types.h
-        hal/hal8812a_fw.c
-        hal/hal8812a_fw.h
-        hal/hal_com_reg.h
-        hal/rtl8812a_hal.h
-        hal/rtl8812a_recv.h
-        hal/rtl8812a_spec.h
+    hal/Hal8812PhyReg.h
+    hal/Hal8812PwrSeq.c
+    hal/Hal8812PwrSeq.h
+    hal/basic_types.h
+    hal/hal8812a_fw.c
+    hal/hal8812a_fw.h
+    hal/hal_com_reg.h
+    hal/rtl8812a_hal.h
+    hal/rtl8812a_recv.h
+    hal/rtl8812a_spec.h
 
-        src/ieee80211_radiotap.h
-        src/EepromManager.cpp
-        src/EepromManager.h
-        src/Firmware.h
-        src/FirmwareManager.cpp
-        src/FirmwareManager.h
-        src/FrameParser.cpp
-        src/FrameParser.h
-        src/HalModule.cpp
-        src/HalModule.h
-        src/ParsedRadioPacket.cpp
-        src/RadioManagementModule.cpp
-        src/RadioManagementModule.h
-        src/Radiotap.c
-        src/Rtl8812aDevice.cpp
-        src/Rtl8812aDevice.h
-        src/RtlUsbAdapter.cpp
-        src/RtlUsbAdapter.h
-        src/SelectedChannel.h
-        src/WiFiDriver.cpp
-        src/WiFiDriver.h
-        src/registry_priv.h
+    src/ieee80211_radiotap.h
+    src/EepromManager.cpp
+    src/EepromManager.h
+    src/Firmware.h
+    src/FirmwareManager.cpp
+    src/FirmwareManager.h
+    src/FrameParser.cpp
+    src/FrameParser.h
+    src/HalModule.cpp
+    src/HalModule.h
+    src/ParsedRadioPacket.cpp
+    src/RadioManagementModule.cpp
+    src/RadioManagementModule.h
+    src/Radiotap.c
+    src/Rtl8812aDevice.cpp
+    src/Rtl8812aDevice.h
+    src/RtlUsbAdapter.cpp
+    src/RtlUsbAdapter.h
+    src/SelectedChannel.h
+    src/WiFiDriver.cpp
+    src/WiFiDriver.h
+    src/registry_priv.h
 )
 
 target_compile_features(WiFiDriver PUBLIC cxx_std_20)
 
-target_link_libraries(WiFiDriver PUBLIC
-        PkgConfig::LIBUSB
-)
+# Link WiFiDriver with libusb as found via pkg-config.
+target_link_libraries(WiFiDriver PUBLIC PkgConfig::libusb)
 
 target_include_directories(WiFiDriver PUBLIC hal)
 target_include_directories(WiFiDriver PUBLIC src)
 
 add_executable(WiFiDriverDemo
-        demo/main.cpp)
-
+    demo/main.cpp
+)
 target_link_libraries(WiFiDriverDemo PUBLIC WiFiDriver)
 
 add_executable(WiFiDriverTxDemo
-        txdemo/main.cpp)
-target_link_libraries(WiFiDriverTxDemo PUBLIC WiFiDriver)
+    txdemo/main.cpp
+)
+target_link_libraries(WiFiDriverTxDemo PUBLIC WiFiDriver PRIVATE PkgConfig::libusb)

src/FrameParser.h

@@ -374,7 +374,7 @@ struct pkt_attrib
     u8 rtsen;
     u8 cts2self;
     union Keytype dot11tkiptxmickey;
-    /* union Keytype	dot11tkiprxmickey; */
+    /* union Keytype  dot11tkiprxmickey; */
     union Keytype dot118021x_UncstKey;
 
     // #ifdef CONFIG_TDLS
@@ -400,6 +400,9 @@ struct pkt_attrib
     u8 inject; /* == a5 if injected */
 };
 
+#if defined(_MSC_VER)
+#pragma pack(push, 1)
+#endif
 struct rtw_ieee80211_hdr
 {
     u16 frame_ctl;
@@ -408,9 +411,18 @@ struct rtw_ieee80211_hdr
     u8 addr2[ETH_ALEN];
     u8 addr3[ETH_ALEN];
     u16 seq_ctl;
-    u8 addr4[ETH_ALEN];
-} __attribute__((packed));
+}
+#if !defined(_MSC_VER)
+ __attribute__((packed))
+#endif
+;
+#if defined(_MSC_VER)
+#pragma pack(pop)
+#endif
 
+#if defined(_MSC_VER)
+#pragma pack(push, 1)
+#endif
 struct rtw_ieee80211_hdr_3addr
 {
     u16 frame_ctl;
@@ -419,8 +431,18 @@ struct rtw_ieee80211_hdr_3addr
     u8 addr2[ETH_ALEN];
     u8 addr3[ETH_ALEN];
     u16 seq_ctl;
-} __attribute__((packed));
+}
+#if !defined(_MSC_VER)
+ __attribute__((packed))
+#endif
+;
+#if defined(_MSC_VER)
+#pragma pack(pop)
+#endif
 
+#if defined(_MSC_VER)
+#pragma pack(push, 1)
+#endif
 struct rtw_ieee80211_hdr_qos
 {
     u16 frame_ctl;
@@ -431,8 +453,18 @@ struct rtw_ieee80211_hdr_qos
     u16 seq_ctl;
     u8 addr4[ETH_ALEN];
     u16 qc;
-} __attribute__((packed));
+}
+#if !defined(_MSC_VER)
+ __attribute__((packed))
+#endif
+;
+#if defined(_MSC_VER)
+#pragma pack(pop)
+#endif
 
+#if defined(_MSC_VER)
+#pragma pack(push, 1)
+#endif
 struct rtw_ieee80211_hdr_3addr_qos
 {
     u16 frame_ctl;
@@ -442,16 +474,33 @@ struct rtw_ieee80211_hdr_3addr_qos
     u8 addr3[ETH_ALEN];
     u16 seq_ctl;
     u16 qc;
-} __attribute__((packed));
+}
+#if !defined(_MSC_VER)
+ __attribute__((packed))
+#endif
+;
+#if defined(_MSC_VER)
+#pragma pack(pop)
+#endif
 
+#if defined(_MSC_VER)
+#pragma pack(push, 1)
+#endif
 struct eapol
 {
     u8 snap[6];
     u16 ethertype;
     u8 version;
     u8 type;
     u16 length;
-} __attribute__((packed));
+}
+#if !defined(_MSC_VER)
+ __attribute__((packed))
+#endif
+;
+#if defined(_MSC_VER)
+#pragma pack(pop)
+#endif
 
 struct tx_desc
 {

src/HalModule.cpp

@@ -7,6 +7,7 @@
 #include "rtl8812a_hal.h"
 #include "rtl8812a_spec.h"
 
+#include <chrono>
 #include <memory>
 #include <thread>
 

src/RadioManagementModule.cpp

@@ -2,6 +2,7 @@
 #include "Hal8812PhyReg.h"
 #include "registry_priv.h"
 
+#include <chrono>
 #include <map>
 #include <thread>
 #include <vector>