prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address review comments (1/2)

Browse Source
This commit is contained in:
VolcaEM
2020-04-27 02:50:42 +02:00
committed by GitHub
parent b698cb8d04
commit 4aa2845240
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/hle/service/nifm/nifm.h
View File

@@ -4,6 +4,10 @@
#pragma once #pragma once
#include <array>
#include "common/common_funcs.h"
#include "common/common_types.h"
namespace Service::SM { namespace Service::SM {
class ServiceManager; class ServiceManager;
} }
@@ -14,21 +18,16 @@ class System;
namespace Service::NIFM { namespace Service::NIFM {
#pragma pack(1)
struct ClientId { struct ClientId {
u32 client_id{}; u32 client_id{};
}; };
#pragma pack()
static_assert(sizeof(ClientId) == 0x4, "ClientId has incorrect size."); static_assert(sizeof(ClientId) == 0x4, "ClientId has incorrect size.");
#pragma pack(1)
struct Uuid { struct Uuid {
u128 uuid{}; u128 uuid{};
}; };
#pragma pack()
static_assert(sizeof(Uuid) == 0x10, "Uuid has incorrect size."); static_assert(sizeof(Uuid) == 0x10, "Uuid has incorrect size.");
#pragma pack(1)
struct WirelessSettingData { struct WirelessSettingData {
u8 ssid_length{}; u8 ssid_length{};
std::array<u8, 0x21> ssid{}; std::array<u8, 0x21> ssid{};
@@ -39,10 +38,8 @@ struct WirelessSettingData {
std::array<u8, 0x41> passphrase{}; std::array<u8, 0x41> passphrase{};
INSERT_PADDING_BYTES(0x3); INSERT_PADDING_BYTES(0x3);
}; };
#pragma pack()
static_assert(sizeof(WirelessSettingData) == 0x70, "WirelessSettingData has incorrect size."); static_assert(sizeof(WirelessSettingData) == 0x70, "WirelessSettingData has incorrect size.");
#pragma pack(1)
struct SfWirelessSettingData { struct SfWirelessSettingData {
u8 ssid_length{}; u8 ssid_length{};
std::array<u8, 0x20> ssid{}; std::array<u8, 0x20> ssid{};
@@ -51,28 +48,21 @@ struct SfWirelessSettingData {
u8 unk3{}; u8 unk3{};
std::array<u8, 0x41> passphrase{}; std::array<u8, 0x41> passphrase{};
}; };
#pragma pack()
static_assert(sizeof(SfWirelessSettingData) == 0x65, "SfWirelessSettingData has incorrect size."); static_assert(sizeof(SfWirelessSettingData) == 0x65, "SfWirelessSettingData has incorrect size.");
#pragma pack(1)
struct IpAddress { struct IpAddress {
u32 address{}; u32 address{};
}; };
#pragma pack()
static_assert(sizeof(IpAddress) == 0x4, "IpAddress has incorrect size."); static_assert(sizeof(IpAddress) == 0x4, "IpAddress has incorrect size.");
#pragma pack(1)
struct SubnetMask { struct SubnetMask {
u32 mask{}; u32 mask{};
}; };
#pragma pack()
static_assert(sizeof(SubnetMask) == 0x4, "SubnetMask has incorrect size."); static_assert(sizeof(SubnetMask) == 0x4, "SubnetMask has incorrect size.");
#pragma pack(1)
struct Gateway { struct Gateway {
u32 gateway{}; u32 gateway{};
}; };
#pragma pack()
static_assert(sizeof(Gateway) == 0x4, "Gateway has incorrect size."); static_assert(sizeof(Gateway) == 0x4, "Gateway has incorrect size.");
#pragma pack(1) #pragma pack(1)
@@ -94,7 +84,6 @@ struct DNSSetting {
#pragma pack() #pragma pack()
static_assert(sizeof(DNSSetting) == 0x9, "DNSSetting has incorrect size."); static_assert(sizeof(DNSSetting) == 0x9, "DNSSetting has incorrect size.");
#pragma pack(1)
struct ProxySetting { struct ProxySetting {
u8 use_proxy{}; u8 use_proxy{};
INSERT_PADDING_BYTES(0x1); INSERT_PADDING_BYTES(0x1);
@@ -105,17 +94,14 @@ struct ProxySetting {
std::array<u8, 0x20> password{}; std::array<u8, 0x20> password{};
INSERT_PADDING_BYTES(0x1); INSERT_PADDING_BYTES(0x1);
}; };
#pragma pack()
static_assert(sizeof(ProxySetting) == 0xAA, "ProxySetting has incorrect size."); static_assert(sizeof(ProxySetting) == 0xAA, "ProxySetting has incorrect size.");
#pragma pack(1)
struct IpSettingData { struct IpSettingData {
IpAddressSetting address_settings{}; IpAddressSetting address_settings{};
DNSSetting dns_settings{}; DNSSetting dns_settings{};
ProxySetting proxy_settings{}; ProxySetting proxy_settings{};
u16 mtu{}; u16 mtu{};
}; };
#pragma pack()
static_assert(sizeof(IpSettingData) == 0xC2, "IpSettingData has incorrect size."); static_assert(sizeof(IpSettingData) == 0xC2, "IpSettingData has incorrect size.");
#pragma pack(1) #pragma pack(1)