summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Lioncash2018-07-23 12:49:44 -0400
committerGravatar Lioncash2018-07-23 12:53:07 -0400
commit1f3889a2906b924aa3fadb419652d4d2182ec112 (patch)
treeb5290fb222b2877c8faec9413974c27b28bfa598
parentMerge pull request #775 from lioncash/str (diff)
downloadyuzu-1f3889a2906b924aa3fadb419652d4d2182ec112.tar.gz
yuzu-1f3889a2906b924aa3fadb419652d4d2182ec112.tar.xz
yuzu-1f3889a2906b924aa3fadb419652d4d2182ec112.zip
hle: Remove shared_page.h/.cpp
This is a holdover from citra that's essentially unused.
-rw-r--r--src/core/CMakeLists.txt2
-rw-r--r--src/core/hle/kernel/kernel.cpp2
-rw-r--r--src/core/hle/kernel/memory.cpp1
-rw-r--r--src/core/hle/kernel/wait_object.cpp1
-rw-r--r--src/core/hle/shared_page.cpp86
-rw-r--r--src/core/hle/shared_page.h69
6 files changed, 0 insertions, 161 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 27a5de7fd..5473723aa 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -249,8 +249,6 @@ add_library(core STATIC
249 hle/service/vi/vi_s.h 249 hle/service/vi/vi_s.h
250 hle/service/vi/vi_u.cpp 250 hle/service/vi/vi_u.cpp
251 hle/service/vi/vi_u.h 251 hle/service/vi/vi_u.h
252 hle/shared_page.cpp
253 hle/shared_page.h
254 hw/hw.cpp 252 hw/hw.cpp
255 hw/hw.h 253 hw/hw.h
256 hw/lcd.cpp 254 hw/lcd.cpp
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index b325b879b..fae81e72b 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -11,7 +11,6 @@
11#include "core/hle/kernel/resource_limit.h" 11#include "core/hle/kernel/resource_limit.h"
12#include "core/hle/kernel/thread.h" 12#include "core/hle/kernel/thread.h"
13#include "core/hle/kernel/timer.h" 13#include "core/hle/kernel/timer.h"
14#include "core/hle/shared_page.h"
15 14
16namespace Kernel { 15namespace Kernel {
17 16
@@ -20,7 +19,6 @@ unsigned int Object::next_object_id;
20/// Initialize the kernel 19/// Initialize the kernel
21void Init(u32 system_mode) { 20void Init(u32 system_mode) {
22 ConfigMem::Init(); 21 ConfigMem::Init();
23 SharedPage::Init();
24 22
25 Kernel::MemoryInit(system_mode); 23 Kernel::MemoryInit(system_mode);
26 24
diff --git a/src/core/hle/kernel/memory.cpp b/src/core/hle/kernel/memory.cpp
index d2600cdd7..ecbc5daae 100644
--- a/src/core/hle/kernel/memory.cpp
+++ b/src/core/hle/kernel/memory.cpp
@@ -15,7 +15,6 @@
15#include "core/hle/kernel/memory.h" 15#include "core/hle/kernel/memory.h"
16#include "core/hle/kernel/vm_manager.h" 16#include "core/hle/kernel/vm_manager.h"
17#include "core/hle/result.h" 17#include "core/hle/result.h"
18#include "core/hle/shared_page.h"
19#include "core/memory.h" 18#include "core/memory.h"
20#include "core/memory_setup.h" 19#include "core/memory_setup.h"
21 20
diff --git a/src/core/hle/kernel/wait_object.cpp b/src/core/hle/kernel/wait_object.cpp
index eb3c92e66..e279c5df9 100644
--- a/src/core/hle/kernel/wait_object.cpp
+++ b/src/core/hle/kernel/wait_object.cpp
@@ -13,7 +13,6 @@
13#include "core/hle/kernel/resource_limit.h" 13#include "core/hle/kernel/resource_limit.h"
14#include "core/hle/kernel/thread.h" 14#include "core/hle/kernel/thread.h"
15#include "core/hle/kernel/timer.h" 15#include "core/hle/kernel/timer.h"
16#include "core/hle/shared_page.h"
17 16
18namespace Kernel { 17namespace Kernel {
19 18
diff --git a/src/core/hle/shared_page.cpp b/src/core/hle/shared_page.cpp
deleted file mode 100644
index 9ed8ab249..000000000
--- a/src/core/hle/shared_page.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
1// Copyright 2015 Citra Emulator Project
2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included.
4
5#include <chrono>
6#include <cstring>
7#include <ctime>
8#include "core/core_timing.h"
9#include "core/hle/shared_page.h"
10
11////////////////////////////////////////////////////////////////////////////////////////////////////
12
13namespace SharedPage {
14
15SharedPageDef shared_page;
16
17static CoreTiming::EventType* update_time_event;
18
19/// Gets system time in 3DS format. The epoch is Jan 1900, and the unit is millisecond.
20static u64 GetSystemTime() {
21 auto now = std::chrono::system_clock::now();
22
23 // 3DS system does't allow user to set a time before Jan 1 2000,
24 // so we use it as an auxiliary epoch to calculate the console time.
25 std::tm epoch_tm;
26 epoch_tm.tm_sec = 0;
27 epoch_tm.tm_min = 0;
28 epoch_tm.tm_hour = 0;
29 epoch_tm.tm_mday = 1;
30 epoch_tm.tm_mon = 0;
31 epoch_tm.tm_year = 100;
32 epoch_tm.tm_isdst = 0;
33 auto epoch = std::chrono::system_clock::from_time_t(std::mktime(&epoch_tm));
34
35 // 3DS console time uses Jan 1 1900 as internal epoch,
36 // so we use the milliseconds between 1900 and 2000 as base console time
37 u64 console_time = 3155673600000ULL;
38
39 // Only when system time is after 2000, we set it as 3DS system time
40 if (now > epoch) {
41 console_time += std::chrono::duration_cast<std::chrono::milliseconds>(now - epoch).count();
42 }
43
44 // If the system time is in daylight saving, we give an additional hour to console time
45 std::time_t now_time_t = std::chrono::system_clock::to_time_t(now);
46 std::tm* now_tm = std::localtime(&now_time_t);
47 if (now_tm && now_tm->tm_isdst > 0)
48 console_time += 60 * 60 * 1000;
49
50 return console_time;
51}
52
53static void UpdateTimeCallback(u64 userdata, int cycles_late) {
54 DateTime& date_time =
55 shared_page.date_time_counter % 2 ? shared_page.date_time_0 : shared_page.date_time_1;
56
57 date_time.date_time = GetSystemTime();
58 date_time.update_tick = CoreTiming::GetTicks();
59 date_time.tick_to_second_coefficient = CoreTiming::BASE_CLOCK_RATE;
60 date_time.tick_offset = 0;
61
62 ++shared_page.date_time_counter;
63
64 // system time is updated hourly
65 CoreTiming::ScheduleEvent(CoreTiming::msToCycles(60 * 60 * 1000) - cycles_late,
66 update_time_event);
67}
68
69void Init() {
70 std::memset(&shared_page, 0, sizeof(shared_page));
71
72 shared_page.running_hw = 0x1; // product
73
74 // Some games wait until this value becomes 0x1, before asking running_hw
75 shared_page.unknown_value = 0x1;
76
77 // Set to a completely full battery
78 shared_page.battery_state.is_adapter_connected.Assign(1);
79 shared_page.battery_state.is_charging.Assign(1);
80
81 update_time_event =
82 CoreTiming::RegisterEvent("SharedPage::UpdateTimeCallback", UpdateTimeCallback);
83 CoreTiming::ScheduleEvent(0, update_time_event);
84}
85
86} // namespace SharedPage
diff --git a/src/core/hle/shared_page.h b/src/core/hle/shared_page.h
deleted file mode 100644
index a58259888..000000000
--- a/src/core/hle/shared_page.h
+++ /dev/null
@@ -1,69 +0,0 @@
1// Copyright 2015 Citra Emulator Project
2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included.
4
5#pragma once
6
7/**
8 * The shared page stores various runtime configuration settings. This memory page is
9 * read-only for user processes (there is a bit in the header that grants the process
10 * write access, according to 3dbrew; this is not emulated)
11 */
12
13#include "common/bit_field.h"
14#include "common/common_funcs.h"
15#include "common/common_types.h"
16#include "common/swap.h"
17#include "core/memory.h"
18
19////////////////////////////////////////////////////////////////////////////////////////////////////
20
21namespace SharedPage {
22
23// See http://3dbrew.org/wiki/Configuration_Memory#Shared_Memory_Page_For_ARM11_Processes
24
25struct DateTime {
26 u64_le date_time; // 0
27 u64_le update_tick; // 8
28 u64_le tick_to_second_coefficient; // 10
29 u64_le tick_offset; // 18
30};
31static_assert(sizeof(DateTime) == 0x20, "Datetime size is wrong");
32
33union BatteryState {
34 u8 raw;
35 BitField<0, 1, u8> is_adapter_connected;
36 BitField<1, 1, u8> is_charging;
37 BitField<2, 3, u8> charge_level;
38};
39
40struct SharedPageDef {
41 // Most of these names are taken from the 3dbrew page linked above.
42 u32_le date_time_counter; // 0
43 u8 running_hw; // 4
44 /// "Microcontroller hardware info"
45 u8 mcu_hw_info; // 5
46 INSERT_PADDING_BYTES(0x20 - 0x6); // 6
47 DateTime date_time_0; // 20
48 DateTime date_time_1; // 40
49 u8 wifi_macaddr[6]; // 60
50 u8 wifi_link_level; // 66
51 u8 wifi_unknown2; // 67
52 INSERT_PADDING_BYTES(0x80 - 0x68); // 68
53 float_le sliderstate_3d; // 80
54 u8 ledstate_3d; // 84
55 BatteryState battery_state; // 85
56 u8 unknown_value; // 86
57 INSERT_PADDING_BYTES(0xA0 - 0x87); // 87
58 u64_le menu_title_id; // A0
59 u64_le active_menu_title_id; // A8
60 INSERT_PADDING_BYTES(0x1000 - 0xB0); // B0
61};
62static_assert(sizeof(SharedPageDef) == Memory::SHARED_PAGE_SIZE,
63 "Shared page structure size is wrong");
64
65extern SharedPageDef shared_page;
66
67void Init();
68
69} // namespace SharedPage