summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/address_arbiter.cpp6
-rw-r--r--src/core/hle/kernel/client_port.cpp6
-rw-r--r--src/core/hle/kernel/event.cpp6
-rw-r--r--src/core/hle/kernel/kernel.h3
-rw-r--r--src/core/hle/kernel/mutex.cpp6
-rw-r--r--src/core/hle/kernel/process.cpp12
-rw-r--r--src/core/hle/kernel/resource_limit.cpp9
-rw-r--r--src/core/hle/kernel/resource_limit.h4
-rw-r--r--src/core/hle/kernel/semaphore.cpp6
-rw-r--r--src/core/hle/kernel/server_port.cpp11
-rw-r--r--src/core/hle/kernel/server_port.h4
-rw-r--r--src/core/hle/kernel/session.cpp6
-rw-r--r--src/core/hle/kernel/shared_memory.cpp6
-rw-r--r--src/core/hle/kernel/thread.cpp6
-rw-r--r--src/core/hle/kernel/timer.cpp9
15 files changed, 36 insertions, 64 deletions
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp
index 2ff652f13..3506c2d48 100644
--- a/src/core/hle/kernel/address_arbiter.cpp
+++ b/src/core/hle/kernel/address_arbiter.cpp
@@ -16,10 +16,8 @@
16 16
17namespace Kernel { 17namespace Kernel {
18 18
19AddressArbiter::AddressArbiter() { 19AddressArbiter::AddressArbiter() {}
20} 20AddressArbiter::~AddressArbiter() {}
21AddressArbiter::~AddressArbiter() {
22}
23 21
24SharedPtr<AddressArbiter> AddressArbiter::Create(std::string name) { 22SharedPtr<AddressArbiter> AddressArbiter::Create(std::string name) {
25 SharedPtr<AddressArbiter> address_arbiter(new AddressArbiter); 23 SharedPtr<AddressArbiter> address_arbiter(new AddressArbiter);
diff --git a/src/core/hle/kernel/client_port.cpp b/src/core/hle/kernel/client_port.cpp
index 5df769c6a..444ce8d45 100644
--- a/src/core/hle/kernel/client_port.cpp
+++ b/src/core/hle/kernel/client_port.cpp
@@ -10,9 +10,7 @@
10 10
11namespace Kernel { 11namespace Kernel {
12 12
13ClientPort::ClientPort() { 13ClientPort::ClientPort() {}
14} 14ClientPort::~ClientPort() {}
15ClientPort::~ClientPort() {
16}
17 15
18} // namespace 16} // namespace
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp
index 63375818d..f056eb7c3 100644
--- a/src/core/hle/kernel/event.cpp
+++ b/src/core/hle/kernel/event.cpp
@@ -14,10 +14,8 @@
14 14
15namespace Kernel { 15namespace Kernel {
16 16
17Event::Event() { 17Event::Event() {}
18} 18Event::~Event() {}
19Event::~Event() {
20}
21 19
22SharedPtr<Event> Event::Create(ResetType reset_type, std::string name) { 20SharedPtr<Event> Event::Create(ResetType reset_type, std::string name) {
23 SharedPtr<Event> evt(new Event); 21 SharedPtr<Event> evt(new Event);
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index cc39652d5..c683fcb80 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -58,8 +58,7 @@ enum {
58 58
59class Object : NonCopyable { 59class Object : NonCopyable {
60public: 60public:
61 virtual ~Object() { 61 virtual ~Object() {}
62 }
63 62
64 /// Returns a unique identifier for the object. For debugging purposes only. 63 /// Returns a unique identifier for the object. For debugging purposes only.
65 unsigned int GetObjectId() const { 64 unsigned int GetObjectId() const {
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index f92810804..edb97d324 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -33,10 +33,8 @@ void ReleaseThreadMutexes(Thread* thread) {
33 thread->held_mutexes.clear(); 33 thread->held_mutexes.clear();
34} 34}
35 35
36Mutex::Mutex() { 36Mutex::Mutex() {}
37} 37Mutex::~Mutex() {}
38Mutex::~Mutex() {
39}
40 38
41SharedPtr<Mutex> Mutex::Create(bool initial_locked, std::string name) { 39SharedPtr<Mutex> Mutex::Create(bool initial_locked, std::string name) {
42 SharedPtr<Mutex> mutex(new Mutex); 40 SharedPtr<Mutex> mutex(new Mutex);
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp
index cc37e574c..b764f750f 100644
--- a/src/core/hle/kernel/process.cpp
+++ b/src/core/hle/kernel/process.cpp
@@ -26,10 +26,8 @@ SharedPtr<CodeSet> CodeSet::Create(std::string name, u64 program_id) {
26 return codeset; 26 return codeset;
27} 27}
28 28
29CodeSet::CodeSet() { 29CodeSet::CodeSet() {}
30} 30CodeSet::~CodeSet() {}
31CodeSet::~CodeSet() {
32}
33 31
34u32 Process::next_process_id; 32u32 Process::next_process_id;
35 33
@@ -282,10 +280,8 @@ ResultCode Process::LinearFree(VAddr target, u32 size) {
282 return RESULT_SUCCESS; 280 return RESULT_SUCCESS;
283} 281}
284 282
285Kernel::Process::Process() { 283Kernel::Process::Process() {}
286} 284Kernel::Process::~Process() {}
287Kernel::Process::~Process() {
288}
289 285
290SharedPtr<Process> g_current_process; 286SharedPtr<Process> g_current_process;
291} 287}
diff --git a/src/core/hle/kernel/resource_limit.cpp b/src/core/hle/kernel/resource_limit.cpp
index 7bd1c1e08..bb0baed6f 100644
--- a/src/core/hle/kernel/resource_limit.cpp
+++ b/src/core/hle/kernel/resource_limit.cpp
@@ -12,10 +12,8 @@ namespace Kernel {
12 12
13static SharedPtr<ResourceLimit> resource_limits[4]; 13static SharedPtr<ResourceLimit> resource_limits[4];
14 14
15ResourceLimit::ResourceLimit() { 15ResourceLimit::ResourceLimit() {}
16} 16ResourceLimit::~ResourceLimit() {}
17ResourceLimit::~ResourceLimit() {
18}
19 17
20SharedPtr<ResourceLimit> ResourceLimit::Create(std::string name) { 18SharedPtr<ResourceLimit> ResourceLimit::Create(std::string name) {
21 SharedPtr<ResourceLimit> resource_limit(new ResourceLimit); 19 SharedPtr<ResourceLimit> resource_limit(new ResourceLimit);
@@ -150,7 +148,6 @@ void ResourceLimitsInit() {
150 resource_limits[static_cast<u8>(ResourceLimitCategory::OTHER)] = resource_limit; 148 resource_limits[static_cast<u8>(ResourceLimitCategory::OTHER)] = resource_limit;
151} 149}
152 150
153void ResourceLimitsShutdown() { 151void ResourceLimitsShutdown() {}
154}
155 152
156} // namespace 153} // namespace
diff --git a/src/core/hle/kernel/resource_limit.h b/src/core/hle/kernel/resource_limit.h
index c08e744e6..5d8b31a2d 100644
--- a/src/core/hle/kernel/resource_limit.h
+++ b/src/core/hle/kernel/resource_limit.h
@@ -92,8 +92,8 @@ public:
92 s32 max_cpu_time = 0; 92 s32 max_cpu_time = 0;
93 93
94 // TODO(Subv): Increment these in their respective Kernel::T::Create functions, keeping in mind 94 // TODO(Subv): Increment these in their respective Kernel::T::Create functions, keeping in mind
95 // that 95 // that APPLICATION resource limits should not be affected by the objects created by service
96 // APPLICATION resource limits should not be affected by the objects created by service modules. 96 // modules.
97 // Currently we have no way of distinguishing if a Create was called by the running application, 97 // Currently we have no way of distinguishing if a Create was called by the running application,
98 // or by a service module. Approach this once we have separated the service modules into their 98 // or by a service module. Approach this once we have separated the service modules into their
99 // own processes 99 // own processes
diff --git a/src/core/hle/kernel/semaphore.cpp b/src/core/hle/kernel/semaphore.cpp
index 71e41079b..16ac22f1d 100644
--- a/src/core/hle/kernel/semaphore.cpp
+++ b/src/core/hle/kernel/semaphore.cpp
@@ -10,10 +10,8 @@
10 10
11namespace Kernel { 11namespace Kernel {
12 12
13Semaphore::Semaphore() { 13Semaphore::Semaphore() {}
14} 14Semaphore::~Semaphore() {}
15Semaphore::~Semaphore() {
16}
17 15
18ResultVal<SharedPtr<Semaphore>> Semaphore::Create(s32 initial_count, s32 max_count, 16ResultVal<SharedPtr<Semaphore>> Semaphore::Create(s32 initial_count, s32 max_count,
19 std::string name) { 17 std::string name) {
diff --git a/src/core/hle/kernel/server_port.cpp b/src/core/hle/kernel/server_port.cpp
index 7c690fa7f..57e93cad4 100644
--- a/src/core/hle/kernel/server_port.cpp
+++ b/src/core/hle/kernel/server_port.cpp
@@ -13,10 +13,8 @@
13 13
14namespace Kernel { 14namespace Kernel {
15 15
16ServerPort::ServerPort() { 16ServerPort::ServerPort() {}
17} 17ServerPort::~ServerPort() {}
18ServerPort::~ServerPort() {
19}
20 18
21bool ServerPort::ShouldWait() { 19bool ServerPort::ShouldWait() {
22 // If there are no pending sessions, we wait until a new one is added. 20 // If there are no pending sessions, we wait until a new one is added.
@@ -27,8 +25,9 @@ void ServerPort::Acquire() {
27 ASSERT_MSG(!ShouldWait(), "object unavailable!"); 25 ASSERT_MSG(!ShouldWait(), "object unavailable!");
28} 26}
29 27
30std::tuple<SharedPtr<ServerPort>, SharedPtr<ClientPort>> 28std::tuple<SharedPtr<ServerPort>, SharedPtr<ClientPort>> ServerPort::CreatePortPair(
31ServerPort::CreatePortPair(u32 max_sessions, std::string name) { 29 u32 max_sessions, std::string name) {
30
32 SharedPtr<ServerPort> server_port(new ServerPort); 31 SharedPtr<ServerPort> server_port(new ServerPort);
33 SharedPtr<ClientPort> client_port(new ClientPort); 32 SharedPtr<ClientPort> client_port(new ClientPort);
34 33
diff --git a/src/core/hle/kernel/server_port.h b/src/core/hle/kernel/server_port.h
index e43d48674..c3f2ae177 100644
--- a/src/core/hle/kernel/server_port.h
+++ b/src/core/hle/kernel/server_port.h
@@ -23,8 +23,8 @@ public:
23 * @param name Optional name of the ports 23 * @param name Optional name of the ports
24 * @return The created port tuple 24 * @return The created port tuple
25 */ 25 */
26 static std::tuple<SharedPtr<ServerPort>, SharedPtr<ClientPort>> 26 static std::tuple<SharedPtr<ServerPort>, SharedPtr<ClientPort>> CreatePortPair(
27 CreatePortPair(u32 max_sessions, std::string name = "UnknownPort"); 27 u32 max_sessions, std::string name = "UnknownPort");
28 28
29 std::string GetTypeName() const override { 29 std::string GetTypeName() const override {
30 return "ServerPort"; 30 return "ServerPort";
diff --git a/src/core/hle/kernel/session.cpp b/src/core/hle/kernel/session.cpp
index 61457845a..8a2a7e3fd 100644
--- a/src/core/hle/kernel/session.cpp
+++ b/src/core/hle/kernel/session.cpp
@@ -7,8 +7,6 @@
7 7
8namespace Kernel { 8namespace Kernel {
9 9
10Session::Session() { 10Session::Session() {}
11} 11Session::~Session() {}
12Session::~Session() {
13}
14} 12}
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp
index 74f40930c..bf511a338 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/shared_memory.cpp
@@ -12,10 +12,8 @@
12 12
13namespace Kernel { 13namespace Kernel {
14 14
15SharedMemory::SharedMemory() { 15SharedMemory::SharedMemory() {}
16} 16SharedMemory::~SharedMemory() {}
17SharedMemory::~SharedMemory() {
18}
19 17
20SharedPtr<SharedMemory> SharedMemory::Create(SharedPtr<Process> owner_process, u32 size, 18SharedPtr<SharedMemory> SharedMemory::Create(SharedPtr<Process> owner_process, u32 size,
21 MemoryPermission permissions, 19 MemoryPermission permissions,
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 59272715f..0df03c9d5 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -61,10 +61,8 @@ inline static u32 const NewThreadId() {
61 return next_thread_id++; 61 return next_thread_id++;
62} 62}
63 63
64Thread::Thread() { 64Thread::Thread() {}
65} 65Thread::~Thread() {}
66Thread::~Thread() {
67}
68 66
69Thread* GetCurrentThread() { 67Thread* GetCurrentThread() {
70 return current_thread; 68 return current_thread;
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp
index 255cb1aca..427a81923 100644
--- a/src/core/hle/kernel/timer.cpp
+++ b/src/core/hle/kernel/timer.cpp
@@ -20,10 +20,8 @@ static int timer_callback_event_type;
20// us to simply use a pool index or similar. 20// us to simply use a pool index or similar.
21static Kernel::HandleTable timer_callback_handle_table; 21static Kernel::HandleTable timer_callback_handle_table;
22 22
23Timer::Timer() { 23Timer::Timer() {}
24} 24Timer::~Timer() {}
25Timer::~Timer() {
26}
27 25
28SharedPtr<Timer> Timer::Create(ResetType reset_type, std::string name) { 26SharedPtr<Timer> Timer::Create(ResetType reset_type, std::string name) {
29 SharedPtr<Timer> timer(new Timer); 27 SharedPtr<Timer> timer(new Timer);
@@ -103,7 +101,6 @@ void TimersInit() {
103 timer_callback_event_type = CoreTiming::RegisterEvent("TimerCallback", TimerCallback); 101 timer_callback_event_type = CoreTiming::RegisterEvent("TimerCallback", TimerCallback);
104} 102}
105 103
106void TimersShutdown() { 104void TimersShutdown() {}
107}
108 105
109} // namespace 106} // namespace