diff options
| author | 2017-07-17 09:51:40 -0500 | |
|---|---|---|
| committer | 2017-08-27 10:48:15 -0500 | |
| commit | f64cd87604b7a760e2832c76938d83ec6a284b22 (patch) | |
| tree | 3c8e4edab708ac8123e285566595d8a380d864cf /src | |
| parent | Services/UDS: Handle the connection sequence packets. (diff) | |
| download | yuzu-f64cd87604b7a760e2832c76938d83ec6a284b22.tar.gz yuzu-f64cd87604b7a760e2832c76938d83ec6a284b22.tar.xz yuzu-f64cd87604b7a760e2832c76938d83ec6a284b22.zip | |
Services/UDS: Remove an old duplicated declaration of WifiPacket.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/nwm/uds_beacon.cpp | 3 | ||||
| -rw-r--r-- | src/core/hle/service/nwm/uds_beacon.h | 19 |
2 files changed, 0 insertions, 22 deletions
diff --git a/src/core/hle/service/nwm/uds_beacon.cpp b/src/core/hle/service/nwm/uds_beacon.cpp index 6332b404c..552eaf65e 100644 --- a/src/core/hle/service/nwm/uds_beacon.cpp +++ b/src/core/hle/service/nwm/uds_beacon.cpp | |||
| @@ -325,8 +325,5 @@ std::vector<u8> GenerateBeaconFrame(const NetworkInfo& network_info, const NodeL | |||
| 325 | return buffer; | 325 | return buffer; |
| 326 | } | 326 | } |
| 327 | 327 | ||
| 328 | std::deque<WifiPacket> GetReceivedPackets(WifiPacket::PacketType type, const MacAddress& sender) { | ||
| 329 | return {}; | ||
| 330 | } | ||
| 331 | } // namespace NWM | 328 | } // namespace NWM |
| 332 | } // namespace Service | 329 | } // namespace Service |
diff --git a/src/core/hle/service/nwm/uds_beacon.h b/src/core/hle/service/nwm/uds_beacon.h index c726b04d9..50cc76da2 100644 --- a/src/core/hle/service/nwm/uds_beacon.h +++ b/src/core/hle/service/nwm/uds_beacon.h | |||
| @@ -124,20 +124,6 @@ struct BeaconData { | |||
| 124 | 124 | ||
| 125 | static_assert(sizeof(BeaconData) == 0x12, "BeaconData has incorrect size."); | 125 | static_assert(sizeof(BeaconData) == 0x12, "BeaconData has incorrect size."); |
| 126 | 126 | ||
| 127 | /// Information about a received WiFi packet. | ||
| 128 | /// Acts as our own 802.11 header. | ||
| 129 | struct WifiPacket { | ||
| 130 | enum class PacketType { Beacon, Data }; | ||
| 131 | |||
| 132 | PacketType type; ///< The type of 802.11 frame, Beacon / Data. | ||
| 133 | |||
| 134 | /// Raw 802.11 frame data, starting at the management frame header for management frames. | ||
| 135 | std::vector<u8> data; | ||
| 136 | MacAddress transmitter_address; ///< Mac address of the transmitter. | ||
| 137 | MacAddress destination_address; ///< Mac address of the receiver. | ||
| 138 | u8 channel; ///< WiFi channel where this frame was transmitted. | ||
| 139 | }; | ||
| 140 | |||
| 141 | /** | 127 | /** |
| 142 | * Decrypts the beacon data buffer for the network described by `network_info`. | 128 | * Decrypts the beacon data buffer for the network described by `network_info`. |
| 143 | */ | 129 | */ |
| @@ -150,10 +136,5 @@ void DecryptBeaconData(const NetworkInfo& network_info, std::vector<u8>& buffer) | |||
| 150 | */ | 136 | */ |
| 151 | std::vector<u8> GenerateBeaconFrame(const NetworkInfo& network_info, const NodeList& nodes); | 137 | std::vector<u8> GenerateBeaconFrame(const NetworkInfo& network_info, const NodeList& nodes); |
| 152 | 138 | ||
| 153 | /** | ||
| 154 | * Returns a list of received 802.11 frames from the specified sender | ||
| 155 | * matching the type since the last call. | ||
| 156 | */ | ||
| 157 | std::deque<WifiPacket> GetReceivedPackets(WifiPacket::PacketType type, const MacAddress& sender); | ||
| 158 | } // namespace NWM | 139 | } // namespace NWM |
| 159 | } // namespace Service | 140 | } // namespace Service |