diff options
| author | 2017-10-12 21:29:53 -0400 | |
|---|---|---|
| committer | 2017-10-12 21:29:53 -0400 | |
| commit | dbd15b0d10f1462601cbdbcd53ad28c2e5057af2 (patch) | |
| tree | 96d4482279c2efaa6e5cd0fe1de32bab2f0cdc05 /src | |
| parent | Remove lots more 3DS-specific code. (diff) | |
| download | yuzu-dbd15b0d10f1462601cbdbcd53ad28c2e5057af2.tar.gz yuzu-dbd15b0d10f1462601cbdbcd53ad28c2e5057af2.tar.xz yuzu-dbd15b0d10f1462601cbdbcd53ad28c2e5057af2.zip | |
Remove more 3DS-specific code.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/CMakeLists.txt | 44 | ||||
| -rw-r--r-- | src/core/hle/service/service.cpp | 9 | ||||
| -rw-r--r-- | src/core/loader/loader.cpp | 2 |
3 files changed, 0 insertions, 55 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index fa0379946..7606e50fc 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt | |||
| @@ -17,15 +17,6 @@ set(SRCS | |||
| 17 | core.cpp | 17 | core.cpp |
| 18 | core_timing.cpp | 18 | core_timing.cpp |
| 19 | file_sys/archive_backend.cpp | 19 | file_sys/archive_backend.cpp |
| 20 | file_sys/archive_extsavedata.cpp | ||
| 21 | file_sys/archive_ncch.cpp | ||
| 22 | file_sys/archive_other_savedata.cpp | ||
| 23 | file_sys/archive_savedata.cpp | ||
| 24 | file_sys/archive_sdmc.cpp | ||
| 25 | file_sys/archive_sdmcwriteonly.cpp | ||
| 26 | file_sys/archive_selfncch.cpp | ||
| 27 | file_sys/archive_source_sd_savedata.cpp | ||
| 28 | file_sys/archive_systemsavedata.cpp | ||
| 29 | file_sys/disk_archive.cpp | 20 | file_sys/disk_archive.cpp |
| 30 | file_sys/ivfc_archive.cpp | 21 | file_sys/ivfc_archive.cpp |
| 31 | file_sys/ncch_container.cpp | 22 | file_sys/ncch_container.cpp |
| @@ -57,21 +48,10 @@ set(SRCS | |||
| 57 | hle/kernel/wait_object.cpp | 48 | hle/kernel/wait_object.cpp |
| 58 | hle/lock.cpp | 49 | hle/lock.cpp |
| 59 | hle/romfs.cpp | 50 | hle/romfs.cpp |
| 60 | hle/service/cfg/cfg.cpp | ||
| 61 | hle/service/cfg/cfg_i.cpp | ||
| 62 | hle/service/cfg/cfg_nor.cpp | ||
| 63 | hle/service/cfg/cfg_s.cpp | ||
| 64 | hle/service/cfg/cfg_u.cpp | ||
| 65 | hle/service/dsp_dsp.cpp | 51 | hle/service/dsp_dsp.cpp |
| 66 | hle/service/fs/archive.cpp | ||
| 67 | hle/service/fs/fs_user.cpp | ||
| 68 | hle/service/gsp_gpu.cpp | 52 | hle/service/gsp_gpu.cpp |
| 69 | hle/service/gsp_lcd.cpp | 53 | hle/service/gsp_lcd.cpp |
| 70 | hle/service/hid/hid.cpp | 54 | hle/service/hid/hid.cpp |
| 71 | hle/service/hid/hid_spvr.cpp | ||
| 72 | hle/service/hid/hid_user.cpp | ||
| 73 | hle/service/ns/ns.cpp | ||
| 74 | hle/service/ns/ns_s.cpp | ||
| 75 | hle/service/service.cpp | 55 | hle/service/service.cpp |
| 76 | hle/service/sm/sm.cpp | 56 | hle/service/sm/sm.cpp |
| 77 | hle/service/sm/srv.cpp | 57 | hle/service/sm/srv.cpp |
| @@ -83,11 +63,9 @@ set(SRCS | |||
| 83 | hw/gpu.cpp | 63 | hw/gpu.cpp |
| 84 | hw/hw.cpp | 64 | hw/hw.cpp |
| 85 | hw/lcd.cpp | 65 | hw/lcd.cpp |
| 86 | loader/3dsx.cpp | ||
| 87 | loader/elf.cpp | 66 | loader/elf.cpp |
| 88 | loader/linker.cpp | 67 | loader/linker.cpp |
| 89 | loader/loader.cpp | 68 | loader/loader.cpp |
| 90 | loader/ncch.cpp | ||
| 91 | loader/nro.cpp | 69 | loader/nro.cpp |
| 92 | loader/nso.cpp | 70 | loader/nso.cpp |
| 93 | loader/smdh.cpp | 71 | loader/smdh.cpp |
| @@ -120,15 +98,6 @@ set(HEADERS | |||
| 120 | core.h | 98 | core.h |
| 121 | core_timing.h | 99 | core_timing.h |
| 122 | file_sys/archive_backend.h | 100 | file_sys/archive_backend.h |
| 123 | file_sys/archive_extsavedata.h | ||
| 124 | file_sys/archive_ncch.h | ||
| 125 | file_sys/archive_other_savedata.h | ||
| 126 | file_sys/archive_savedata.h | ||
| 127 | file_sys/archive_sdmc.h | ||
| 128 | file_sys/archive_sdmcwriteonly.h | ||
| 129 | file_sys/archive_selfncch.h | ||
| 130 | file_sys/archive_source_sd_savedata.h | ||
| 131 | file_sys/archive_systemsavedata.h | ||
| 132 | file_sys/directory_backend.h | 101 | file_sys/directory_backend.h |
| 133 | file_sys/disk_archive.h | 102 | file_sys/disk_archive.h |
| 134 | file_sys/errors.h | 103 | file_sys/errors.h |
| @@ -168,21 +137,10 @@ set(HEADERS | |||
| 168 | hle/lock.h | 137 | hle/lock.h |
| 169 | hle/result.h | 138 | hle/result.h |
| 170 | hle/romfs.h | 139 | hle/romfs.h |
| 171 | hle/service/cfg/cfg.h | ||
| 172 | hle/service/cfg/cfg_i.h | ||
| 173 | hle/service/cfg/cfg_nor.h | ||
| 174 | hle/service/cfg/cfg_s.h | ||
| 175 | hle/service/cfg/cfg_u.h | ||
| 176 | hle/service/dsp_dsp.h | 140 | hle/service/dsp_dsp.h |
| 177 | hle/service/fs/archive.h | ||
| 178 | hle/service/fs/fs_user.h | ||
| 179 | hle/service/gsp_gpu.h | 141 | hle/service/gsp_gpu.h |
| 180 | hle/service/gsp_lcd.h | 142 | hle/service/gsp_lcd.h |
| 181 | hle/service/hid/hid.h | 143 | hle/service/hid/hid.h |
| 182 | hle/service/hid/hid_spvr.h | ||
| 183 | hle/service/hid/hid_user.h | ||
| 184 | hle/service/ns/ns.h | ||
| 185 | hle/service/ns/ns_s.h | ||
| 186 | hle/service/service.h | 144 | hle/service/service.h |
| 187 | hle/service/sm/sm.h | 145 | hle/service/sm/sm.h |
| 188 | hle/service/sm/srv.h | 146 | hle/service/sm/srv.h |
| @@ -194,11 +152,9 @@ set(HEADERS | |||
| 194 | hw/gpu.h | 152 | hw/gpu.h |
| 195 | hw/hw.h | 153 | hw/hw.h |
| 196 | hw/lcd.h | 154 | hw/lcd.h |
| 197 | loader/3dsx.h | ||
| 198 | loader/elf.h | 155 | loader/elf.h |
| 199 | loader/linker.h | 156 | loader/linker.h |
| 200 | loader/loader.h | 157 | loader/loader.h |
| 201 | loader/ncch.h | ||
| 202 | loader/nro.h | 158 | loader/nro.h |
| 203 | loader/nso.h | 159 | loader/nso.h |
| 204 | loader/smdh.h | 160 | loader/smdh.h |
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index afd27d446..20ea2c389 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp | |||
| @@ -13,13 +13,10 @@ | |||
| 13 | #include "core/hle/kernel/server_port.h" | 13 | #include "core/hle/kernel/server_port.h" |
| 14 | #include "core/hle/kernel/server_session.h" | 14 | #include "core/hle/kernel/server_session.h" |
| 15 | #include "core/hle/kernel/handle_table.h" | 15 | #include "core/hle/kernel/handle_table.h" |
| 16 | #include "core/hle/service/cfg/cfg.h" | ||
| 17 | #include "core/hle/service/dsp_dsp.h" | 16 | #include "core/hle/service/dsp_dsp.h" |
| 18 | #include "core/hle/service/fs/archive.h" | ||
| 19 | #include "core/hle/service/gsp_gpu.h" | 17 | #include "core/hle/service/gsp_gpu.h" |
| 20 | #include "core/hle/service/gsp_lcd.h" | 18 | #include "core/hle/service/gsp_lcd.h" |
| 21 | #include "core/hle/service/hid/hid.h" | 19 | #include "core/hle/service/hid/hid.h" |
| 22 | #include "core/hle/service/ns/ns.h" | ||
| 23 | #include "core/hle/service/service.h" | 20 | #include "core/hle/service/service.h" |
| 24 | #include "core/hle/service/sm/sm.h" | 21 | #include "core/hle/service/sm/sm.h" |
| 25 | #include "core/hle/service/sm/srv.h" | 22 | #include "core/hle/service/sm/srv.h" |
| @@ -189,10 +186,6 @@ void Init() { | |||
| 189 | SM::g_service_manager = std::make_shared<SM::ServiceManager>(); | 186 | SM::g_service_manager = std::make_shared<SM::ServiceManager>(); |
| 190 | SM::ServiceManager::InstallInterfaces(SM::g_service_manager); | 187 | SM::ServiceManager::InstallInterfaces(SM::g_service_manager); |
| 191 | 188 | ||
| 192 | NS::InstallInterfaces(*SM::g_service_manager); | ||
| 193 | |||
| 194 | FS::ArchiveInit(); | ||
| 195 | CFG::Init(); | ||
| 196 | HID::Init(); | 189 | HID::Init(); |
| 197 | 190 | ||
| 198 | AddService(new DSP_DSP::Interface); | 191 | AddService(new DSP_DSP::Interface); |
| @@ -205,8 +198,6 @@ void Init() { | |||
| 205 | /// Shutdown ServiceManager | 198 | /// Shutdown ServiceManager |
| 206 | void Shutdown() { | 199 | void Shutdown() { |
| 207 | HID::Shutdown(); | 200 | HID::Shutdown(); |
| 208 | CFG::Shutdown(); | ||
| 209 | FS::ArchiveShutdown(); | ||
| 210 | 201 | ||
| 211 | SM::g_service_manager = nullptr; | 202 | SM::g_service_manager = nullptr; |
| 212 | g_kernel_named_ports.clear(); | 203 | g_kernel_named_ports.clear(); |
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 46b2c28d2..6fa7afb42 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp | |||
| @@ -7,9 +7,7 @@ | |||
| 7 | #include "common/logging/log.h" | 7 | #include "common/logging/log.h" |
| 8 | #include "common/string_util.h" | 8 | #include "common/string_util.h" |
| 9 | #include "core/hle/kernel/process.h" | 9 | #include "core/hle/kernel/process.h" |
| 10 | #include "core/loader/3dsx.h" | ||
| 11 | #include "core/loader/elf.h" | 10 | #include "core/loader/elf.h" |
| 12 | #include "core/loader/ncch.h" | ||
| 13 | #include "core/loader/nro.h" | 11 | #include "core/loader/nro.h" |
| 14 | #include "core/loader/nso.h" | 12 | #include "core/loader/nso.h" |
| 15 | 13 | ||