citra/citra-nightly
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-nightly.git synced 2024-12-23 17:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4653 from tgsm/core-nested

Browse source 
core: use nested namespaces
This commit is contained in:
Pengfei Zhu 2019-02-19 21:38:59 +08:00 committed by GitHub
parent f409342ab5 39e163b7ce
commit 1d3cef319a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 40 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/file_sys/archive_ncch.h
View file

@ -14,11 +14,9 @@
////////////////////////////////////////////////////////////////////////////////////////////////////
// FileSys namespace
namespace Service {
namespace FS {
namespace Service::FS {
enum class MediaType : u32;
}
} // namespace Service
} // namespace Service::FS
namespace FileSys {

6
src/core/hle/applets/applet.cpp
View file

@ -34,8 +34,7 @@ struct hash<Service::APT::AppletId> {
};
} // namespace std
namespace HLE {
namespace Applets {
namespace HLE::Applets {
static std::unordered_map<Service::APT::AppletId, std::shared_ptr<Applet>> applets;
/// The CoreTiming event identifier for the Applet update callback.
@ -136,5 +135,4 @@ void Init() {
void Shutdown() {
Core::System::GetInstance().CoreTiming().RemoveEvent(applet_update_event);
}
} // namespace Applets
} // namespace HLE
} // namespace HLE::Applets

6
src/core/hle/applets/applet.h
View file

@ -8,8 +8,7 @@
#include "core/hle/result.h"
#include "core/hle/service/apt/applet_manager.h"
namespace HLE {
namespace Applets {
namespace HLE::Applets {
class Applet {
public:
@ -86,5 +85,4 @@ void Init();
/// Shuts down the HLE applets
void Shutdown();
} // namespace Applets
} // namespace HLE
} // namespace HLE::Applets

6
src/core/hle/applets/erreula.cpp
View file

@ -7,8 +7,7 @@
#include "core/hle/applets/erreula.h"
#include "core/hle/service/apt/apt.h"
namespace HLE {
namespace Applets {
namespace HLE::Applets {
ResultCode ErrEula::ReceiveParameter(const Service::APT::MessageParameter& parameter) {
if (parameter.signal != Service::APT::SignalType::Request) {
@ -67,5 +66,4 @@ ResultCode ErrEula::StartImpl(const Service::APT::AppletStartupParameter& parame
void ErrEula::Update() {}
} // namespace Applets
} // namespace HLE
} // namespace HLE::Applets

6
src/core/hle/applets/erreula.h
View file

@ -7,8 +7,7 @@
#include "core/hle/applets/applet.h"
#include "core/hle/kernel/shared_memory.h"
namespace HLE {
namespace Applets {
namespace HLE::Applets {
class ErrEula final : public Applet {
public:
@ -26,5 +25,4 @@ private:
Kernel::SharedPtr<Kernel::SharedMemory> framebuffer_memory;
};
} // namespace Applets
} // namespace HLE
} // namespace HLE::Applets

6
src/core/hle/applets/mii_selector.cpp
View file

@ -15,8 +15,7 @@
////////////////////////////////////////////////////////////////////////////////////////////////////
namespace HLE {
namespace Applets {
namespace HLE::Applets {
ResultCode MiiSelector::ReceiveParameter(const Service::APT::MessageParameter& parameter) {
if (parameter.signal != Service::APT::SignalType::Request) {
@ -110,5 +109,4 @@ ResultCode MiiSelector::StartImpl(const Service::APT::AppletStartupParameter& pa
}
void MiiSelector::Update() {}
} // namespace Applets
} // namespace HLE
} // namespace HLE::Applets

6
src/core/hle/applets/mii_selector.h
View file

@ -12,8 +12,7 @@
#include "core/hle/result.h"
#include "core/hle/service/apt/apt.h"
namespace HLE {
namespace Applets {
namespace HLE::Applets {
struct MiiConfig {
u8 enable_cancel_button;
@ -126,5 +125,4 @@ private:
MiiConfig config;
};
} // namespace Applets
} // namespace HLE
} // namespace HLE::Applets

6
src/core/hle/applets/mint.cpp
View file

@ -7,8 +7,7 @@
#include "core/hle/applets/mint.h"
#include "core/hle/service/apt/apt.h"
namespace HLE {
namespace Applets {
namespace HLE::Applets {
ResultCode Mint::ReceiveParameter(const Service::APT::MessageParameter& parameter) {
if (parameter.signal != Service::APT::SignalType::Request) {
@ -67,5 +66,4 @@ ResultCode Mint::StartImpl(const Service::APT::AppletStartupParameter& parameter
void Mint::Update() {}
} // namespace Applets
} // namespace HLE
} // namespace HLE::Applets

6
src/core/hle/applets/mint.h
View file

@ -7,8 +7,7 @@
#include "core/hle/applets/applet.h"
#include "core/hle/kernel/shared_memory.h"
namespace HLE {
namespace Applets {
namespace HLE::Applets {
class Mint final : public Applet {
public:
@ -26,5 +25,4 @@ private:
Kernel::SharedPtr<Kernel::SharedMemory> framebuffer_memory;
};
} // namespace Applets
} // namespace HLE
} // namespace HLE::Applets

6
src/core/hle/applets/swkbd.cpp
View file

@ -19,8 +19,7 @@
////////////////////////////////////////////////////////////////////////////////////////////////////
namespace HLE {
namespace Applets {
namespace HLE::Applets {
ResultCode SoftwareKeyboard::ReceiveParameter(Service::APT::MessageParameter const& parameter) {
if (parameter.signal != Service::APT::SignalType::Request) {
@ -188,5 +187,4 @@ Frontend::KeyboardConfig SoftwareKeyboard::ToFrontendConfig(
static_cast<bool>(config.filter_flags & SoftwareKeyboardFilter::Callback);
return frontend_config;
}
} // namespace Applets
} // namespace HLE
} // namespace HLE::Applets

6
src/core/hle/applets/swkbd.h
View file

@ -13,8 +13,7 @@
#include "core/hle/result.h"
#include "core/hle/service/apt/apt.h"
namespace HLE {
namespace Applets {
namespace HLE::Applets {
/// Maximum number of buttons that can be in the keyboard.
constexpr int MAX_BUTTON = 3;
@ -210,5 +209,4 @@ private:
std::shared_ptr<Frontend::SoftwareKeyboard> frontend_applet;
};
} // namespace Applets
} // namespace HLE
} // namespace HLE::Applets

6
src/core/hw/aes/arithmetic128.cpp
View file

@ -6,8 +6,7 @@
#include <functional>
#include "core/hw/aes/arithmetic128.h"
namespace HW {
namespace AES {
namespace HW::AES {
AESKey Lrot128(const AESKey& in, u32 rot) {
AESKey out;
@ -43,5 +42,4 @@ AESKey Xor128(const AESKey& a, const AESKey& b) {
return out;
}
} // namespace AES
} // namespace HW
} // namespace HW::AES

6
src/core/hw/aes/arithmetic128.h
View file

@ -7,11 +7,9 @@
#include "common/common_types.h"
#include "core/hw/aes/key.h"
namespace HW {
namespace AES {
namespace HW::AES {
AESKey Lrot128(const AESKey& in, u32 rot);
AESKey Add128(const AESKey& a, const AESKey& b);
AESKey Xor128(const AESKey& a, const AESKey& b);
} // namespace AES
} // namespace HW
} // namespace HW::AES

6
src/core/hw/aes/ccm.cpp
View file

@ -12,8 +12,7 @@
#include "core/hw/aes/ccm.h"
#include "core/hw/aes/key.h"
namespace HW {
namespace AES {
namespace HW::AES {
namespace {
@ -91,5 +90,4 @@ std::vector<u8> DecryptVerifyCCM(const std::vector<u8>& cipher, const CCMNonce&
return pdata;
}
} // namespace AES
} // namespace HW
} // namespace HW::AES

6
src/core/hw/aes/ccm.h
View file

@ -9,8 +9,7 @@
#include <vector>
#include "common/common_types.h"
namespace HW {
namespace AES {
namespace HW::AES {
constexpr std::size_t CCM_NONCE_SIZE = 12;
constexpr std::size_t CCM_MAC_SIZE = 16;
@ -37,5 +36,4 @@ std::vector<u8> EncryptSignCCM(const std::vector<u8>& pdata, const CCMNonce& non
std::vector<u8> DecryptVerifyCCM(const std::vector<u8>& cipher, const CCMNonce& nonce,
std::size_t slot_id);
} // namespace AES
} // namespace HW
} // namespace HW::AES

6
src/core/hw/aes/key.cpp
View file

@ -18,8 +18,7 @@
#include "core/hw/aes/arithmetic128.h"
#include "core/hw/aes/key.h"
namespace HW {
namespace AES {
namespace HW::AES {
namespace {
@ -475,5 +474,4 @@ void SelectCommonKeyIndex(u8 index) {
key_slots[KeySlotID::TicketCommonKey].SetKeyY(common_key_y_slots.at(index));
}
} // namespace AES
} // namespace HW
} // namespace HW::AES

6
src/core/hw/aes/key.h
View file

@ -8,8 +8,7 @@
#include <cstddef>
#include "common/common_types.h"
namespace HW {
namespace AES {
namespace HW::AES {
enum KeySlotID : std::size_t {
@ -50,5 +49,4 @@ AESKey GetNormalKey(std::size_t slot_id);
void SelectCommonKeyIndex(u8 index);
} // namespace AES
} // namespace HW
} // namespace HW::AES

6
src/core/hw/y2r.cpp
View file

@ -15,8 +15,7 @@
#include "core/hw/y2r.h"
#include "core/memory.h"
namespace HW {
namespace Y2R {
namespace HW::Y2R {
using namespace Service::Y2R;
@ -377,5 +376,4 @@ void PerformConversion(ConversionConfiguration& cvt) {
cvt.output_format, (u8)cvt.alpha);
}
}
} // namespace Y2R
} // namespace HW
} // namespace HW::Y2R

12
src/core/hw/y2r.h
View file

@ -4,14 +4,10 @@
#pragma once
namespace Service {
namespace Y2R {
namespace Service::Y2R {
struct ConversionConfiguration;
}
} // namespace Service
} // namespace Service::Y2R
namespace HW {
namespace Y2R {
namespace HW::Y2R {
void PerformConversion(Service::Y2R::ConversionConfiguration& cvt);
}
} // namespace HW
} // namespace HW::Y2R