mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-11-01 16:05:07 +01:00
Serialize NWM service
This commit is contained in:
parent
571b1062f0
commit
f5e2f873b0
18
TODO
18
TODO
@ -10,11 +10,16 @@
|
||||
☐ App loader
|
||||
☐ Archive manager
|
||||
☐ Custom texture cache
|
||||
☐ MMIO
|
||||
☐ Movie
|
||||
☐ Perf stats
|
||||
☐ Settings
|
||||
☐ Telemetry session
|
||||
✘ MMIO @cancelled(20-01-01 01:06)
|
||||
Seems that this whole subsystem is only used in tests
|
||||
✘ Movie @cancelled(20-01-01 01:07)
|
||||
Doesn't need to be serialized here
|
||||
✘ Perf stats @cancelled(20-01-01 01:09)
|
||||
Doesn't need to be serialized here
|
||||
✘ Settings @cancelled(20-01-01 01:11)
|
||||
For now, let the settings just be whatever they are
|
||||
✘ Telemetry session @cancelled(20-01-01 01:12)
|
||||
Doesn't need to be serialized here
|
||||
☐ Replace SERIALIZE_AS_POD with BOOST_IS_BITWISE_SERIALIZABLE
|
||||
☐ Review constructor/initialization code
|
||||
✔ Fix CI @done(19-12-31 21:32)
|
||||
@ -94,7 +99,8 @@
|
||||
✔ NFC @done(19-12-31 20:35)
|
||||
✔ NIM @done(19-12-31 21:08)
|
||||
✔ NS @done(20-01-01 00:46)
|
||||
☐ NWM
|
||||
✔ NWM @done(20-01-01 21:31)
|
||||
☐ Fix wifi_packet_received?
|
||||
☐ PM
|
||||
✔ PS @done(20-01-01 00:54)
|
||||
☐ PTM
|
||||
|
2
externals/boost
vendored
2
externals/boost
vendored
@ -1 +1 @@
|
||||
Subproject commit 65dc954e93b22870b8423701e225147c75e3b31b
|
||||
Subproject commit 6d7edc593be8e47c8de7bc5f7d6b32971fad0c24
|
@ -2,8 +2,11 @@
|
||||
// Licensed under GPLv2 or any later version
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include "common/archives.h"
|
||||
#include "core/hle/service/nwm/nwm_cec.h"
|
||||
|
||||
SERIALIZE_EXPORT_IMPL(Service::NWM::NWM_CEC)
|
||||
|
||||
namespace Service::NWM {
|
||||
|
||||
NWM_CEC::NWM_CEC() : ServiceFramework("nwm::CEC") {
|
||||
|
@ -14,3 +14,5 @@ public:
|
||||
};
|
||||
|
||||
} // namespace Service::NWM
|
||||
|
||||
BOOST_CLASS_EXPORT_KEY(Service::NWM::NWM_CEC)
|
||||
|
@ -2,8 +2,11 @@
|
||||
// Licensed under GPLv2 or any later version
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include "common/archives.h"
|
||||
#include "core/hle/service/nwm/nwm_ext.h"
|
||||
|
||||
SERIALIZE_EXPORT_IMPL(Service::NWM::NWM_EXT)
|
||||
|
||||
namespace Service::NWM {
|
||||
|
||||
NWM_EXT::NWM_EXT() : ServiceFramework("nwm::EXT") {
|
||||
|
@ -14,3 +14,5 @@ public:
|
||||
};
|
||||
|
||||
} // namespace Service::NWM
|
||||
|
||||
BOOST_CLASS_EXPORT_KEY(Service::NWM::NWM_EXT)
|
||||
|
@ -2,8 +2,11 @@
|
||||
// Licensed under GPLv2 or any later version
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include "common/archives.h"
|
||||
#include "core/hle/service/nwm/nwm_inf.h"
|
||||
|
||||
SERIALIZE_EXPORT_IMPL(Service::NWM::NWM_INF)
|
||||
|
||||
namespace Service::NWM {
|
||||
|
||||
NWM_INF::NWM_INF() : ServiceFramework("nwm::INF") {
|
||||
|
@ -14,3 +14,5 @@ public:
|
||||
};
|
||||
|
||||
} // namespace Service::NWM
|
||||
|
||||
BOOST_CLASS_EXPORT_KEY(Service::NWM::NWM_INF)
|
||||
|
@ -2,8 +2,11 @@
|
||||
// Licensed under GPLv2 or any later version
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include "common/archives.h"
|
||||
#include "core/hle/service/nwm/nwm_sap.h"
|
||||
|
||||
SERIALIZE_EXPORT_IMPL(Service::NWM::NWM_SAP)
|
||||
|
||||
namespace Service::NWM {
|
||||
|
||||
NWM_SAP::NWM_SAP() : ServiceFramework("nwm::SAP") {
|
||||
|
@ -14,3 +14,5 @@ public:
|
||||
};
|
||||
|
||||
} // namespace Service::NWM
|
||||
|
||||
BOOST_CLASS_EXPORT_KEY(Service::NWM::NWM_SAP)
|
||||
|
@ -2,8 +2,11 @@
|
||||
// Licensed under GPLv2 or any later version
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include "common/archives.h"
|
||||
#include "core/hle/service/nwm/nwm_soc.h"
|
||||
|
||||
SERIALIZE_EXPORT_IMPL(Service::NWM::NWM_SOC)
|
||||
|
||||
namespace Service::NWM {
|
||||
|
||||
NWM_SOC::NWM_SOC() : ServiceFramework("nwm::SOC") {
|
||||
|
@ -14,3 +14,5 @@ public:
|
||||
};
|
||||
|
||||
} // namespace Service::NWM
|
||||
|
||||
BOOST_CLASS_EXPORT_KEY(Service::NWM::NWM_SOC)
|
||||
|
@ -2,8 +2,11 @@
|
||||
// Licensed under GPLv2 or any later version
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include "common/archives.h"
|
||||
#include "core/hle/service/nwm/nwm_tst.h"
|
||||
|
||||
SERIALIZE_EXPORT_IMPL(Service::NWM::NWM_TST)
|
||||
|
||||
namespace Service::NWM {
|
||||
|
||||
NWM_TST::NWM_TST() : ServiceFramework("nwm::TST") {
|
||||
|
@ -14,3 +14,5 @@ public:
|
||||
};
|
||||
|
||||
} // namespace Service::NWM
|
||||
|
||||
BOOST_CLASS_EXPORT_KEY(Service::NWM::NWM_TST)
|
||||
|
@ -4,7 +4,10 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstring>
|
||||
#include <boost/serialization/list.hpp>
|
||||
#include <boost/serialization/map.hpp>
|
||||
#include <cryptopp/osrng.h>
|
||||
#include "common/archives.h"
|
||||
#include "common/common_types.h"
|
||||
#include "common/logging/log.h"
|
||||
#include "core/core.h"
|
||||
@ -23,6 +26,15 @@
|
||||
|
||||
namespace Service::NWM {
|
||||
|
||||
template <class Archive>
|
||||
void NWM_UDS::serialize(Archive& ar, const unsigned int) {
|
||||
ar& node_map;
|
||||
ar& connection_event;
|
||||
ar& received_beacons;
|
||||
// TODO: Fix wifi_packet_received?
|
||||
}
|
||||
SERIALIZE_IMPL(NWM_UDS)
|
||||
|
||||
namespace ErrCodes {
|
||||
enum {
|
||||
NotInitialized = 2,
|
||||
|
@ -521,6 +521,14 @@ private:
|
||||
struct Node {
|
||||
bool connected;
|
||||
u16 node_id;
|
||||
|
||||
private:
|
||||
template <class Archive>
|
||||
void serialize(Archive& ar, const unsigned int) {
|
||||
ar& connected;
|
||||
ar& node_id;
|
||||
}
|
||||
friend class boost::serialization::access;
|
||||
};
|
||||
|
||||
std::map<MacAddress, Node> node_map;
|
||||
@ -543,6 +551,12 @@ private:
|
||||
|
||||
// List of the last <MaxBeaconFrames> beacons received from the network.
|
||||
std::list<Network::WifiPacket> received_beacons;
|
||||
|
||||
template <class Archive>
|
||||
void serialize(Archive& ar, const unsigned int);
|
||||
};
|
||||
|
||||
} // namespace Service::NWM
|
||||
|
||||
SERVICE_CONSTRUCT(Service::NWM::NWM_UDS)
|
||||
BOOST_CLASS_EXPORT_KEY(Service::NWM::NWM_UDS)
|
||||
|
@ -13,4 +13,4 @@ add_library(network STATIC
|
||||
|
||||
create_target_directory_groups(network)
|
||||
|
||||
target_link_libraries(network PRIVATE common enet)
|
||||
target_link_libraries(network PRIVATE common enet Boost::boost)
|
||||
|
@ -8,6 +8,7 @@
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <boost/serialization/access.hpp>
|
||||
#include "common/common_types.h"
|
||||
#include "network/room.h"
|
||||
|
||||
@ -30,6 +31,17 @@ struct WifiPacket {
|
||||
MacAddress transmitter_address; ///< Mac address of the transmitter.
|
||||
MacAddress destination_address; ///< Mac address of the receiver.
|
||||
u8 channel; ///< WiFi channel where this frame was transmitted.
|
||||
|
||||
private:
|
||||
template <class Archive>
|
||||
void serialize(Archive& ar, const unsigned int) {
|
||||
ar& type;
|
||||
ar& data;
|
||||
ar& transmitter_address;
|
||||
ar& destination_address;
|
||||
ar& channel;
|
||||
}
|
||||
friend class boost::serialization::access;
|
||||
};
|
||||
|
||||
/// Represents a chat message.
|
||||
|
Loading…
Reference in New Issue
Block a user