From b3bb5243e8988ab750dba6084a864f296757cd0c Mon Sep 17 00:00:00 2001 From: Kelebek1 Date: Tue, 14 Nov 2023 20:44:10 +0000 Subject: [PATCH] Split the core project into core/kernel/services as it's become a behemoth. --- src/CMakeLists.txt | 8 +- src/android/app/src/main/jni/config.cpp | 2 +- src/android/app/src/main/jni/native.cpp | 8 +- src/android/app/src/main/jni/native.h | 2 +- src/audio_core/audio_in_manager.cpp | 2 +- src/audio_core/audio_manager.cpp | 2 +- src/audio_core/audio_out_manager.cpp | 4 +- src/audio_core/audio_render_manager.h | 2 +- src/audio_core/device/device_session.h | 2 +- src/audio_core/in/audio_in.cpp | 2 +- src/audio_core/in/audio_in_system.cpp | 2 +- src/audio_core/in/audio_in_system.h | 2 +- src/audio_core/opus/decoder.h | 4 +- src/audio_core/opus/decoder_manager.h | 2 +- src/audio_core/opus/hardware_opus.h | 2 +- src/audio_core/out/audio_out.cpp | 2 +- src/audio_core/out/audio_out_system.cpp | 2 +- src/audio_core/out/audio_out_system.h | 2 +- src/audio_core/renderer/audio_renderer.cpp | 4 +- src/audio_core/renderer/audio_renderer.h | 2 +- .../renderer/behavior/behavior_info.h | 2 +- .../renderer/behavior/info_updater.h | 2 +- .../renderer/memory/pool_mapper.cpp | 4 +- src/audio_core/renderer/memory/pool_mapper.h | 2 +- src/audio_core/renderer/system.cpp | 4 +- src/audio_core/renderer/system.h | 2 +- src/core/CMakeLists.txt | 663 +----------------- src/core/{hle => }/api_version.h | 4 +- src/core/arm/arm_interface.cpp | 6 +- src/core/arm/dynarmic/arm_dynarmic_32.cpp | 4 +- src/core/arm/dynarmic/arm_dynarmic_64.cpp | 4 +- src/core/core.cpp | 26 +- src/core/cpu_manager.cpp | 10 +- src/core/crypto/key_manager.cpp | 2 +- src/core/debugger/debugger.cpp | 6 +- src/core/debugger/gdbstub.cpp | 6 +- src/core/debugger/gdbstub_arch.cpp | 2 +- src/core/device_memory.cpp | 2 +- src/core/file_sys/errors.h | 2 +- .../file_sys/fssystem/fssystem_bucket_tree.h | 2 +- .../fssystem/fssystem_compression_common.h | 2 +- .../fssystem/fssystem_pooled_buffer.h | 2 +- src/core/file_sys/patch_manager.cpp | 6 +- src/core/file_sys/romfs_factory.cpp | 4 +- src/core/file_sys/romfs_factory.h | 2 +- src/core/file_sys/savedata_factory.h | 2 +- src/core/file_sys/sdmc_factory.h | 2 +- .../file_sys/system_archive/shared_font.cpp | 2 +- .../system_archive/system_version.cpp | 30 +- .../system_archive/time_zone_binary.cpp | 2 +- src/core/frontend/applets/cabinet.h | 2 +- src/core/frontend/applets/error.h | 2 +- src/core/frontend/applets/profile_select.cpp | 2 +- src/core/frontend/applets/profile_select.h | 2 +- src/core/frontend/applets/software_keyboard.h | 2 +- src/core/frontend/applets/web_browser.h | 2 +- src/core/hid/input_interpreter.cpp | 6 +- src/core/{hle => }/ipc.h | 0 .../loader/deconstructed_rom_directory.cpp | 6 +- src/core/loader/kip.cpp | 6 +- src/core/loader/loader.cpp | 2 +- src/core/loader/nax.cpp | 2 +- src/core/loader/nca.cpp | 4 +- src/core/loader/nro.cpp | 10 +- src/core/loader/nso.cpp | 8 +- src/core/loader/nsp.cpp | 4 +- src/core/loader/xci.cpp | 4 +- src/core/memory.cpp | 4 +- src/core/memory.h | 2 +- src/core/memory/cheat_engine.cpp | 10 +- src/core/precompiled_headers.h | 2 +- src/core/reporter.cpp | 8 +- src/core/{hle => }/result.h | 0 src/kernel/CMakeLists.txt | 217 ++++++ .../arm64/k_memory_region_device_types.inc | 0 .../board/nintendo/nx/k_memory_layout.cpp | 8 +- .../board/nintendo/nx/k_memory_layout.h | 2 +- .../nx/k_memory_region_device_types.inc | 0 .../board/nintendo/nx/k_system_control.cpp | 14 +- .../board/nintendo/nx/k_system_control.h | 4 +- .../kernel/board/nintendo/nx/secure_monitor.h | 0 src/{core/hle => }/kernel/code_set.cpp | 2 +- src/{core/hle => }/kernel/code_set.h | 4 +- .../kernel/global_scheduler_context.cpp | 8 +- .../kernel/global_scheduler_context.h | 8 +- .../hle => }/kernel/init/init_slab_setup.cpp | 46 +- .../hle => }/kernel/init/init_slab_setup.h | 0 src/{core/hle => }/kernel/initial_process.h | 4 +- .../hle => }/kernel/k_address_arbiter.cpp | 16 +- src/{core/hle => }/kernel/k_address_arbiter.h | 4 +- .../hle => }/kernel/k_address_space_info.cpp | 2 +- .../hle => }/kernel/k_address_space_info.h | 0 src/{core/hle => }/kernel/k_affinity_mask.h | 0 src/{core/hle => }/kernel/k_auto_object.cpp | 4 +- src/{core/hle => }/kernel/k_auto_object.h | 2 +- .../kernel/k_auto_object_container.cpp | 2 +- .../hle => }/kernel/k_auto_object_container.h | 4 +- src/{core/hle => }/kernel/k_capabilities.cpp | 14 +- src/{core/hle => }/kernel/k_capabilities.h | 4 +- src/{core/hle => }/kernel/k_class_token.cpp | 36 +- src/{core/hle => }/kernel/k_class_token.h | 0 src/{core/hle => }/kernel/k_client_port.cpp | 12 +- src/{core/hle => }/kernel/k_client_port.h | 4 +- .../hle => }/kernel/k_client_session.cpp | 10 +- src/{core/hle => }/kernel/k_client_session.h | 6 +- src/{core/hle => }/kernel/k_code_memory.cpp | 18 +- src/{core/hle => }/kernel/k_code_memory.h | 16 +- .../hle => }/kernel/k_condition_variable.cpp | 18 +- .../hle => }/kernel/k_condition_variable.h | 10 +- src/{core/hle => }/kernel/k_debug.h | 4 +- .../kernel/k_device_address_space.cpp | 6 +- .../hle => }/kernel/k_device_address_space.h | 8 +- .../hle => }/kernel/k_dynamic_page_manager.h | 10 +- .../kernel/k_dynamic_resource_manager.h | 6 +- .../hle => }/kernel/k_dynamic_slab_heap.h | 4 +- src/{core/hle => }/kernel/k_event.cpp | 6 +- src/{core/hle => }/kernel/k_event.h | 4 +- src/{core/hle => }/kernel/k_event_info.h | 4 +- src/{core/hle => }/kernel/k_handle_table.cpp | 4 +- src/{core/hle => }/kernel/k_handle_table.h | 14 +- .../hle => }/kernel/k_hardware_timer.cpp | 4 +- src/{core/hle => }/kernel/k_hardware_timer.h | 2 +- .../hle => }/kernel/k_hardware_timer_base.h | 6 +- .../hle => }/kernel/k_interrupt_manager.cpp | 12 +- .../hle => }/kernel/k_interrupt_manager.h | 0 .../kernel/k_light_condition_variable.cpp | 10 +- .../kernel/k_light_condition_variable.h | 2 +- src/{core/hle => }/kernel/k_light_lock.cpp | 10 +- src/{core/hle => }/kernel/k_light_lock.h | 2 +- src/{core/hle => }/kernel/k_memory_block.h | 6 +- .../kernel/k_memory_block_manager.cpp | 2 +- .../hle => }/kernel/k_memory_block_manager.h | 6 +- src/{core/hle => }/kernel/k_memory_layout.cpp | 4 +- src/{core/hle => }/kernel/k_memory_layout.h | 8 +- .../hle => }/kernel/k_memory_manager.cpp | 12 +- src/{core/hle => }/kernel/k_memory_manager.h | 10 +- src/{core/hle => }/kernel/k_memory_region.h | 4 +- .../hle => }/kernel/k_memory_region_type.h | 4 +- src/{core/hle => }/kernel/k_object_name.cpp | 2 +- src/{core/hle => }/kernel/k_object_name.h | 6 +- src/{core/hle => }/kernel/k_page_bitmap.h | 2 +- src/{core/hle => }/kernel/k_page_buffer.cpp | 4 +- src/{core/hle => }/kernel/k_page_buffer.h | 4 +- src/{core/hle => }/kernel/k_page_group.cpp | 10 +- src/{core/hle => }/kernel/k_page_group.h | 4 +- src/{core/hle => }/kernel/k_page_heap.cpp | 2 +- src/{core/hle => }/kernel/k_page_heap.h | 6 +- src/{core/hle => }/kernel/k_page_table.h | 2 +- .../hle => }/kernel/k_page_table_base.cpp | 8 +- src/{core/hle => }/kernel/k_page_table_base.h | 18 +- .../hle => }/kernel/k_page_table_manager.h | 6 +- .../hle => }/kernel/k_page_table_slab_heap.h | 6 +- src/{core/hle => }/kernel/k_port.cpp | 6 +- src/{core/hle => }/kernel/k_port.h | 8 +- src/{core/hle => }/kernel/k_priority_queue.h | 0 src/{core/hle => }/kernel/k_process.cpp | 14 +- src/{core/hle => }/kernel/k_process.h | 20 +- .../hle => }/kernel/k_process_page_table.h | 6 +- .../hle => }/kernel/k_readable_event.cpp | 12 +- src/{core/hle => }/kernel/k_readable_event.h | 8 +- .../hle => }/kernel/k_resource_limit.cpp | 6 +- src/{core/hle => }/kernel/k_resource_limit.h | 4 +- src/{core/hle => }/kernel/k_scheduler.cpp | 14 +- src/{core/hle => }/kernel/k_scheduler.h | 12 +- src/{core/hle => }/kernel/k_scheduler_lock.h | 10 +- src/{core/hle => }/kernel/k_scoped_lock.h | 0 .../kernel/k_scoped_resource_reservation.h | 4 +- .../k_scoped_scheduler_lock_and_sleep.h | 8 +- src/{core/hle => }/kernel/k_server_port.cpp | 12 +- src/{core/hle => }/kernel/k_server_port.h | 4 +- .../hle => }/kernel/k_server_session.cpp | 26 +- src/{core/hle => }/kernel/k_server_session.h | 8 +- src/{core/hle => }/kernel/k_session.cpp | 10 +- src/{core/hle => }/kernel/k_session.h | 6 +- .../hle => }/kernel/k_session_request.cpp | 4 +- src/{core/hle => }/kernel/k_session_request.h | 12 +- src/{core/hle => }/kernel/k_shared_memory.cpp | 12 +- src/{core/hle => }/kernel/k_shared_memory.h | 12 +- .../hle => }/kernel/k_shared_memory_info.h | 2 +- src/{core/hle => }/kernel/k_slab_heap.h | 0 src/{core/hle => }/kernel/k_spin_lock.cpp | 2 +- src/{core/hle => }/kernel/k_spin_lock.h | 2 +- .../kernel/k_synchronization_object.cpp | 14 +- .../kernel/k_synchronization_object.h | 4 +- src/{core/hle => }/kernel/k_system_control.h | 2 +- .../hle => }/kernel/k_system_resource.cpp | 4 +- src/{core/hle => }/kernel/k_system_resource.h | 12 +- src/{core/hle => }/kernel/k_thread.cpp | 32 +- src/{core/hle => }/kernel/k_thread.h | 22 +- .../hle => }/kernel/k_thread_local_page.cpp | 12 +- .../hle => }/kernel/k_thread_local_page.h | 6 +- src/{core/hle => }/kernel/k_thread_queue.cpp | 6 +- src/{core/hle => }/kernel/k_thread_queue.h | 4 +- src/{core/hle => }/kernel/k_timer_task.h | 0 src/{core/hle => }/kernel/k_trace.h | 0 .../hle => }/kernel/k_transfer_memory.cpp | 8 +- src/{core/hle => }/kernel/k_transfer_memory.h | 8 +- src/{core/hle => }/kernel/k_typed_address.h | 0 src/{core/hle => }/kernel/k_worker_task.h | 2 +- .../hle => }/kernel/k_worker_task_manager.cpp | 10 +- .../hle => }/kernel/k_worker_task_manager.h | 0 src/{core/hle => }/kernel/kernel.cpp | 44 +- src/{core/hle => }/kernel/kernel.h | 8 +- src/{core/hle => }/kernel/memory_types.h | 2 +- src/{core/hle => }/kernel/message_buffer.h | 2 +- src/{core/hle => }/kernel/physical_core.cpp | 6 +- src/{core/hle => }/kernel/physical_core.h | 0 src/{core/hle => }/kernel/physical_memory.h | 0 src/kernel/precompiled_headers.h | 6 + src/{core/hle => }/kernel/slab_helpers.h | 6 +- src/{core/hle => }/kernel/svc.cpp | 4 +- src/{core/hle => }/kernel/svc.h | 4 +- .../hle => }/kernel/svc/svc_activity.cpp | 8 +- .../kernel/svc/svc_address_arbiter.cpp | 14 +- .../kernel/svc/svc_address_translation.cpp | 4 +- src/{core/hle => }/kernel/svc/svc_cache.cpp | 8 +- .../hle => }/kernel/svc/svc_code_memory.cpp | 8 +- .../kernel/svc/svc_condition_variable.cpp | 12 +- src/{core/hle => }/kernel/svc/svc_debug.cpp | 4 +- .../hle => }/kernel/svc/svc_debug_string.cpp | 4 +- .../kernel/svc/svc_device_address_space.cpp | 6 +- src/{core/hle => }/kernel/svc/svc_event.cpp | 10 +- .../hle => }/kernel/svc/svc_exception.cpp | 8 +- src/{core/hle => }/kernel/svc/svc_info.cpp | 6 +- .../kernel/svc/svc_insecure_memory.cpp | 4 +- .../kernel/svc/svc_interrupt_event.cpp | 4 +- src/{core/hle => }/kernel/svc/svc_io_pool.cpp | 4 +- src/{core/hle => }/kernel/svc/svc_ipc.cpp | 12 +- .../hle => }/kernel/svc/svc_kernel_debug.cpp | 2 +- .../hle => }/kernel/svc/svc_light_ipc.cpp | 4 +- src/{core/hle => }/kernel/svc/svc_lock.cpp | 6 +- src/{core/hle => }/kernel/svc/svc_memory.cpp | 4 +- .../kernel/svc/svc_physical_memory.cpp | 4 +- src/{core/hle => }/kernel/svc/svc_port.cpp | 12 +- .../kernel/svc/svc_power_management.cpp | 4 +- src/{core/hle => }/kernel/svc/svc_process.cpp | 4 +- .../kernel/svc/svc_process_memory.cpp | 4 +- .../hle => }/kernel/svc/svc_processor.cpp | 4 +- .../hle => }/kernel/svc/svc_query_memory.cpp | 4 +- .../hle => }/kernel/svc/svc_register.cpp | 4 +- .../kernel/svc/svc_resource_limit.cpp | 6 +- .../kernel/svc/svc_secure_monitor_call.cpp | 4 +- src/{core/hle => }/kernel/svc/svc_session.cpp | 8 +- .../hle => }/kernel/svc/svc_shared_memory.cpp | 6 +- .../kernel/svc/svc_synchronization.cpp | 10 +- src/{core/hle => }/kernel/svc/svc_thread.cpp | 10 +- .../kernel/svc/svc_thread_profiler.cpp | 4 +- src/{core/hle => }/kernel/svc/svc_tick.cpp | 4 +- .../kernel/svc/svc_transfer_memory.cpp | 8 +- src/{core/hle => }/kernel/svc_common.h | 0 src/{core/hle => }/kernel/svc_generator.py | 8 +- src/{core/hle => }/kernel/svc_results.h | 2 +- src/{core/hle => }/kernel/svc_types.h | 0 src/{core/hle => }/kernel/svc_version.h | 0 src/service/CMakeLists.txt | 522 ++++++++++++++ src/{core/hle => }/service/acc/acc.cpp | 22 +- src/{core/hle => }/service/acc/acc.h | 4 +- src/{core/hle => }/service/acc/acc_aa.cpp | 2 +- src/{core/hle => }/service/acc/acc_aa.h | 2 +- src/{core/hle => }/service/acc/acc_su.cpp | 2 +- src/{core/hle => }/service/acc/acc_su.h | 2 +- src/{core/hle => }/service/acc/acc_u0.cpp | 2 +- src/{core/hle => }/service/acc/acc_u0.h | 2 +- src/{core/hle => }/service/acc/acc_u1.cpp | 2 +- src/{core/hle => }/service/acc/acc_u1.h | 2 +- .../hle => }/service/acc/async_context.cpp | 6 +- .../hle => }/service/acc/async_context.h | 4 +- src/{core/hle => }/service/acc/errors.h | 2 +- .../hle => }/service/acc/profile_manager.cpp | 2 +- .../hle => }/service/acc/profile_manager.h | 2 +- src/{core/hle => }/service/am/am.cpp | 62 +- src/{core/hle => }/service/am/am.h | 4 +- src/{core/hle => }/service/am/applet_ae.cpp | 8 +- src/{core/hle => }/service/am/applet_ae.h | 2 +- src/{core/hle => }/service/am/applet_oe.cpp | 8 +- src/{core/hle => }/service/am/applet_oe.h | 2 +- .../service/am/applets/applet_cabinet.cpp | 12 +- .../service/am/applets/applet_cabinet.h | 8 +- .../service/am/applets/applet_controller.cpp | 8 +- .../service/am/applets/applet_controller.h | 4 +- .../service/am/applets/applet_error.cpp | 4 +- .../service/am/applets/applet_error.h | 4 +- .../am/applets/applet_general_backend.cpp | 6 +- .../am/applets/applet_general_backend.h | 2 +- .../service/am/applets/applet_mii_edit.cpp | 10 +- .../service/am/applets/applet_mii_edit.h | 6 +- .../am/applets/applet_mii_edit_types.h | 2 +- .../am/applets/applet_profile_select.cpp | 6 +- .../am/applets/applet_profile_select.h | 4 +- .../am/applets/applet_software_keyboard.cpp | 4 +- .../am/applets/applet_software_keyboard.h | 6 +- .../applets/applet_software_keyboard_types.h | 0 .../service/am/applets/applet_web_browser.cpp | 10 +- .../service/am/applets/applet_web_browser.h | 6 +- .../am/applets/applet_web_browser_types.h | 0 .../hle => }/service/am/applets/applets.cpp | 28 +- .../hle => }/service/am/applets/applets.h | 2 +- src/{core/hle => }/service/am/idle.cpp | 2 +- src/{core/hle => }/service/am/idle.h | 2 +- src/{core/hle => }/service/am/omm.cpp | 2 +- src/{core/hle => }/service/am/omm.h | 2 +- src/{core/hle => }/service/am/spsm.cpp | 2 +- src/{core/hle => }/service/am/spsm.h | 2 +- src/{core/hle => }/service/aoc/aoc_u.cpp | 8 +- src/{core/hle => }/service/aoc/aoc_u.h | 4 +- src/{core/hle => }/service/apm/apm.cpp | 6 +- src/{core/hle => }/service/apm/apm.h | 0 .../hle => }/service/apm/apm_controller.cpp | 2 +- .../hle => }/service/apm/apm_controller.h | 0 .../hle => }/service/apm/apm_interface.cpp | 8 +- .../hle => }/service/apm/apm_interface.h | 2 +- src/{core/hle => }/service/audio/audctl.cpp | 4 +- src/{core/hle => }/service/audio/audctl.h | 2 +- src/{core/hle => }/service/audio/audin_u.cpp | 6 +- src/{core/hle => }/service/audio/audin_u.h | 4 +- src/{core/hle => }/service/audio/audio.cpp | 20 +- src/{core/hle => }/service/audio/audio.h | 0 src/{core/hle => }/service/audio/audout_u.cpp | 8 +- src/{core/hle => }/service/audio/audout_u.h | 4 +- src/{core/hle => }/service/audio/audrec_a.cpp | 2 +- src/{core/hle => }/service/audio/audrec_a.h | 2 +- src/{core/hle => }/service/audio/audrec_u.cpp | 2 +- src/{core/hle => }/service/audio/audrec_u.h | 2 +- src/{core/hle => }/service/audio/audren_u.cpp | 12 +- src/{core/hle => }/service/audio/audren_u.h | 4 +- src/{core/hle => }/service/audio/errors.h | 2 +- src/{core/hle => }/service/audio/hwopus.cpp | 4 +- src/{core/hle => }/service/audio/hwopus.h | 2 +- .../hle => }/service/bcat/backend/backend.cpp | 4 +- .../hle => }/service/bcat/backend/backend.h | 4 +- src/{core/hle => }/service/bcat/bcat.cpp | 2 +- src/{core/hle => }/service/bcat/bcat.h | 2 +- .../hle => }/service/bcat/bcat_module.cpp | 14 +- src/{core/hle => }/service/bcat/bcat_module.h | 2 +- src/{core/hle => }/service/bpc/bpc.cpp | 6 +- src/{core/hle => }/service/bpc/bpc.h | 0 src/{core/hle => }/service/btdrv/btdrv.cpp | 14 +- src/{core/hle => }/service/btdrv/btdrv.h | 0 src/{core/hle => }/service/btm/btm.cpp | 12 +- src/{core/hle => }/service/btm/btm.h | 0 src/{core/hle => }/service/caps/caps.cpp | 20 +- src/{core/hle => }/service/caps/caps.h | 0 src/{core/hle => }/service/caps/caps_a.cpp | 10 +- src/{core/hle => }/service/caps/caps_a.h | 2 +- src/{core/hle => }/service/caps/caps_c.cpp | 10 +- src/{core/hle => }/service/caps/caps_c.h | 2 +- .../hle => }/service/caps/caps_manager.cpp | 8 +- .../hle => }/service/caps/caps_manager.h | 4 +- src/{core/hle => }/service/caps/caps_result.h | 2 +- src/{core/hle => }/service/caps/caps_sc.cpp | 2 +- src/{core/hle => }/service/caps/caps_sc.h | 2 +- src/{core/hle => }/service/caps/caps_ss.cpp | 8 +- src/{core/hle => }/service/caps/caps_ss.h | 2 +- src/{core/hle => }/service/caps/caps_su.cpp | 8 +- src/{core/hle => }/service/caps/caps_su.h | 2 +- src/{core/hle => }/service/caps/caps_types.h | 0 src/{core/hle => }/service/caps/caps_u.cpp | 8 +- src/{core/hle => }/service/caps/caps_u.h | 2 +- src/{core/hle => }/service/erpt/erpt.cpp | 8 +- src/{core/hle => }/service/erpt/erpt.h | 0 src/{core/hle => }/service/es/es.cpp | 8 +- src/{core/hle => }/service/es/es.h | 0 src/{core/hle => }/service/eupld/eupld.cpp | 6 +- src/{core/hle => }/service/eupld/eupld.h | 0 src/{core/hle => }/service/fatal/fatal.cpp | 10 +- src/{core/hle => }/service/fatal/fatal.h | 2 +- src/{core/hle => }/service/fatal/fatal_p.cpp | 2 +- src/{core/hle => }/service/fatal/fatal_p.h | 2 +- src/{core/hle => }/service/fatal/fatal_u.cpp | 2 +- src/{core/hle => }/service/fatal/fatal_u.h | 2 +- src/{core/hle => }/service/fgm/fgm.cpp | 10 +- src/{core/hle => }/service/fgm/fgm.h | 0 .../service/filesystem/filesystem.cpp | 10 +- .../hle => }/service/filesystem/filesystem.h | 2 +- .../hle => }/service/filesystem/fsp_ldr.cpp | 2 +- .../hle => }/service/filesystem/fsp_ldr.h | 2 +- .../hle => }/service/filesystem/fsp_pr.cpp | 2 +- .../hle => }/service/filesystem/fsp_pr.h | 2 +- .../hle => }/service/filesystem/fsp_srv.cpp | 10 +- .../hle => }/service/filesystem/fsp_srv.h | 2 +- src/{core/hle => }/service/friend/friend.cpp | 14 +- src/{core/hle => }/service/friend/friend.h | 2 +- .../service/friend/friend_interface.cpp | 2 +- .../service/friend/friend_interface.h | 2 +- src/{core/hle => }/service/glue/arp.cpp | 12 +- src/{core/hle => }/service/glue/arp.h | 2 +- src/{core/hle => }/service/glue/bgtc.cpp | 4 +- src/{core/hle => }/service/glue/bgtc.h | 2 +- src/{core/hle => }/service/glue/ectx.cpp | 4 +- src/{core/hle => }/service/glue/ectx.h | 2 +- src/{core/hle => }/service/glue/errors.h | 2 +- src/{core/hle => }/service/glue/glue.cpp | 12 +- src/{core/hle => }/service/glue/glue.h | 0 .../hle => }/service/glue/glue_manager.cpp | 4 +- .../hle => }/service/glue/glue_manager.h | 2 +- src/{core/hle => }/service/glue/notif.cpp | 4 +- src/{core/hle => }/service/glue/notif.h | 2 +- src/{core/hle => }/service/grc/grc.cpp | 6 +- src/{core/hle => }/service/grc/grc.h | 0 .../hid/controllers/console_sixaxis.cpp | 2 +- .../service/hid/controllers/console_sixaxis.h | 4 +- .../hid/controllers/controller_base.cpp | 2 +- .../service/hid/controllers/controller_base.h | 0 .../service/hid/controllers/debug_pad.cpp | 2 +- .../service/hid/controllers/debug_pad.h | 4 +- .../service/hid/controllers/gesture.cpp | 2 +- .../service/hid/controllers/gesture.h | 4 +- .../service/hid/controllers/keyboard.cpp | 2 +- .../service/hid/controllers/keyboard.h | 4 +- .../service/hid/controllers/mouse.cpp | 2 +- .../hle => }/service/hid/controllers/mouse.h | 4 +- .../hle => }/service/hid/controllers/npad.cpp | 10 +- .../hle => }/service/hid/controllers/npad.h | 4 +- .../service/hid/controllers/palma.cpp | 8 +- .../hle => }/service/hid/controllers/palma.h | 4 +- .../service/hid/controllers/stubbed.cpp | 2 +- .../service/hid/controllers/stubbed.h | 2 +- .../service/hid/controllers/touchscreen.cpp | 2 +- .../service/hid/controllers/touchscreen.h | 4 +- .../hle => }/service/hid/controllers/xpad.cpp | 2 +- .../hle => }/service/hid/controllers/xpad.h | 4 +- src/{core/hle => }/service/hid/errors.h | 2 +- src/{core/hle => }/service/hid/hid.cpp | 44 +- src/{core/hle => }/service/hid/hid.h | 6 +- src/{core/hle => }/service/hid/hidbus.cpp | 20 +- src/{core/hle => }/service/hid/hidbus.h | 6 +- .../service/hid/hidbus/hidbus_base.cpp | 8 +- .../hle => }/service/hid/hidbus/hidbus_base.h | 2 +- .../hle => }/service/hid/hidbus/ringcon.cpp | 6 +- .../hle => }/service/hid/hidbus/ringcon.h | 2 +- .../hle => }/service/hid/hidbus/starlink.cpp | 2 +- .../hle => }/service/hid/hidbus/starlink.h | 2 +- .../hle => }/service/hid/hidbus/stubbed.cpp | 2 +- .../hle => }/service/hid/hidbus/stubbed.h | 2 +- src/{core/hle => }/service/hid/irs.cpp | 24 +- src/{core/hle => }/service/hid/irs.h | 4 +- .../hle => }/service/hid/irs_ring_lifo.h | 0 .../hid/irsensor/clustering_processor.cpp | 2 +- .../hid/irsensor/clustering_processor.h | 4 +- .../hid/irsensor/image_transfer_processor.cpp | 2 +- .../hid/irsensor/image_transfer_processor.h | 2 +- .../service/hid/irsensor/ir_led_processor.cpp | 2 +- .../service/hid/irsensor/ir_led_processor.h | 2 +- .../service/hid/irsensor/moment_processor.cpp | 2 +- .../service/hid/irsensor/moment_processor.h | 4 +- .../hid/irsensor/pointing_processor.cpp | 2 +- .../service/hid/irsensor/pointing_processor.h | 2 +- .../service/hid/irsensor/processor_base.cpp | 2 +- .../service/hid/irsensor/processor_base.h | 0 .../hid/irsensor/tera_plugin_processor.cpp | 2 +- .../hid/irsensor/tera_plugin_processor.h | 2 +- src/{core/hle => }/service/hid/ring_lifo.h | 0 src/{core/hle => }/service/hid/xcd.cpp | 2 +- src/{core/hle => }/service/hid/xcd.h | 2 +- src/{core/hle => }/service/hle_ipc.cpp | 18 +- src/{core/hle => }/service/hle_ipc.h | 4 +- src/{core/hle => }/service/ipc_helpers.h | 14 +- src/{core/hle => }/service/jit/jit.cpp | 16 +- src/{core/hle => }/service/jit/jit.h | 0 .../hle => }/service/jit/jit_context.cpp | 2 +- src/{core/hle => }/service/jit/jit_context.h | 0 src/{core/hle => }/service/kernel_helpers.cpp | 14 +- src/{core/hle => }/service/kernel_helpers.h | 2 + src/{core/hle => }/service/lbl/lbl.cpp | 10 +- src/{core/hle => }/service/lbl/lbl.h | 0 .../hle => }/service/ldn/lan_discovery.cpp | 2 +- .../hle => }/service/ldn/lan_discovery.h | 6 +- src/{core/hle => }/service/ldn/ldn.cpp | 16 +- src/{core/hle => }/service/ldn/ldn.h | 10 +- src/{core/hle => }/service/ldn/ldn_results.h | 2 +- src/{core/hle => }/service/ldn/ldn_types.h | 0 src/{core/hle => }/service/ldr/ldr.cpp | 14 +- src/{core/hle => }/service/ldr/ldr.h | 0 src/{core/hle => }/service/lm/lm.cpp | 8 +- src/{core/hle => }/service/lm/lm.h | 0 src/{core/hle => }/service/mig/mig.cpp | 6 +- src/{core/hle => }/service/mig/mig.h | 0 src/{core/hle => }/service/mii/mii.cpp | 18 +- src/{core/hle => }/service/mii/mii.h | 2 +- .../hle => }/service/mii/mii_database.cpp | 6 +- src/{core/hle => }/service/mii/mii_database.h | 4 +- .../service/mii/mii_database_manager.cpp | 10 +- .../service/mii/mii_database_manager.h | 4 +- .../hle => }/service/mii/mii_manager.cpp | 18 +- src/{core/hle => }/service/mii/mii_manager.h | 6 +- src/{core/hle => }/service/mii/mii_result.h | 2 +- src/{core/hle => }/service/mii/mii_types.h | 0 src/{core/hle => }/service/mii/mii_util.h | 2 +- .../hle => }/service/mii/types/char_info.cpp | 4 +- .../hle => }/service/mii/types/char_info.h | 2 +- .../hle => }/service/mii/types/core_data.cpp | 8 +- .../hle => }/service/mii/types/core_data.h | 2 +- .../hle => }/service/mii/types/raw_data.cpp | 2 +- .../hle => }/service/mii/types/raw_data.h | 2 +- .../hle => }/service/mii/types/store_data.cpp | 8 +- .../hle => }/service/mii/types/store_data.h | 6 +- .../service/mii/types/ver3_store_data.cpp | 8 +- .../service/mii/types/ver3_store_data.h | 2 +- src/{core/hle => }/service/mm/mm_u.cpp | 8 +- src/{core/hle => }/service/mm/mm_u.h | 0 src/{core/hle => }/service/mnpp/mnpp_app.cpp | 8 +- src/{core/hle => }/service/mnpp/mnpp_app.h | 0 src/{core/hle => }/service/mutex.cpp | 6 +- src/{core/hle => }/service/mutex.h | 0 src/{core/hle => }/service/ncm/ncm.cpp | 8 +- src/{core/hle => }/service/ncm/ncm.h | 0 .../service/nfc/common/amiibo_crypto.cpp | 2 +- .../service/nfc/common/amiibo_crypto.h | 2 +- .../hle => }/service/nfc/common/device.cpp | 16 +- .../hle => }/service/nfc/common/device.h | 12 +- .../service/nfc/common/device_manager.cpp | 14 +- .../service/nfc/common/device_manager.h | 12 +- .../hle => }/service/nfc/mifare_result.h | 2 +- src/{core/hle => }/service/nfc/mifare_types.h | 0 src/{core/hle => }/service/nfc/nfc.cpp | 10 +- src/{core/hle => }/service/nfc/nfc.h | 0 .../hle => }/service/nfc/nfc_interface.cpp | 22 +- .../hle => }/service/nfc/nfc_interface.h | 6 +- src/{core/hle => }/service/nfc/nfc_result.h | 2 +- src/{core/hle => }/service/nfc/nfc_types.h | 0 src/{core/hle => }/service/nfp/nfp.cpp | 8 +- src/{core/hle => }/service/nfp/nfp.h | 2 +- .../hle => }/service/nfp/nfp_interface.cpp | 16 +- .../hle => }/service/nfp/nfp_interface.h | 6 +- src/{core/hle => }/service/nfp/nfp_result.h | 2 +- src/{core/hle => }/service/nfp/nfp_types.h | 8 +- src/{core/hle => }/service/ngc/ngc.cpp | 8 +- src/{core/hle => }/service/ngc/ngc.h | 0 src/{core/hle => }/service/nifm/nifm.cpp | 10 +- src/{core/hle => }/service/nifm/nifm.h | 2 +- src/{core/hle => }/service/nim/nim.cpp | 12 +- src/{core/hle => }/service/nim/nim.h | 0 src/{core/hle => }/service/npns/npns.cpp | 6 +- src/{core/hle => }/service/npns/npns.h | 0 src/{core/hle => }/service/ns/errors.h | 2 +- .../service/ns/iplatform_service_manager.cpp | 12 +- .../service/ns/iplatform_service_manager.h | 2 +- src/{core/hle => }/service/ns/language.cpp | 4 +- src/{core/hle => }/service/ns/language.h | 0 src/{core/hle => }/service/ns/ns.cpp | 20 +- src/{core/hle => }/service/ns/ns.h | 2 +- src/{core/hle => }/service/ns/pdm_qry.cpp | 6 +- src/{core/hle => }/service/ns/pdm_qry.h | 2 +- .../hle => }/service/nvdrv/core/container.cpp | 6 +- .../hle => }/service/nvdrv/core/container.h | 2 +- .../hle => }/service/nvdrv/core/nvmap.cpp | 2 +- src/{core/hle => }/service/nvdrv/core/nvmap.h | 2 +- .../service/nvdrv/core/syncpoint_manager.cpp | 2 +- .../service/nvdrv/core/syncpoint_manager.h | 2 +- .../nvdrv/devices/ioctl_serialization.h | 2 +- .../hle => }/service/nvdrv/devices/nvdevice.h | 2 +- .../service/nvdrv/devices/nvdisp_disp0.cpp | 6 +- .../service/nvdrv/devices/nvdisp_disp0.h | 6 +- .../service/nvdrv/devices/nvhost_as_gpu.cpp | 12 +- .../service/nvdrv/devices/nvhost_as_gpu.h | 4 +- .../service/nvdrv/devices/nvhost_ctrl.cpp | 10 +- .../service/nvdrv/devices/nvhost_ctrl.h | 4 +- .../service/nvdrv/devices/nvhost_ctrl_gpu.cpp | 6 +- .../service/nvdrv/devices/nvhost_ctrl_gpu.h | 2 +- .../service/nvdrv/devices/nvhost_gpu.cpp | 12 +- .../service/nvdrv/devices/nvhost_gpu.h | 4 +- .../service/nvdrv/devices/nvhost_nvdec.cpp | 6 +- .../service/nvdrv/devices/nvhost_nvdec.h | 2 +- .../nvdrv/devices/nvhost_nvdec_common.cpp | 8 +- .../nvdrv/devices/nvhost_nvdec_common.h | 4 +- .../service/nvdrv/devices/nvhost_nvjpg.cpp | 4 +- .../service/nvdrv/devices/nvhost_nvjpg.h | 2 +- .../service/nvdrv/devices/nvhost_vic.cpp | 6 +- .../service/nvdrv/devices/nvhost_vic.h | 2 +- .../hle => }/service/nvdrv/devices/nvmap.cpp | 12 +- .../hle => }/service/nvdrv/devices/nvmap.h | 4 +- src/{core/hle => }/service/nvdrv/nvdata.h | 0 src/{core/hle => }/service/nvdrv/nvdrv.cpp | 38 +- src/{core/hle => }/service/nvdrv/nvdrv.h | 10 +- .../service/nvdrv/nvdrv_interface.cpp | 12 +- .../hle => }/service/nvdrv/nvdrv_interface.h | 4 +- src/{core/hle => }/service/nvdrv/nvmemp.cpp | 2 +- src/{core/hle => }/service/nvdrv/nvmemp.h | 2 +- .../hle => }/service/nvnflinger/binder.h | 0 .../hle => }/service/nvnflinger/buffer_item.h | 4 +- .../nvnflinger/buffer_item_consumer.cpp | 6 +- .../service/nvnflinger/buffer_item_consumer.h | 4 +- .../nvnflinger/buffer_queue_consumer.cpp | 12 +- .../nvnflinger/buffer_queue_consumer.h | 4 +- .../service/nvnflinger/buffer_queue_core.cpp | 2 +- .../service/nvnflinger/buffer_queue_core.h | 10 +- .../service/nvnflinger/buffer_queue_defs.h | 2 +- .../nvnflinger/buffer_queue_producer.cpp | 26 +- .../nvnflinger/buffer_queue_producer.h | 16 +- .../hle => }/service/nvnflinger/buffer_slot.h | 2 +- .../nvnflinger/buffer_transform_flags.h | 0 .../service/nvnflinger/consumer_base.cpp | 10 +- .../service/nvnflinger/consumer_base.h | 6 +- .../service/nvnflinger/consumer_listener.h | 0 .../nvnflinger/fb_share_buffer_manager.cpp | 20 +- .../nvnflinger/fb_share_buffer_manager.h | 4 +- .../nvnflinger/graphic_buffer_producer.cpp | 4 +- .../nvnflinger/graphic_buffer_producer.h | 4 +- .../nvnflinger/hos_binder_driver_server.cpp | 2 +- .../nvnflinger/hos_binder_driver_server.h | 4 +- .../service/nvnflinger/nvnflinger.cpp | 24 +- .../hle => }/service/nvnflinger/nvnflinger.h | 4 +- .../hle => }/service/nvnflinger/parcel.h | 0 .../service/nvnflinger/pixel_format.h | 0 .../service/nvnflinger/producer_listener.h | 0 .../hle => }/service/nvnflinger/status.h | 0 .../hle => }/service/nvnflinger/ui/fence.h | 2 +- .../service/nvnflinger/ui/graphic_buffer.h | 2 +- .../hle => }/service/nvnflinger/window.h | 0 src/{core/hle => }/service/olsc/olsc.cpp | 8 +- src/{core/hle => }/service/olsc/olsc.h | 0 src/{core/hle => }/service/pcie/pcie.cpp | 6 +- src/{core/hle => }/service/pcie/pcie.h | 0 src/{core/hle => }/service/pctl/pctl.cpp | 2 +- src/{core/hle => }/service/pctl/pctl.h | 2 +- .../hle => }/service/pctl/pctl_module.cpp | 10 +- src/{core/hle => }/service/pctl/pctl_module.h | 2 +- src/{core/hle => }/service/pcv/pcv.cpp | 8 +- src/{core/hle => }/service/pcv/pcv.h | 0 src/{core/hle => }/service/pm/pm.cpp | 12 +- src/{core/hle => }/service/pm/pm.h | 0 src/service/precompiled_headers.h | 6 + src/{core/hle => }/service/prepo/prepo.cpp | 10 +- src/{core/hle => }/service/prepo/prepo.h | 0 src/{core/hle => }/service/psc/psc.cpp | 8 +- src/{core/hle => }/service/psc/psc.h | 0 src/{core/hle => }/service/ptm/psm.cpp | 8 +- src/{core/hle => }/service/ptm/psm.h | 2 +- src/{core/hle => }/service/ptm/ptm.cpp | 8 +- src/{core/hle => }/service/ptm/ptm.h | 0 src/{core/hle => }/service/ptm/ts.cpp | 4 +- src/{core/hle => }/service/ptm/ts.h | 2 +- src/{core/hle => }/service/server_manager.cpp | 26 +- src/{core/hle => }/service/server_manager.h | 4 +- src/{core/hle => }/service/service.cpp | 124 ++-- src/{core/hle => }/service/service.h | 2 +- src/{core/hle => }/service/set/set.cpp | 4 +- src/{core/hle => }/service/set/set.h | 2 +- src/{core/hle => }/service/set/set_cal.cpp | 2 +- src/{core/hle => }/service/set/set_cal.h | 2 +- src/{core/hle => }/service/set/set_fd.cpp | 2 +- src/{core/hle => }/service/set/set_fd.h | 2 +- src/{core/hle => }/service/set/set_sys.cpp | 8 +- src/{core/hle => }/service/set/set_sys.h | 4 +- src/{core/hle => }/service/set/settings.cpp | 12 +- src/{core/hle => }/service/set/settings.h | 0 src/{core/hle => }/service/sm/sm.cpp | 20 +- src/{core/hle => }/service/sm/sm.h | 6 +- .../hle => }/service/sm/sm_controller.cpp | 16 +- src/{core/hle => }/service/sm/sm_controller.h | 2 +- src/{core/hle => }/service/sockets/bsd.cpp | 8 +- src/{core/hle => }/service/sockets/bsd.h | 4 +- src/{core/hle => }/service/sockets/nsd.cpp | 4 +- src/{core/hle => }/service/sockets/nsd.h | 2 +- .../hle => }/service/sockets/sfdnsres.cpp | 8 +- src/{core/hle => }/service/sockets/sfdnsres.h | 2 +- .../hle => }/service/sockets/sockets.cpp | 10 +- src/{core/hle => }/service/sockets/sockets.h | 0 .../service/sockets/sockets_translate.cpp | 4 +- .../service/sockets/sockets_translate.h | 2 +- src/{core/hle => }/service/spl/csrng.cpp | 2 +- src/{core/hle => }/service/spl/csrng.h | 2 +- src/{core/hle => }/service/spl/spl.cpp | 2 +- src/{core/hle => }/service/spl/spl.h | 2 +- src/{core/hle => }/service/spl/spl_module.cpp | 20 +- src/{core/hle => }/service/spl/spl_module.h | 6 +- src/{core/hle => }/service/spl/spl_results.h | 2 +- src/{core/hle => }/service/spl/spl_types.h | 0 src/{core/hle => }/service/ssl/ssl.cpp | 16 +- src/{core/hle => }/service/ssl/ssl.h | 0 src/{core/hle => }/service/ssl/ssl_backend.h | 2 +- .../hle => }/service/ssl/ssl_backend_none.cpp | 2 +- .../service/ssl/ssl_backend_openssl.cpp | 2 +- .../service/ssl/ssl_backend_schannel.cpp | 2 +- .../ssl/ssl_backend_securetransport.cpp | 2 +- src/{core/hle => }/service/time/clock_types.h | 6 +- ...eral_network_system_clock_context_writer.h | 2 +- .../ephemeral_network_system_clock_core.h | 2 +- src/{core/hle => }/service/time/errors.h | 2 +- .../time/local_system_clock_context_writer.h | 4 +- .../network_system_clock_context_writer.h | 6 +- .../time/standard_local_system_clock_core.h | 2 +- .../time/standard_network_system_clock_core.h | 6 +- .../time/standard_steady_clock_core.cpp | 2 +- .../service/time/standard_steady_clock_core.h | 4 +- .../time/standard_user_system_clock_core.cpp | 8 +- .../time/standard_user_system_clock_core.h | 6 +- .../hle => }/service/time/steady_clock_core.h | 2 +- .../system_clock_context_update_callback.cpp | 6 +- .../system_clock_context_update_callback.h | 2 +- .../service/time/system_clock_core.cpp | 6 +- .../hle => }/service/time/system_clock_core.h | 2 +- .../time/tick_based_steady_clock_core.cpp | 2 +- .../time/tick_based_steady_clock_core.h | 4 +- src/{core/hle => }/service/time/time.cpp | 16 +- src/{core/hle => }/service/time/time.h | 4 +- .../hle => }/service/time/time_interface.cpp | 2 +- .../hle => }/service/time/time_interface.h | 2 +- .../hle => }/service/time/time_manager.cpp | 12 +- .../hle => }/service/time/time_manager.h | 14 +- .../service/time/time_sharedmemory.cpp | 8 +- .../hle => }/service/time/time_sharedmemory.h | 4 +- .../time/time_zone_content_manager.cpp | 10 +- .../service/time/time_zone_content_manager.h | 2 +- .../service/time/time_zone_manager.cpp | 4 +- .../hle => }/service/time/time_zone_manager.h | 4 +- .../service/time/time_zone_service.cpp | 8 +- .../hle => }/service/time/time_zone_service.h | 2 +- .../hle => }/service/time/time_zone_types.h | 0 src/{core/hle => }/service/usb/usb.cpp | 8 +- src/{core/hle => }/service/usb/usb.h | 0 .../service/vi/display/vi_display.cpp | 24 +- .../hle => }/service/vi/display/vi_display.h | 2 +- .../hle => }/service/vi/layer/vi_layer.cpp | 2 +- .../hle => }/service/vi/layer/vi_layer.h | 0 src/{core/hle => }/service/vi/vi.cpp | 38 +- src/{core/hle => }/service/vi/vi.h | 0 src/{core/hle => }/service/vi/vi_m.cpp | 4 +- src/{core/hle => }/service/vi/vi_m.h | 2 +- src/{core/hle => }/service/vi/vi_results.h | 2 +- src/{core/hle => }/service/vi/vi_s.cpp | 4 +- src/{core/hle => }/service/vi/vi_s.h | 2 +- src/{core/hle => }/service/vi/vi_u.cpp | 4 +- src/{core/hle => }/service/vi/vi_u.h | 2 +- src/video_core/framebuffer_config.h | 4 +- src/video_core/gpu.cpp | 2 +- src/video_core/gpu.h | 2 +- src/video_core/memory_manager.cpp | 4 +- src/yuzu/CMakeLists.txt | 2 +- src/yuzu/applets/qt_amiibo_settings.cpp | 4 +- src/yuzu/applets/qt_controller.cpp | 6 +- src/yuzu/applets/qt_profile_select.h | 2 +- src/yuzu/configuration/config.cpp | 4 +- src/yuzu/configuration/configure_input.cpp | 8 +- .../configure_profile_manager.cpp | 2 +- src/yuzu/configuration/configure_system.cpp | 2 +- src/yuzu/debugger/wait_tree.cpp | 18 +- src/yuzu/debugger/wait_tree.h | 4 +- src/yuzu/main.cpp | 16 +- src/yuzu/multiplayer/lobby.cpp | 2 +- src/yuzu/play_time_manager.cpp | 2 +- src/yuzu_cmd/config.cpp | 2 +- src/yuzu_cmd/yuzu.cpp | 2 +- 743 files changed, 2844 insertions(+), 2742 deletions(-) rename src/core/{hle => }/api_version.h (95%) rename src/core/{hle => }/ipc.h (100%) rename src/core/{hle => }/result.h (100%) create mode 100644 src/kernel/CMakeLists.txt rename src/{core/hle => }/kernel/arch/arm64/k_memory_region_device_types.inc (100%) rename src/{core/hle => }/kernel/board/nintendo/nx/k_memory_layout.cpp (98%) rename src/{core/hle => }/kernel/board/nintendo/nx/k_memory_layout.h (83%) rename src/{core/hle => }/kernel/board/nintendo/nx/k_memory_region_device_types.inc (100%) rename src/{core/hle => }/kernel/board/nintendo/nx/k_system_control.cpp (96%) rename src/{core/hle => }/kernel/board/nintendo/nx/k_system_control.h (95%) rename src/{core/hle => }/kernel/board/nintendo/nx/secure_monitor.h (100%) rename src/{core/hle => }/kernel/code_set.cpp (84%) rename src/{core/hle => }/kernel/code_set.h (95%) rename src/{core/hle => }/kernel/global_scheduler_context.cpp (91%) rename src/{core/hle => }/kernel/global_scheduler_context.h (93%) rename src/{core/hle => }/kernel/init/init_slab_setup.cpp (92%) rename src/{core/hle => }/kernel/init/init_slab_setup.h (100%) rename src/{core/hle => }/kernel/initial_process.h (82%) rename src/{core/hle => }/kernel/k_address_arbiter.cpp (96%) rename src/{core/hle => }/kernel/k_address_arbiter.h (95%) rename src/{core/hle => }/kernel/k_address_space_info.cpp (98%) rename src/{core/hle => }/kernel/k_address_space_info.h (100%) rename src/{core/hle => }/kernel/k_affinity_mask.h (100%) rename src/{core/hle => }/kernel/k_auto_object.cpp (85%) rename src/{core/hle => }/kernel/k_auto_object.h (99%) rename src/{core/hle => }/kernel/k_auto_object_container.cpp (93%) rename src/{core/hle => }/kernel/k_auto_object_container.h (95%) rename src/{core/hle => }/kernel/k_capabilities.cpp (97%) rename src/{core/hle => }/kernel/k_capabilities.h (99%) rename src/{core/hle => }/kernel/k_class_token.cpp (89%) rename src/{core/hle => }/kernel/k_class_token.h (100%) rename src/{core/hle => }/kernel/k_client_port.cpp (93%) rename src/{core/hle => }/kernel/k_client_port.h (93%) rename src/{core/hle => }/kernel/k_client_session.cpp (83%) rename src/{core/hle => }/kernel/k_client_session.h (89%) rename src/{core/hle => }/kernel/k_code_memory.cpp (92%) rename src/{core/hle => }/kernel/k_code_memory.h (82%) rename src/{core/hle => }/kernel/k_condition_variable.cpp (96%) rename src/{core/hle => }/kernel/k_condition_variable.h (88%) rename src/{core/hle => }/kernel/k_debug.h (84%) rename src/{core/hle => }/kernel/k_device_address_space.cpp (97%) rename src/{core/hle => }/kernel/k_device_address_space.h (91%) rename src/{core/hle => }/kernel/k_dynamic_page_manager.h (95%) rename src/{core/hle => }/kernel/k_dynamic_resource_manager.h (92%) rename src/{core/hle => }/kernel/k_dynamic_slab_heap.h (97%) rename src/{core/hle => }/kernel/k_event.cpp (92%) rename src/{core/hle => }/kernel/k_event.h (93%) rename src/{core/hle => }/kernel/k_event_info.h (94%) rename src/{core/hle => }/kernel/k_handle_table.cpp (98%) rename src/{core/hle => }/kernel/k_handle_table.h (97%) rename src/{core/hle => }/kernel/k_hardware_timer.cpp (96%) rename src/{core/hle => }/kernel/k_hardware_timer.h (95%) rename src/{core/hle => }/kernel/k_hardware_timer_base.h (95%) rename src/{core/hle => }/kernel/k_interrupt_manager.cpp (83%) rename src/{core/hle => }/kernel/k_interrupt_manager.h (100%) rename src/{core/hle => }/kernel/k_light_condition_variable.cpp (90%) rename src/{core/hle => }/kernel/k_light_condition_variable.h (93%) rename src/{core/hle => }/kernel/k_light_lock.cpp (95%) rename src/{core/hle => }/kernel/k_light_lock.h (94%) rename src/{core/hle => }/kernel/k_memory_block.h (99%) rename src/{core/hle => }/kernel/k_memory_block_manager.cpp (99%) rename src/{core/hle => }/kernel/k_memory_block_manager.h (97%) rename src/{core/hle => }/kernel/k_memory_layout.cpp (98%) rename src/{core/hle => }/kernel/k_memory_layout.h (98%) rename src/{core/hle => }/kernel/k_memory_manager.cpp (98%) rename src/{core/hle => }/kernel/k_memory_manager.h (98%) rename src/{core/hle => }/kernel/k_memory_region.h (99%) rename src/{core/hle => }/kernel/k_memory_region_type.h (99%) rename src/{core/hle => }/kernel/k_object_name.cpp (98%) rename src/{core/hle => }/kernel/k_object_name.h (95%) rename src/{core/hle => }/kernel/k_page_bitmap.h (99%) rename src/{core/hle => }/kernel/k_page_buffer.cpp (85%) rename src/{core/hle => }/kernel/k_page_buffer.h (90%) rename src/{core/hle => }/kernel/k_page_group.cpp (92%) rename src/{core/hle => }/kernel/k_page_group.h (98%) rename src/{core/hle => }/kernel/k_page_heap.cpp (99%) rename src/{core/hle => }/kernel/k_page_heap.h (98%) rename src/{core/hle => }/kernel/k_page_table.h (87%) rename src/{core/hle => }/kernel/k_page_table_base.cpp (99%) rename src/{core/hle => }/kernel/k_page_table_base.h (98%) rename src/{core/hle => }/kernel/k_page_table_manager.h (89%) rename src/{core/hle => }/kernel/k_page_table_slab_heap.h (94%) rename src/{core/hle => }/kernel/k_port.cpp (92%) rename src/{core/hle => }/kernel/k_port.h (89%) rename src/{core/hle => }/kernel/k_priority_queue.h (100%) rename src/{core/hle => }/kernel/k_process.cpp (99%) rename src/{core/hle => }/kernel/k_process.h (97%) rename src/{core/hle => }/kernel/k_process_page_table.h (99%) rename src/{core/hle => }/kernel/k_readable_event.cpp (84%) rename src/{core/hle => }/kernel/k_readable_event.h (80%) rename src/{core/hle => }/kernel/k_resource_limit.cpp (97%) rename src/{core/hle => }/kernel/k_resource_limit.h (94%) rename src/{core/hle => }/kernel/k_scheduler.cpp (99%) rename src/{core/hle => }/kernel/k_scheduler.h (94%) rename src/{core/hle => }/kernel/k_scheduler_lock.h (91%) rename src/{core/hle => }/kernel/k_scoped_lock.h (100%) rename src/{core/hle => }/kernel/k_scoped_resource_reservation.h (95%) rename src/{core/hle => }/kernel/k_scoped_scheduler_lock_and_sleep.h (87%) rename src/{core/hle => }/kernel/k_server_port.cpp (90%) rename src/{core/hle => }/kernel/k_server_port.h (91%) rename src/{core/hle => }/kernel/k_server_session.cpp (97%) rename src/{core/hle => }/kernel/k_server_session.h (91%) rename src/{core/hle => }/kernel/k_session.cpp (89%) rename src/{core/hle => }/kernel/k_session.h (93%) rename src/{core/hle => }/kernel/k_session_request.cpp (96%) rename src/{core/hle => }/kernel/k_session_request.h (97%) rename src/{core/hle => }/kernel/k_shared_memory.cpp (93%) rename src/{core/hle => }/kernel/k_shared_memory.h (92%) rename src/{core/hle => }/kernel/k_shared_memory_info.h (95%) rename src/{core/hle => }/kernel/k_slab_heap.h (100%) rename src/{core/hle => }/kernel/k_spin_lock.cpp (88%) rename src/{core/hle => }/kernel/k_spin_lock.h (94%) rename src/{core/hle => }/kernel/k_synchronization_object.cpp (94%) rename src/{core/hle => }/kernel/k_synchronization_object.h (96%) rename src/{core/hle => }/kernel/k_system_control.h (84%) rename src/{core/hle => }/kernel/k_system_resource.cpp (97%) rename src/{core/hle => }/kernel/k_system_resource.h (93%) rename src/{core/hle => }/kernel/k_thread.cpp (98%) rename src/{core/hle => }/kernel/k_thread.h (98%) rename src/{core/hle => }/kernel/k_thread_local_page.cpp (88%) rename src/{core/hle => }/kernel/k_thread_local_page.h (96%) rename src/{core/hle => }/kernel/k_thread_queue.cpp (91%) rename src/{core/hle => }/kernel/k_thread_queue.h (93%) rename src/{core/hle => }/kernel/k_timer_task.h (100%) rename src/{core/hle => }/kernel/k_trace.h (100%) rename src/{core/hle => }/kernel/k_transfer_memory.cpp (95%) rename src/{core/hle => }/kernel/k_transfer_memory.h (90%) rename src/{core/hle => }/kernel/k_typed_address.h (100%) rename src/{core/hle => }/kernel/k_worker_task.h (84%) rename src/{core/hle => }/kernel/k_worker_task_manager.cpp (83%) rename src/{core/hle => }/kernel/k_worker_task_manager.h (100%) rename src/{core/hle => }/kernel/kernel.cpp (98%) rename src/{core/hle => }/kernel/kernel.h (98%) rename src/{core/hle => }/kernel/memory_types.h (88%) rename src/{core/hle => }/kernel/message_buffer.h (99%) rename src/{core/hle => }/kernel/physical_core.cpp (94%) rename src/{core/hle => }/kernel/physical_core.h (100%) rename src/{core/hle => }/kernel/physical_memory.h (100%) create mode 100644 src/kernel/precompiled_headers.h rename src/{core/hle => }/kernel/slab_helpers.h (97%) rename src/{core/hle => }/kernel/svc.cpp (99%) rename src/{core/hle => }/kernel/svc.h (99%) rename src/{core/hle => }/kernel/svc/svc_activity.cpp (94%) rename src/{core/hle => }/kernel/svc/svc_address_arbiter.cpp (92%) rename src/{core/hle => }/kernel/svc/svc_address_translation.cpp (96%) rename src/{core/hle => }/kernel/svc/svc_cache.cpp (95%) rename src/{core/hle => }/kernel/svc/svc_code_memory.cpp (97%) rename src/{core/hle => }/kernel/svc/svc_condition_variable.cpp (91%) rename src/{core/hle => }/kernel/svc/svc_debug.cpp (99%) rename src/{core/hle => }/kernel/svc/svc_debug_string.cpp (92%) rename src/{core/hle => }/kernel/svc/svc_device_address_space.cpp (98%) rename src/{core/hle => }/kernel/svc/svc_event.cpp (94%) rename src/{core/hle => }/kernel/svc/svc_exception.cpp (97%) rename src/{core/hle => }/kernel/svc/svc_info.cpp (98%) rename src/{core/hle => }/kernel/svc/svc_insecure_memory.cpp (93%) rename src/{core/hle => }/kernel/svc/svc_interrupt_event.cpp (92%) rename src/{core/hle => }/kernel/svc/svc_io_pool.cpp (97%) rename src/{core/hle => }/kernel/svc/svc_ipc.cpp (96%) rename src/{core/hle => }/kernel/svc/svc_kernel_debug.cpp (97%) rename src/{core/hle => }/kernel/svc/svc_light_ipc.cpp (96%) rename src/{core/hle => }/kernel/svc/svc_lock.cpp (93%) rename src/{core/hle => }/kernel/svc/svc_memory.cpp (99%) rename src/{core/hle => }/kernel/svc/svc_physical_memory.cpp (98%) rename src/{core/hle => }/kernel/svc/svc_port.cpp (95%) rename src/{core/hle => }/kernel/svc/svc_power_management.cpp (84%) rename src/{core/hle => }/kernel/svc/svc_process.cpp (99%) rename src/{core/hle => }/kernel/svc/svc_process_memory.cpp (99%) rename src/{core/hle => }/kernel/svc/svc_processor.cpp (89%) rename src/{core/hle => }/kernel/svc/svc_query_memory.cpp (97%) rename src/{core/hle => }/kernel/svc/svc_register.cpp (91%) rename src/{core/hle => }/kernel/svc/svc_resource_limit.cpp (98%) rename src/{core/hle => }/kernel/svc/svc_secure_monitor_call.cpp (94%) rename src/{core/hle => }/kernel/svc/svc_session.cpp (96%) rename src/{core/hle => }/kernel/svc/svc_shared_memory.cpp (97%) rename src/{core/hle => }/kernel/svc/svc_synchronization.cpp (96%) rename src/{core/hle => }/kernel/svc/svc_thread.cpp (98%) rename src/{core/hle => }/kernel/svc/svc_thread_profiler.cpp (96%) rename src/{core/hle => }/kernel/svc/svc_tick.cpp (91%) rename src/{core/hle => }/kernel/svc/svc_transfer_memory.cpp (97%) rename src/{core/hle => }/kernel/svc_common.h (100%) rename src/{core/hle => }/kernel/svc_generator.py (99%) rename src/{core/hle => }/kernel/svc_results.h (98%) rename src/{core/hle => }/kernel/svc_types.h (100%) rename src/{core/hle => }/kernel/svc_version.h (100%) create mode 100644 src/service/CMakeLists.txt rename src/{core/hle => }/service/acc/acc.cpp (98%) rename src/{core/hle => }/service/acc/acc.h (96%) rename src/{core/hle => }/service/acc/acc_aa.cpp (95%) rename src/{core/hle => }/service/acc/acc_aa.h (91%) rename src/{core/hle => }/service/acc/acc_su.cpp (98%) rename src/{core/hle => }/service/acc/acc_su.h (91%) rename src/{core/hle => }/service/acc/acc_u0.cpp (98%) rename src/{core/hle => }/service/acc/acc_u0.h (91%) rename src/{core/hle => }/service/acc/acc_u1.cpp (98%) rename src/{core/hle => }/service/acc/acc_u1.h (91%) rename src/{core/hle => }/service/acc/async_context.cpp (93%) rename src/{core/hle => }/service/acc/async_context.h (91%) rename src/{core/hle => }/service/acc/errors.h (96%) rename src/{core/hle => }/service/acc/profile_manager.cpp (99%) rename src/{core/hle => }/service/acc/profile_manager.h (99%) rename src/{core/hle => }/service/am/am.cpp (98%) rename src/{core/hle => }/service/am/am.h (99%) rename src/{core/hle => }/service/am/applet_ae.cpp (98%) rename src/{core/hle => }/service/am/applet_ae.h (96%) rename src/{core/hle => }/service/am/applet_oe.cpp (96%) rename src/{core/hle => }/service/am/applet_oe.h (95%) rename src/{core/hle => }/service/am/applets/applet_cabinet.cpp (95%) rename src/{core/hle => }/service/am/applets/applet_cabinet.h (94%) rename src/{core/hle => }/service/am/applets/applet_controller.cpp (98%) rename src/{core/hle => }/service/am/applets/applet_controller.h (98%) rename src/{core/hle => }/service/am/applets/applet_error.cpp (98%) rename src/{core/hle => }/service/am/applets/applet_error.h (93%) rename src/{core/hle => }/service/am/applets/applet_general_backend.cpp (98%) rename src/{core/hle => }/service/am/applets/applet_general_backend.h (97%) rename src/{core/hle => }/service/am/applets/applet_mii_edit.cpp (96%) rename src/{core/hle => }/service/am/applets/applet_mii_edit.h (90%) rename src/{core/hle => }/service/am/applets/applet_mii_edit_types.h (97%) rename src/{core/hle => }/service/am/applets/applet_profile_select.cpp (96%) rename src/{core/hle => }/service/am/applets/applet_profile_select.h (98%) rename src/{core/hle => }/service/am/applets/applet_software_keyboard.cpp (99%) rename src/{core/hle => }/service/am/applets/applet_software_keyboard.h (97%) rename src/{core/hle => }/service/am/applets/applet_software_keyboard_types.h (100%) rename src/{core/hle => }/service/am/applets/applet_web_browser.cpp (98%) rename src/{core/hle => }/service/am/applets/applet_web_browser.h (93%) rename src/{core/hle => }/service/am/applets/applet_web_browser_types.h (100%) rename src/{core/hle => }/service/am/applets/applets.cpp (93%) rename src/{core/hle => }/service/am/applets/applets.h (99%) rename src/{core/hle => }/service/am/idle.cpp (94%) rename src/{core/hle => }/service/am/idle.h (90%) rename src/{core/hle => }/service/am/omm.cpp (98%) rename src/{core/hle => }/service/am/omm.h (89%) rename src/{core/hle => }/service/am/spsm.cpp (96%) rename src/{core/hle => }/service/am/spsm.h (89%) rename src/{core/hle => }/service/aoc/aoc_u.cpp (98%) rename src/{core/hle => }/service/aoc/aoc_u.h (93%) rename src/{core/hle => }/service/apm/apm.cpp (86%) rename src/{core/hle => }/service/apm/apm.h (100%) rename src/{core/hle => }/service/apm/apm_controller.cpp (98%) rename src/{core/hle => }/service/apm/apm_controller.h (100%) rename src/{core/hle => }/service/apm/apm_interface.cpp (96%) rename src/{core/hle => }/service/apm/apm_interface.h (96%) rename src/{core/hle => }/service/audio/audctl.cpp (98%) rename src/{core/hle => }/service/audio/audctl.h (96%) rename src/{core/hle => }/service/audio/audin_u.cpp (99%) rename src/{core/hle => }/service/audio/audin_u.h (91%) rename src/{core/hle => }/service/audio/audio.cpp (69%) rename src/{core/hle => }/service/audio/audio.h (100%) rename src/{core/hle => }/service/audio/audout_u.cpp (98%) rename src/{core/hle => }/service/audio/audout_u.h (90%) rename src/{core/hle => }/service/audio/audrec_a.cpp (91%) rename src/{core/hle => }/service/audio/audrec_a.h (90%) rename src/{core/hle => }/service/audio/audrec_u.cpp (97%) rename src/{core/hle => }/service/audio/audrec_u.h (90%) rename src/{core/hle => }/service/audio/audren_u.cpp (98%) rename src/{core/hle => }/service/audio/audren_u.h (91%) rename src/{core/hle => }/service/audio/errors.h (98%) rename src/{core/hle => }/service/audio/hwopus.cpp (99%) rename src/{core/hle => }/service/audio/hwopus.h (96%) rename src/{core/hle => }/service/bcat/backend/backend.cpp (97%) rename src/{core/hle => }/service/bcat/backend/backend.h (98%) rename src/{core/hle => }/service/bcat/bcat.cpp (95%) rename src/{core/hle => }/service/bcat/bcat.h (90%) rename src/{core/hle => }/service/bcat/bcat_module.cpp (98%) rename src/{core/hle => }/service/bcat/bcat_module.h (96%) rename src/{core/hle => }/service/bpc/bpc.cpp (94%) rename src/{core/hle => }/service/bpc/bpc.h (100%) rename src/{core/hle => }/service/btdrv/btdrv.cpp (96%) rename src/{core/hle => }/service/btdrv/btdrv.h (100%) rename src/{core/hle => }/service/btm/btm.cpp (98%) rename src/{core/hle => }/service/btm/btm.h (100%) rename src/{core/hle => }/service/caps/caps.cpp (73%) rename src/{core/hle => }/service/caps/caps.h (100%) rename src/{core/hle => }/service/caps/caps_a.cpp (97%) rename src/{core/hle => }/service/caps/caps_a.h (96%) rename src/{core/hle => }/service/caps/caps_c.cpp (90%) rename src/{core/hle => }/service/caps/caps_c.h (94%) rename src/{core/hle => }/service/caps/caps_manager.cpp (98%) rename src/{core/hle => }/service/caps/caps_manager.h (98%) rename src/{core/hle => }/service/caps/caps_result.h (98%) rename src/{core/hle => }/service/caps/caps_sc.cpp (97%) rename src/{core/hle => }/service/caps/caps_sc.h (91%) rename src/{core/hle => }/service/caps/caps_ss.cpp (95%) rename src/{core/hle => }/service/caps/caps_ss.h (94%) rename src/{core/hle => }/service/caps/caps_su.cpp (96%) rename src/{core/hle => }/service/caps/caps_su.h (96%) rename src/{core/hle => }/service/caps/caps_types.h (100%) rename src/{core/hle => }/service/caps/caps_u.cpp (96%) rename src/{core/hle => }/service/caps/caps_u.h (95%) rename src/{core/hle => }/service/erpt/erpt.cpp (93%) rename src/{core/hle => }/service/erpt/erpt.h (100%) rename src/{core/hle => }/service/es/es.cpp (98%) rename src/{core/hle => }/service/es/es.h (100%) rename src/{core/hle => }/service/eupld/eupld.cpp (93%) rename src/{core/hle => }/service/eupld/eupld.h (100%) rename src/{core/hle => }/service/fatal/fatal.cpp (96%) rename src/{core/hle => }/service/fatal/fatal.h (95%) rename src/{core/hle => }/service/fatal/fatal_p.cpp (91%) rename src/{core/hle => }/service/fatal/fatal_p.h (89%) rename src/{core/hle => }/service/fatal/fatal_u.cpp (93%) rename src/{core/hle => }/service/fatal/fatal_u.h (89%) rename src/{core/hle => }/service/fgm/fgm.cpp (91%) rename src/{core/hle => }/service/fgm/fgm.h (100%) rename src/{core/hle => }/service/filesystem/filesystem.cpp (99%) rename src/{core/hle => }/service/filesystem/filesystem.h (99%) rename src/{core/hle => }/service/filesystem/fsp_ldr.cpp (91%) rename src/{core/hle => }/service/filesystem/fsp_ldr.h (90%) rename src/{core/hle => }/service/filesystem/fsp_pr.cpp (92%) rename src/{core/hle => }/service/filesystem/fsp_pr.h (90%) rename src/{core/hle => }/service/filesystem/fsp_srv.cpp (99%) rename src/{core/hle => }/service/filesystem/fsp_srv.h (98%) rename src/{core/hle => }/service/friend/friend.cpp (97%) rename src/{core/hle => }/service/friend/friend.h (94%) rename src/{core/hle => }/service/friend/friend_interface.cpp (92%) rename src/{core/hle => }/service/friend/friend_interface.h (89%) rename src/{core/hle => }/service/glue/arp.cpp (97%) rename src/{core/hle => }/service/glue/arp.h (96%) rename src/{core/hle => }/service/glue/bgtc.cpp (96%) rename src/{core/hle => }/service/glue/bgtc.h (94%) rename src/{core/hle => }/service/glue/ectx.cpp (95%) rename src/{core/hle => }/service/glue/ectx.h (91%) rename src/{core/hle => }/service/glue/errors.h (92%) rename src/{core/hle => }/service/glue/glue.cpp (82%) rename src/{core/hle => }/service/glue/glue.h (100%) rename src/{core/hle => }/service/glue/glue_manager.cpp (95%) rename src/{core/hle => }/service/glue/glue_manager.h (98%) rename src/{core/hle => }/service/glue/notif.cpp (98%) rename src/{core/hle => }/service/glue/notif.h (98%) rename src/{core/hle => }/service/grc/grc.cpp (89%) rename src/{core/hle => }/service/grc/grc.h (100%) rename src/{core/hle => }/service/hid/controllers/console_sixaxis.cpp (97%) rename src/{core/hle => }/service/hid/controllers/console_sixaxis.h (95%) rename src/{core/hle => }/service/hid/controllers/controller_base.cpp (91%) rename src/{core/hle => }/service/hid/controllers/controller_base.h (100%) rename src/{core/hle => }/service/hid/controllers/debug_pad.cpp (97%) rename src/{core/hle => }/service/hid/controllers/debug_pad.h (95%) rename src/{core/hle => }/service/hid/controllers/gesture.cpp (99%) rename src/{core/hle => }/service/hid/controllers/gesture.h (98%) rename src/{core/hle => }/service/hid/controllers/keyboard.cpp (97%) rename src/{core/hle => }/service/hid/controllers/keyboard.h (94%) rename src/{core/hle => }/service/hid/controllers/mouse.cpp (97%) rename src/{core/hle => }/service/hid/controllers/mouse.h (92%) rename src/{core/hle => }/service/hid/controllers/npad.cpp (99%) rename src/{core/hle => }/service/hid/controllers/npad.h (99%) rename src/{core/hle => }/service/hid/controllers/palma.cpp (97%) rename src/{core/hle => }/service/hid/controllers/palma.h (98%) rename src/{core/hle => }/service/hid/controllers/stubbed.cpp (95%) rename src/{core/hle => }/service/hid/controllers/stubbed.h (94%) rename src/{core/hle => }/service/hid/controllers/touchscreen.cpp (98%) rename src/{core/hle => }/service/hid/controllers/touchscreen.h (94%) rename src/{core/hle => }/service/hid/controllers/xpad.cpp (96%) rename src/{core/hle => }/service/hid/controllers/xpad.h (97%) rename src/{core/hle => }/service/hid/errors.h (97%) rename src/{core/hle => }/service/hid/hid.cpp (99%) rename src/{core/hle => }/service/hid/hid.h (98%) rename src/{core/hle => }/service/hid/hidbus.cpp (97%) rename src/{core/hle => }/service/hid/hidbus.h (96%) rename src/{core/hle => }/service/hid/hidbus/hidbus_base.cpp (89%) rename src/{core/hle => }/service/hid/hidbus/hidbus_base.h (99%) rename src/{core/hle => }/service/hid/hidbus/ringcon.cpp (98%) rename src/{core/hle => }/service/hid/hidbus/ringcon.h (99%) rename src/{core/hle => }/service/hid/hidbus/starlink.cpp (95%) rename src/{core/hle => }/service/hid/hidbus/starlink.h (94%) rename src/{core/hle => }/service/hid/hidbus/stubbed.cpp (95%) rename src/{core/hle => }/service/hid/hidbus/stubbed.h (94%) rename src/{core/hle => }/service/hid/irs.cpp (97%) rename src/{core/hle => }/service/hid/irs.h (97%) rename src/{core/hle => }/service/hid/irs_ring_lifo.h (100%) rename src/{core/hle => }/service/hid/irsensor/clustering_processor.cpp (99%) rename src/{core/hle => }/service/hid/irsensor/clustering_processor.h (97%) rename src/{core/hle => }/service/hid/irsensor/image_transfer_processor.cpp (99%) rename src/{core/hle => }/service/hid/irsensor/image_transfer_processor.h (97%) rename src/{core/hle => }/service/hid/irsensor/ir_led_processor.cpp (93%) rename src/{core/hle => }/service/hid/irsensor/ir_led_processor.h (95%) rename src/{core/hle => }/service/hid/irsensor/moment_processor.cpp (99%) rename src/{core/hle => }/service/hid/irsensor/moment_processor.h (96%) rename src/{core/hle => }/service/hid/irsensor/pointing_processor.cpp (93%) rename src/{core/hle => }/service/hid/irsensor/pointing_processor.h (97%) rename src/{core/hle => }/service/hid/irsensor/processor_base.cpp (97%) rename src/{core/hle => }/service/hid/irsensor/processor_base.h (100%) rename src/{core/hle => }/service/hid/irsensor/tera_plugin_processor.cpp (93%) rename src/{core/hle => }/service/hid/irsensor/tera_plugin_processor.h (96%) rename src/{core/hle => }/service/hid/ring_lifo.h (100%) rename src/{core/hle => }/service/hid/xcd.cpp (97%) rename src/{core/hle => }/service/hid/xcd.h (90%) rename src/{core/hle => }/service/hle_ipc.cpp (98%) rename src/{core/hle => }/service/hle_ipc.h (99%) rename src/{core/hle => }/service/ipc_helpers.h (98%) rename src/{core/hle => }/service/jit/jit.cpp (97%) rename src/{core/hle => }/service/jit/jit.h (100%) rename src/{core/hle => }/service/jit/jit_context.cpp (99%) rename src/{core/hle => }/service/jit/jit_context.h (100%) rename src/{core/hle => }/service/kernel_helpers.cpp (85%) rename src/{core/hle => }/service/kernel_helpers.h (87%) rename src/{core/hle => }/service/lbl/lbl.cpp (98%) rename src/{core/hle => }/service/lbl/lbl.h (100%) rename src/{core/hle => }/service/ldn/lan_discovery.cpp (99%) rename src/{core/hle => }/service/ldn/lan_discovery.h (97%) rename src/{core/hle => }/service/ldn/ldn.cpp (98%) rename src/{core/hle => }/service/ldn/ldn.h (57%) rename src/{core/hle => }/service/ldn/ldn_results.h (97%) rename src/{core/hle => }/service/ldn/ldn_types.h (100%) rename src/{core/hle => }/service/ldr/ldr.cpp (98%) rename src/{core/hle => }/service/ldr/ldr.h (100%) rename src/{core/hle => }/service/lm/lm.cpp (98%) rename src/{core/hle => }/service/lm/lm.h (100%) rename src/{core/hle => }/service/mig/mig.cpp (91%) rename src/{core/hle => }/service/mig/mig.h (100%) rename src/{core/hle => }/service/mii/mii.cpp (97%) rename src/{core/hle => }/service/mii/mii.h (94%) rename src/{core/hle => }/service/mii/mii_database.cpp (96%) rename src/{core/hle => }/service/mii/mii_database.h (95%) rename src/{core/hle => }/service/mii/mii_database_manager.cpp (97%) rename src/{core/hle => }/service/mii/mii_database_manager.h (96%) rename src/{core/hle => }/service/mii/mii_manager.cpp (97%) rename src/{core/hle => }/service/mii/mii_manager.h (96%) rename src/{core/hle => }/service/mii/mii_result.h (97%) rename src/{core/hle => }/service/mii/mii_types.h (100%) rename src/{core/hle => }/service/mii/mii_util.h (98%) rename src/{core/hle => }/service/mii/types/char_info.cpp (99%) rename src/{core/hle => }/service/mii/types/char_info.h (98%) rename src/{core/hle => }/service/mii/types/core_data.cpp (99%) rename src/{core/hle => }/service/mii/types/core_data.h (99%) rename src/{core/hle => }/service/mii/types/raw_data.cpp (99%) rename src/{core/hle => }/service/mii/types/raw_data.h (98%) rename src/{core/hle => }/service/mii/types/store_data.cpp (99%) rename src/{core/hle => }/service/mii/types/store_data.h (97%) rename src/{core/hle => }/service/mii/types/ver3_store_data.cpp (98%) rename src/{core/hle => }/service/mii/types/ver3_store_data.h (98%) rename src/{core/hle => }/service/mm/mm_u.cpp (95%) rename src/{core/hle => }/service/mm/mm_u.h (100%) rename src/{core/hle => }/service/mnpp/mnpp_app.cpp (88%) rename src/{core/hle => }/service/mnpp/mnpp_app.h (100%) rename src/{core/hle => }/service/mutex.cpp (90%) rename src/{core/hle => }/service/mutex.h (100%) rename src/{core/hle => }/service/ncm/ncm.cpp (97%) rename src/{core/hle => }/service/ncm/ncm.h (100%) rename src/{core/hle => }/service/nfc/common/amiibo_crypto.cpp (99%) rename src/{core/hle => }/service/nfc/common/amiibo_crypto.h (98%) rename src/{core/hle => }/service/nfc/common/device.cpp (99%) rename src/{core/hle => }/service/nfc/common/device.h (95%) rename src/{core/hle => }/service/nfc/common/device_manager.cpp (98%) rename src/{core/hle => }/service/nfc/common/device_manager.h (94%) rename src/{core/hle => }/service/nfc/mifare_result.h (95%) rename src/{core/hle => }/service/nfc/mifare_types.h (100%) rename src/{core/hle => }/service/nfc/nfc.cpp (97%) rename src/{core/hle => }/service/nfc/nfc.h (100%) rename src/{core/hle => }/service/nfc/nfc_interface.cpp (95%) rename src/{core/hle => }/service/nfc/nfc_interface.h (92%) rename src/{core/hle => }/service/nfc/nfc_result.h (98%) rename src/{core/hle => }/service/nfc/nfc_types.h (100%) rename src/{core/hle => }/service/nfp/nfp.cpp (98%) rename src/{core/hle => }/service/nfp/nfp.h (85%) rename src/{core/hle => }/service/nfp/nfp_interface.cpp (97%) rename src/{core/hle => }/service/nfp/nfp_interface.h (93%) rename src/{core/hle => }/service/nfp/nfp_result.h (97%) rename src/{core/hle => }/service/nfp/nfp_types.h (98%) rename src/{core/hle => }/service/ngc/ngc.cpp (96%) rename src/{core/hle => }/service/ngc/ngc.h (100%) rename src/{core/hle => }/service/nifm/nifm.cpp (99%) rename src/{core/hle => }/service/nifm/nifm.h (97%) rename src/{core/hle => }/service/nim/nim.cpp (98%) rename src/{core/hle => }/service/nim/nim.h (100%) rename src/{core/hle => }/service/npns/npns.cpp (97%) rename src/{core/hle => }/service/npns/npns.h (100%) rename src/{core/hle => }/service/ns/errors.h (88%) rename src/{core/hle => }/service/ns/iplatform_service_manager.cpp (97%) rename src/{core/hle => }/service/ns/iplatform_service_manager.h (98%) rename src/{core/hle => }/service/ns/language.cpp (99%) rename src/{core/hle => }/service/ns/language.h (100%) rename src/{core/hle => }/service/ns/ns.cpp (98%) rename src/{core/hle => }/service/ns/ns.h (99%) rename src/{core/hle => }/service/ns/pdm_qry.cpp (95%) rename src/{core/hle => }/service/ns/pdm_qry.h (95%) rename src/{core/hle => }/service/nvdrv/core/container.cpp (88%) rename src/{core/hle => }/service/nvdrv/core/container.h (96%) rename src/{core/hle => }/service/nvdrv/core/nvmap.cpp (99%) rename src/{core/hle => }/service/nvdrv/core/nvmap.h (99%) rename src/{core/hle => }/service/nvdrv/core/syncpoint_manager.cpp (98%) rename src/{core/hle => }/service/nvdrv/core/syncpoint_manager.h (99%) rename src/{core/hle => }/service/nvdrv/devices/ioctl_serialization.h (99%) rename src/{core/hle => }/service/nvdrv/devices/nvdevice.h (98%) rename src/{core/hle => }/service/nvdrv/devices/nvdisp_disp0.cpp (94%) rename src/{core/hle => }/service/nvdrv/devices/nvdisp_disp0.h (90%) rename src/{core/hle => }/service/nvdrv/devices/nvhost_as_gpu.cpp (98%) rename src/{core/hle => }/service/nvdrv/devices/nvhost_as_gpu.h (98%) rename src/{core/hle => }/service/nvdrv/devices/nvhost_ctrl.cpp (97%) rename src/{core/hle => }/service/nvdrv/devices/nvhost_ctrl.h (98%) rename src/{core/hle => }/service/nvdrv/devices/nvhost_ctrl_gpu.cpp (98%) rename src/{core/hle => }/service/nvdrv/devices/nvhost_ctrl_gpu.h (99%) rename src/{core/hle => }/service/nvdrv/devices/nvhost_gpu.cpp (97%) rename src/{core/hle => }/service/nvdrv/devices/nvhost_gpu.h (98%) rename src/{core/hle => }/service/nvdrv/devices/nvhost_nvdec.cpp (94%) rename src/{core/hle => }/service/nvdrv/devices/nvhost_nvdec.h (93%) rename src/{core/hle => }/service/nvdrv/devices/nvhost_nvdec_common.cpp (96%) rename src/{core/hle => }/service/nvdrv/devices/nvhost_nvdec_common.h (97%) rename src/{core/hle => }/service/nvdrv/devices/nvhost_nvjpg.cpp (93%) rename src/{core/hle => }/service/nvdrv/devices/nvhost_nvjpg.h (95%) rename src/{core/hle => }/service/nvdrv/devices/nvhost_vic.cpp (93%) rename src/{core/hle => }/service/nvdrv/devices/nvhost_vic.h (93%) rename src/{core/hle => }/service/nvdrv/devices/nvmap.cpp (96%) rename src/{core/hle => }/service/nvdrv/devices/nvmap.h (97%) rename src/{core/hle => }/service/nvdrv/nvdata.h (100%) rename src/{core/hle => }/service/nvdrv/nvdrv.cpp (87%) rename src/{core/hle => }/service/nvdrv/nvdrv.h (92%) rename src/{core/hle => }/service/nvdrv/nvdrv_interface.cpp (96%) rename src/{core/hle => }/service/nvdrv/nvdrv_interface.h (93%) rename src/{core/hle => }/service/nvdrv/nvmemp.cpp (93%) rename src/{core/hle => }/service/nvdrv/nvmemp.h (92%) rename src/{core/hle => }/service/nvnflinger/binder.h (100%) rename src/{core/hle => }/service/nvnflinger/buffer_item.h (92%) rename src/{core/hle => }/service/nvnflinger/buffer_item_consumer.cpp (91%) rename src/{core/hle => }/service/nvnflinger/buffer_item_consumer.h (89%) rename src/{core/hle => }/service/nvnflinger/buffer_queue_consumer.cpp (95%) rename src/{core/hle => }/service/nvnflinger/buffer_queue_consumer.h (92%) rename src/{core/hle => }/service/nvnflinger/buffer_queue_core.cpp (98%) rename src/{core/hle => }/service/nvnflinger/buffer_queue_core.h (90%) rename src/{core/hle => }/service/nvnflinger/buffer_queue_defs.h (92%) rename src/{core/hle => }/service/nvnflinger/buffer_queue_producer.cpp (98%) rename src/{core/hle => }/service/nvnflinger/buffer_queue_producer.h (87%) rename src/{core/hle => }/service/nvnflinger/buffer_slot.h (94%) rename src/{core/hle => }/service/nvnflinger/buffer_transform_flags.h (100%) rename src/{core/hle => }/service/nvnflinger/consumer_base.cpp (93%) rename src/{core/hle => }/service/nvnflinger/consumer_base.h (91%) rename src/{core/hle => }/service/nvnflinger/consumer_listener.h (100%) rename src/{core/hle => }/service/nvnflinger/fb_share_buffer_manager.cpp (95%) rename src/{core/hle => }/service/nvnflinger/fb_share_buffer_manager.h (95%) rename src/{core/hle => }/service/nvnflinger/graphic_buffer_producer.cpp (83%) rename src/{core/hle => }/service/nvnflinger/graphic_buffer_producer.h (96%) rename src/{core/hle => }/service/nvnflinger/hos_binder_driver_server.cpp (92%) rename src/{core/hle => }/service/nvnflinger/hos_binder_driver_server.h (88%) rename src/{core/hle => }/service/nvnflinger/nvnflinger.cpp (93%) rename src/{core/hle => }/service/nvnflinger/nvnflinger.h (98%) rename src/{core/hle => }/service/nvnflinger/parcel.h (100%) rename src/{core/hle => }/service/nvnflinger/pixel_format.h (100%) rename src/{core/hle => }/service/nvnflinger/producer_listener.h (100%) rename src/{core/hle => }/service/nvnflinger/status.h (100%) rename src/{core/hle => }/service/nvnflinger/ui/fence.h (95%) rename src/{core/hle => }/service/nvnflinger/ui/graphic_buffer.h (97%) rename src/{core/hle => }/service/nvnflinger/window.h (100%) rename src/{core/hle => }/service/olsc/olsc.cpp (98%) rename src/{core/hle => }/service/olsc/olsc.h (100%) rename src/{core/hle => }/service/pcie/pcie.cpp (94%) rename src/{core/hle => }/service/pcie/pcie.h (100%) rename src/{core/hle => }/service/pctl/pctl.cpp (93%) rename src/{core/hle => }/service/pctl/pctl.h (90%) rename src/{core/hle => }/service/pctl/pctl_module.cpp (98%) rename src/{core/hle => }/service/pctl/pctl_module.h (96%) rename src/{core/hle => }/service/pcv/pcv.cpp (97%) rename src/{core/hle => }/service/pcv/pcv.h (100%) rename src/{core/hle => }/service/pm/pm.cpp (97%) rename src/{core/hle => }/service/pm/pm.h (100%) create mode 100644 src/service/precompiled_headers.h rename src/{core/hle => }/service/prepo/prepo.cpp (97%) rename src/{core/hle => }/service/prepo/prepo.h (100%) rename src/{core/hle => }/service/psc/psc.cpp (93%) rename src/{core/hle => }/service/psc/psc.h (100%) rename src/{core/hle => }/service/ptm/psm.cpp (97%) rename src/{core/hle => }/service/ptm/psm.h (94%) rename src/{core/hle => }/service/ptm/ptm.cpp (77%) rename src/{core/hle => }/service/ptm/ptm.h (100%) rename src/{core/hle => }/service/ptm/ts.cpp (96%) rename src/{core/hle => }/service/ptm/ts.h (92%) rename src/{core/hle => }/service/server_manager.cpp (95%) rename src/{core/hle => }/service/server_manager.h (97%) rename src/{core/hle => }/service/service.cpp (81%) rename src/{core/hle => }/service/service.h (99%) rename src/{core/hle => }/service/set/set.cpp (98%) rename src/{core/hle => }/service/set/set.h (98%) rename src/{core/hle => }/service/set/set_cal.cpp (98%) rename src/{core/hle => }/service/set/set_cal.h (90%) rename src/{core/hle => }/service/set/set_fd.cpp (95%) rename src/{core/hle => }/service/set/set_fd.h (90%) rename src/{core/hle => }/service/set/set_sys.cpp (99%) rename src/{core/hle => }/service/set/set_sys.h (99%) rename src/{core/hle => }/service/set/settings.cpp (72%) rename src/{core/hle => }/service/set/settings.h (100%) rename src/{core/hle => }/service/sm/sm.cpp (95%) rename src/{core/hle => }/service/sm/sm.h (96%) rename src/{core/hle => }/service/sm/sm_controller.cpp (89%) rename src/{core/hle => }/service/sm/sm_controller.h (94%) rename src/{core/hle => }/service/sockets/bsd.cpp (99%) rename src/{core/hle => }/service/sockets/bsd.h (98%) rename src/{core/hle => }/service/sockets/nsd.cpp (97%) rename src/{core/hle => }/service/sockets/nsd.h (93%) rename src/{core/hle => }/service/sockets/sfdnsres.cpp (98%) rename src/{core/hle => }/service/sockets/sfdnsres.h (95%) rename src/{core/hle => }/service/sockets/sockets.cpp (80%) rename src/{core/hle => }/service/sockets/sockets.h (100%) rename src/{core/hle => }/service/sockets/sockets_translate.cpp (98%) rename src/{core/hle => }/service/sockets/sockets_translate.h (97%) rename src/{core/hle => }/service/spl/csrng.cpp (92%) rename src/{core/hle => }/service/spl/csrng.h (89%) rename src/{core/hle => }/service/spl/spl.cpp (99%) rename src/{core/hle => }/service/spl/spl.h (96%) rename src/{core/hle => }/service/spl/spl_module.cpp (92%) rename src/{core/hle => }/service/spl/spl_module.h (89%) rename src/{core/hle => }/service/spl/spl_results.h (97%) rename src/{core/hle => }/service/spl/spl_types.h (100%) rename src/{core/hle => }/service/ssl/ssl.cpp (98%) rename src/{core/hle => }/service/ssl/ssl.h (100%) rename src/{core/hle => }/service/ssl/ssl_backend.h (98%) rename src/{core/hle => }/service/ssl/ssl_backend_none.cpp (90%) rename src/{core/hle => }/service/ssl/ssl_backend_openssl.cpp (99%) rename src/{core/hle => }/service/ssl/ssl_backend_schannel.cpp (99%) rename src/{core/hle => }/service/ssl/ssl_backend_securetransport.cpp (99%) rename src/{core/hle => }/service/time/clock_types.h (95%) rename src/{core/hle => }/service/time/ephemeral_network_system_clock_context_writer.h (84%) rename src/{core/hle => }/service/time/ephemeral_network_system_clock_core.h (88%) rename src/{core/hle => }/service/time/errors.h (96%) rename src/{core/hle => }/service/time/local_system_clock_context_writer.h (83%) rename src/{core/hle => }/service/time/network_system_clock_context_writer.h (79%) rename src/{core/hle => }/service/time/standard_local_system_clock_core.h (88%) rename src/{core/hle => }/service/time/standard_network_system_clock_core.h (88%) rename src/{core/hle => }/service/time/standard_steady_clock_core.cpp (92%) rename src/{core/hle => }/service/time/standard_steady_clock_core.h (90%) rename src/{core/hle => }/service/time/standard_user_system_clock_core.cpp (91%) rename src/{core/hle => }/service/time/standard_user_system_clock_core.h (92%) rename src/{core/hle => }/service/time/steady_clock_core.h (96%) rename src/{core/hle => }/service/time/system_clock_context_update_callback.cpp (90%) rename src/{core/hle => }/service/time/system_clock_context_update_callback.h (95%) rename src/{core/hle => }/service/time/system_clock_core.cpp (93%) rename src/{core/hle => }/service/time/system_clock_core.h (97%) rename src/{core/hle => }/service/time/tick_based_steady_clock_core.cpp (91%) rename src/{core/hle => }/service/time/tick_based_steady_clock_core.h (85%) rename src/{core/hle => }/service/time/time.cpp (97%) rename src/{core/hle => }/service/time/time.h (95%) rename src/{core/hle => }/service/time/time_interface.cpp (97%) rename src/{core/hle => }/service/time/time_interface.h (90%) rename src/{core/hle => }/service/time/time_manager.cpp (96%) rename src/{core/hle => }/service/time/time_manager.h (82%) rename src/{core/hle => }/service/time/time_sharedmemory.cpp (93%) rename src/{core/hle => }/service/time/time_sharedmemory.h (96%) rename src/{core/hle => }/service/time/time_zone_content_manager.cpp (95%) rename src/{core/hle => }/service/time/time_zone_content_manager.h (95%) rename src/{core/hle => }/service/time/time_zone_manager.cpp (99%) rename src/{core/hle => }/service/time/time_zone_manager.h (95%) rename src/{core/hle => }/service/time/time_zone_service.cpp (97%) rename src/{core/hle => }/service/time/time_zone_service.h (96%) rename src/{core/hle => }/service/time/time_zone_types.h (100%) rename src/{core/hle => }/service/usb/usb.cpp (97%) rename src/{core/hle => }/service/usb/usb.h (100%) rename src/{core/hle => }/service/vi/display/vi_display.cpp (84%) rename src/{core/hle => }/service/vi/display/vi_display.h (99%) rename src/{core/hle => }/service/vi/layer/vi_layer.cpp (92%) rename src/{core/hle => }/service/vi/layer/vi_layer.h (100%) rename src/{core/hle => }/service/vi/vi.cpp (97%) rename src/{core/hle => }/service/vi/vi.h (100%) rename src/{core/hle => }/service/vi/vi_m.cpp (94%) rename src/{core/hle => }/service/vi/vi_m.h (95%) rename src/{core/hle => }/service/vi/vi_results.h (93%) rename src/{core/hle => }/service/vi/vi_s.cpp (93%) rename src/{core/hle => }/service/vi/vi_s.h (95%) rename src/{core/hle => }/service/vi/vi_u.cpp (93%) rename src/{core/hle => }/service/vi/vi_u.h (95%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d2ca4904ab..89f44a5a02 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -181,13 +181,15 @@ else() endif() endif() +add_subdirectory(audio_core) add_subdirectory(common) add_subdirectory(core) -add_subdirectory(audio_core) -add_subdirectory(video_core) -add_subdirectory(network) add_subdirectory(input_common) +add_subdirectory(kernel) +add_subdirectory(network) add_subdirectory(shader_recompiler) +add_subdirectory(service) +add_subdirectory(video_core) if (YUZU_ROOM) add_subdirectory(dedicated_room) diff --git a/src/android/app/src/main/jni/config.cpp b/src/android/app/src/main/jni/config.cpp index 81120ab0f1..6ae365f320 100644 --- a/src/android/app/src/main/jni/config.cpp +++ b/src/android/app/src/main/jni/config.cpp @@ -12,10 +12,10 @@ #include "common/logging/log.h" #include "common/settings.h" #include "common/settings_enums.h" -#include "core/hle/service/acc/profile_manager.h" #include "input_common/main.h" #include "jni/config.h" #include "jni/default_ini.h" +#include "service/acc/profile_manager.h" #include "uisettings.h" namespace FS = Common::FS; diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index 64663b0845..9e78e3ba75 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp @@ -47,15 +47,15 @@ #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" #include "core/hid/hid_types.h" -#include "core/hle/service/am/applet_ae.h" -#include "core/hle/service/am/applet_oe.h" -#include "core/hle/service/am/applets/applets.h" -#include "core/hle/service/filesystem/filesystem.h" #include "core/loader/loader.h" #include "jni/android_common/android_common.h" #include "jni/config.h" #include "jni/id_cache.h" #include "jni/native.h" +#include "service/am/applet_ae.h" +#include "service/am/applet_oe.h" +#include "service/am/applets/applets.h" +#include "service/filesystem/filesystem.h" #include "video_core/renderer_base.h" #define jconst [[maybe_unused]] const auto diff --git a/src/android/app/src/main/jni/native.h b/src/android/app/src/main/jni/native.h index 78ef968021..70a1a1eee8 100644 --- a/src/android/app/src/main/jni/native.h +++ b/src/android/app/src/main/jni/native.h @@ -5,10 +5,10 @@ #include "common/detached_tasks.h" #include "core/core.h" #include "core/file_sys/registered_cache.h" -#include "core/hle/service/acc/profile_manager.h" #include "core/perf_stats.h" #include "jni/applets/software_keyboard.h" #include "jni/emu_window/emu_window.h" +#include "service/acc/profile_manager.h" #include "video_core/rasterizer_interface.h" #pragma once diff --git a/src/audio_core/audio_in_manager.cpp b/src/audio_core/audio_in_manager.cpp index a3667524f9..bff39ec309 100644 --- a/src/audio_core/audio_in_manager.cpp +++ b/src/audio_core/audio_in_manager.cpp @@ -8,7 +8,7 @@ #include "audio_core/sink/sink_details.h" #include "common/settings.h" #include "core/core.h" -#include "core/hle/service/audio/errors.h" +#include "service/audio/errors.h" namespace AudioCore::AudioIn { diff --git a/src/audio_core/audio_manager.cpp b/src/audio_core/audio_manager.cpp index 10b56f2140..d2d9c4fbbe 100644 --- a/src/audio_core/audio_manager.cpp +++ b/src/audio_core/audio_manager.cpp @@ -3,7 +3,7 @@ #include "audio_core/audio_manager.h" #include "core/core.h" -#include "core/hle/service/audio/errors.h" +#include "service/audio/errors.h" namespace AudioCore { diff --git a/src/audio_core/audio_out_manager.cpp b/src/audio_core/audio_out_manager.cpp index 316ea7c817..6c03bbc7f5 100644 --- a/src/audio_core/audio_out_manager.cpp +++ b/src/audio_core/audio_out_manager.cpp @@ -6,8 +6,8 @@ #include "audio_core/audio_out_manager.h" #include "audio_core/out/audio_out.h" #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/audio/errors.h" +#include "kernel/k_event.h" +#include "service/audio/errors.h" namespace AudioCore::AudioOut { diff --git a/src/audio_core/audio_render_manager.h b/src/audio_core/audio_render_manager.h index 45537b2704..122239a34a 100644 --- a/src/audio_core/audio_render_manager.h +++ b/src/audio_core/audio_render_manager.h @@ -11,7 +11,7 @@ #include "audio_core/common/common.h" #include "audio_core/renderer/system_manager.h" -#include "core/hle/service/audio/errors.h" +#include "service/audio/errors.h" namespace Core { class System; diff --git a/src/audio_core/device/device_session.h b/src/audio_core/device/device_session.h index 7d52f362d9..3d8e302432 100644 --- a/src/audio_core/device/device_session.h +++ b/src/audio_core/device/device_session.h @@ -11,7 +11,7 @@ #include "audio_core/common/common.h" #include "audio_core/sink/sink.h" #include "common/scratch_buffer.h" -#include "core/hle/service/audio/errors.h" +#include "service/audio/errors.h" namespace Core { class System; diff --git a/src/audio_core/in/audio_in.cpp b/src/audio_core/in/audio_in.cpp index df8c44d1f2..402d25d4d0 100644 --- a/src/audio_core/in/audio_in.cpp +++ b/src/audio_core/in/audio_in.cpp @@ -3,7 +3,7 @@ #include "audio_core/audio_in_manager.h" #include "audio_core/in/audio_in.h" -#include "core/hle/kernel/k_event.h" +#include "kernel/k_event.h" namespace AudioCore::AudioIn { diff --git a/src/audio_core/in/audio_in_system.cpp b/src/audio_core/in/audio_in_system.cpp index 5791291213..1ef3964ac2 100644 --- a/src/audio_core/in/audio_in_system.cpp +++ b/src/audio_core/in/audio_in_system.cpp @@ -9,7 +9,7 @@ #include "common/logging/log.h" #include "core/core.h" #include "core/core_timing.h" -#include "core/hle/kernel/k_event.h" +#include "kernel/k_event.h" namespace AudioCore::AudioIn { diff --git a/src/audio_core/in/audio_in_system.h b/src/audio_core/in/audio_in_system.h index 1c51546381..df54641f2a 100644 --- a/src/audio_core/in/audio_in_system.h +++ b/src/audio_core/in/audio_in_system.h @@ -11,7 +11,7 @@ #include "audio_core/common/common.h" #include "audio_core/device/audio_buffers.h" #include "audio_core/device/device_session.h" -#include "core/hle/service/audio/errors.h" +#include "service/audio/errors.h" namespace Core { class System; diff --git a/src/audio_core/opus/decoder.h b/src/audio_core/opus/decoder.h index fd728958a4..94bb3b1674 100644 --- a/src/audio_core/opus/decoder.h +++ b/src/audio_core/opus/decoder.h @@ -7,8 +7,8 @@ #include "audio_core/opus/parameters.h" #include "common/common_types.h" -#include "core/hle/kernel/k_transfer_memory.h" -#include "core/hle/service/audio/errors.h" +#include "kernel/k_transfer_memory.h" +#include "service/audio/errors.h" namespace Core { class System; diff --git a/src/audio_core/opus/decoder_manager.h b/src/audio_core/opus/decoder_manager.h index 70ebc4babd..d2abbb7060 100644 --- a/src/audio_core/opus/decoder_manager.h +++ b/src/audio_core/opus/decoder_manager.h @@ -6,7 +6,7 @@ #include "audio_core/opus/hardware_opus.h" #include "audio_core/opus/parameters.h" #include "common/common_types.h" -#include "core/hle/service/audio/errors.h" +#include "service/audio/errors.h" namespace Core { class System; diff --git a/src/audio_core/opus/hardware_opus.h b/src/audio_core/opus/hardware_opus.h index b10184baa7..3c30b1aaf7 100644 --- a/src/audio_core/opus/hardware_opus.h +++ b/src/audio_core/opus/hardware_opus.h @@ -9,7 +9,7 @@ #include "audio_core/adsp/apps/opus/opus_decoder.h" #include "audio_core/adsp/apps/opus/shared_memory.h" #include "audio_core/adsp/mailbox.h" -#include "core/hle/service/audio/errors.h" +#include "service/audio/errors.h" namespace AudioCore::OpusDecoder { class HardwareOpus { diff --git a/src/audio_core/out/audio_out.cpp b/src/audio_core/out/audio_out.cpp index b7ea134055..52e6d3c5f9 100644 --- a/src/audio_core/out/audio_out.cpp +++ b/src/audio_core/out/audio_out.cpp @@ -3,7 +3,7 @@ #include "audio_core/audio_out_manager.h" #include "audio_core/out/audio_out.h" -#include "core/hle/kernel/k_event.h" +#include "kernel/k_event.h" namespace AudioCore::AudioOut { diff --git a/src/audio_core/out/audio_out_system.cpp b/src/audio_core/out/audio_out_system.cpp index 0adf64bd34..3b21151f48 100644 --- a/src/audio_core/out/audio_out_system.cpp +++ b/src/audio_core/out/audio_out_system.cpp @@ -9,7 +9,7 @@ #include "common/logging/log.h" #include "core/core.h" #include "core/core_timing.h" -#include "core/hle/kernel/k_event.h" +#include "kernel/k_event.h" namespace AudioCore::AudioOut { diff --git a/src/audio_core/out/audio_out_system.h b/src/audio_core/out/audio_out_system.h index b95cb91bec..18c0009311 100644 --- a/src/audio_core/out/audio_out_system.h +++ b/src/audio_core/out/audio_out_system.h @@ -11,7 +11,7 @@ #include "audio_core/common/common.h" #include "audio_core/device/audio_buffers.h" #include "audio_core/device/device_session.h" -#include "core/hle/service/audio/errors.h" +#include "service/audio/errors.h" namespace Core { class System; diff --git a/src/audio_core/renderer/audio_renderer.cpp b/src/audio_core/renderer/audio_renderer.cpp index 09efe9be9d..d528d31670 100644 --- a/src/audio_core/renderer/audio_renderer.cpp +++ b/src/audio_core/renderer/audio_renderer.cpp @@ -6,8 +6,8 @@ #include "audio_core/renderer/audio_renderer.h" #include "audio_core/renderer/system_manager.h" #include "core/core.h" -#include "core/hle/kernel/k_transfer_memory.h" -#include "core/hle/service/audio/errors.h" +#include "kernel/k_transfer_memory.h" +#include "service/audio/errors.h" namespace AudioCore::Renderer { diff --git a/src/audio_core/renderer/audio_renderer.h b/src/audio_core/renderer/audio_renderer.h index 24650278b0..6852e630ef 100644 --- a/src/audio_core/renderer/audio_renderer.h +++ b/src/audio_core/renderer/audio_renderer.h @@ -6,7 +6,7 @@ #include #include "audio_core/renderer/system.h" -#include "core/hle/service/audio/errors.h" +#include "service/audio/errors.h" namespace Core { class System; diff --git a/src/audio_core/renderer/behavior/behavior_info.h b/src/audio_core/renderer/behavior/behavior_info.h index a4958857a4..33888c914f 100644 --- a/src/audio_core/renderer/behavior/behavior_info.h +++ b/src/audio_core/renderer/behavior/behavior_info.h @@ -8,7 +8,7 @@ #include "audio_core/common/common.h" #include "common/common_types.h" -#include "core/hle/service/audio/errors.h" +#include "service/audio/errors.h" namespace AudioCore::Renderer { /** diff --git a/src/audio_core/renderer/behavior/info_updater.h b/src/audio_core/renderer/behavior/info_updater.h index fb4b7d25a9..2b0e46bc1e 100644 --- a/src/audio_core/renderer/behavior/info_updater.h +++ b/src/audio_core/renderer/behavior/info_updater.h @@ -6,7 +6,7 @@ #include #include "common/common_types.h" -#include "core/hle/service/audio/errors.h" +#include "service/audio/errors.h" namespace AudioCore::Renderer { class BehaviorInfo; diff --git a/src/audio_core/renderer/memory/pool_mapper.cpp b/src/audio_core/renderer/memory/pool_mapper.cpp index 999bb746be..67c64aa592 100644 --- a/src/audio_core/renderer/memory/pool_mapper.cpp +++ b/src/audio_core/renderer/memory/pool_mapper.cpp @@ -3,8 +3,8 @@ #include "audio_core/renderer/memory/address_info.h" #include "audio_core/renderer/memory/pool_mapper.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_process.h" +#include "kernel/svc.h" namespace AudioCore::Renderer { diff --git a/src/audio_core/renderer/memory/pool_mapper.h b/src/audio_core/renderer/memory/pool_mapper.h index 95ae5d8ea2..09beb5390c 100644 --- a/src/audio_core/renderer/memory/pool_mapper.h +++ b/src/audio_core/renderer/memory/pool_mapper.h @@ -8,7 +8,7 @@ #include "audio_core/renderer/behavior/behavior_info.h" #include "audio_core/renderer/memory/memory_pool_info.h" #include "common/common_types.h" -#include "core/hle/service/audio/errors.h" +#include "service/audio/errors.h" namespace AudioCore::Renderer { class AddressInfo; diff --git a/src/audio_core/renderer/system.cpp b/src/audio_core/renderer/system.cpp index 31f92087ca..9a7323f662 100644 --- a/src/audio_core/renderer/system.cpp +++ b/src/audio_core/renderer/system.cpp @@ -31,9 +31,9 @@ #include "common/alignment.h" #include "core/core.h" #include "core/core_timing.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_transfer_memory.h" #include "core/memory.h" +#include "kernel/k_event.h" +#include "kernel/k_transfer_memory.h" namespace AudioCore::Renderer { diff --git a/src/audio_core/renderer/system.h b/src/audio_core/renderer/system.h index 8a83417106..b9d5ca0e03 100644 --- a/src/audio_core/renderer/system.h +++ b/src/audio_core/renderer/system.h @@ -18,7 +18,7 @@ #include "audio_core/renderer/upsampler/upsampler_manager.h" #include "audio_core/renderer/voice/voice_context.h" #include "common/thread.h" -#include "core/hle/service/audio/errors.h" +#include "service/audio/errors.h" namespace Core { namespace Memory { diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 8be3bdd080..24d1c68eb0 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -197,642 +197,9 @@ add_library(core STATIC hid/irs_types.h hid/motion_input.cpp hid/motion_input.h - hle/api_version.h - hle/ipc.h - hle/kernel/board/nintendo/nx/k_memory_layout.cpp - hle/kernel/board/nintendo/nx/k_memory_layout.h - hle/kernel/board/nintendo/nx/k_system_control.cpp - hle/kernel/board/nintendo/nx/k_system_control.h - hle/kernel/board/nintendo/nx/secure_monitor.h - hle/kernel/code_set.cpp - hle/kernel/code_set.h - hle/kernel/svc_results.h - hle/kernel/global_scheduler_context.cpp - hle/kernel/global_scheduler_context.h - hle/kernel/init/init_slab_setup.cpp - hle/kernel/init/init_slab_setup.h - hle/kernel/initial_process.h - hle/kernel/k_address_arbiter.cpp - hle/kernel/k_address_arbiter.h - hle/kernel/k_address_space_info.cpp - hle/kernel/k_address_space_info.h - hle/kernel/k_auto_object.cpp - hle/kernel/k_auto_object.h - hle/kernel/k_auto_object_container.cpp - hle/kernel/k_auto_object_container.h - hle/kernel/k_affinity_mask.h - hle/kernel/k_capabilities.cpp - hle/kernel/k_capabilities.h - hle/kernel/k_class_token.cpp - hle/kernel/k_class_token.h - hle/kernel/k_client_port.cpp - hle/kernel/k_client_port.h - hle/kernel/k_client_session.cpp - hle/kernel/k_client_session.h - hle/kernel/k_code_memory.cpp - hle/kernel/k_code_memory.h - hle/kernel/k_condition_variable.cpp - hle/kernel/k_condition_variable.h - hle/kernel/k_debug.h - hle/kernel/k_device_address_space.cpp - hle/kernel/k_device_address_space.h - hle/kernel/k_dynamic_page_manager.h - hle/kernel/k_dynamic_resource_manager.h - hle/kernel/k_dynamic_slab_heap.h - hle/kernel/k_event.cpp - hle/kernel/k_event.h - hle/kernel/k_event_info.h - hle/kernel/k_handle_table.cpp - hle/kernel/k_handle_table.h - hle/kernel/k_hardware_timer_base.h - hle/kernel/k_hardware_timer.cpp - hle/kernel/k_hardware_timer.h - hle/kernel/k_interrupt_manager.cpp - hle/kernel/k_interrupt_manager.h - hle/kernel/k_light_condition_variable.cpp - hle/kernel/k_light_condition_variable.h - hle/kernel/k_light_lock.cpp - hle/kernel/k_light_lock.h - hle/kernel/k_memory_block.h - hle/kernel/k_memory_block_manager.cpp - hle/kernel/k_memory_block_manager.h - hle/kernel/k_memory_layout.cpp - hle/kernel/k_memory_layout.h - hle/kernel/k_memory_manager.cpp - hle/kernel/k_memory_manager.h - hle/kernel/k_memory_region.h - hle/kernel/k_memory_region_type.h - hle/kernel/k_object_name.cpp - hle/kernel/k_object_name.h - hle/kernel/k_page_bitmap.h - hle/kernel/k_page_buffer.cpp - hle/kernel/k_page_buffer.h - hle/kernel/k_page_heap.cpp - hle/kernel/k_page_heap.h - hle/kernel/k_page_group.cpp - hle/kernel/k_page_group.h - hle/kernel/k_page_table.h - hle/kernel/k_page_table_base.cpp - hle/kernel/k_page_table_base.h - hle/kernel/k_page_table_manager.h - hle/kernel/k_page_table_slab_heap.h - hle/kernel/k_port.cpp - hle/kernel/k_port.h - hle/kernel/k_priority_queue.h - hle/kernel/k_process.cpp - hle/kernel/k_process.h - hle/kernel/k_process_page_table.h - hle/kernel/k_readable_event.cpp - hle/kernel/k_readable_event.h - hle/kernel/k_resource_limit.cpp - hle/kernel/k_resource_limit.h - hle/kernel/k_scheduler.cpp - hle/kernel/k_scheduler.h - hle/kernel/k_scheduler_lock.h - hle/kernel/k_scoped_lock.h - hle/kernel/k_scoped_resource_reservation.h - hle/kernel/k_scoped_scheduler_lock_and_sleep.h - hle/kernel/k_server_port.cpp - hle/kernel/k_server_port.h - hle/kernel/k_server_session.cpp - hle/kernel/k_server_session.h - hle/kernel/k_session.cpp - hle/kernel/k_session.h - hle/kernel/k_session_request.cpp - hle/kernel/k_session_request.h - hle/kernel/k_shared_memory.cpp - hle/kernel/k_shared_memory.h - hle/kernel/k_shared_memory_info.h - hle/kernel/k_slab_heap.h - hle/kernel/k_spin_lock.cpp - hle/kernel/k_spin_lock.h - hle/kernel/k_synchronization_object.cpp - hle/kernel/k_synchronization_object.h - hle/kernel/k_system_control.h - hle/kernel/k_system_resource.cpp - hle/kernel/k_system_resource.h - hle/kernel/k_thread.cpp - hle/kernel/k_thread.h - hle/kernel/k_thread_local_page.cpp - hle/kernel/k_thread_local_page.h - hle/kernel/k_thread_queue.cpp - hle/kernel/k_thread_queue.h - hle/kernel/k_timer_task.h - hle/kernel/k_trace.h - hle/kernel/k_transfer_memory.cpp - hle/kernel/k_transfer_memory.h - hle/kernel/k_typed_address.h - hle/kernel/k_worker_task.h - hle/kernel/k_worker_task_manager.cpp - hle/kernel/k_worker_task_manager.h - hle/kernel/kernel.cpp - hle/kernel/kernel.h - hle/kernel/memory_types.h - hle/kernel/message_buffer.h - hle/kernel/physical_core.cpp - hle/kernel/physical_core.h - hle/kernel/physical_memory.h - hle/kernel/slab_helpers.h - hle/kernel/svc.cpp - hle/kernel/svc.h - hle/kernel/svc_common.h - hle/kernel/svc_types.h - hle/kernel/svc/svc_activity.cpp - hle/kernel/svc/svc_address_arbiter.cpp - hle/kernel/svc/svc_address_translation.cpp - hle/kernel/svc/svc_cache.cpp - hle/kernel/svc/svc_code_memory.cpp - hle/kernel/svc/svc_condition_variable.cpp - hle/kernel/svc/svc_debug.cpp - hle/kernel/svc/svc_debug_string.cpp - hle/kernel/svc/svc_device_address_space.cpp - hle/kernel/svc/svc_event.cpp - hle/kernel/svc/svc_exception.cpp - hle/kernel/svc/svc_info.cpp - hle/kernel/svc/svc_insecure_memory.cpp - hle/kernel/svc/svc_interrupt_event.cpp - hle/kernel/svc/svc_io_pool.cpp - hle/kernel/svc/svc_ipc.cpp - hle/kernel/svc/svc_kernel_debug.cpp - hle/kernel/svc/svc_light_ipc.cpp - hle/kernel/svc/svc_lock.cpp - hle/kernel/svc/svc_memory.cpp - hle/kernel/svc/svc_physical_memory.cpp - hle/kernel/svc/svc_port.cpp - hle/kernel/svc/svc_power_management.cpp - hle/kernel/svc/svc_process.cpp - hle/kernel/svc/svc_process_memory.cpp - hle/kernel/svc/svc_processor.cpp - hle/kernel/svc/svc_query_memory.cpp - hle/kernel/svc/svc_register.cpp - hle/kernel/svc/svc_resource_limit.cpp - hle/kernel/svc/svc_secure_monitor_call.cpp - hle/kernel/svc/svc_session.cpp - hle/kernel/svc/svc_shared_memory.cpp - hle/kernel/svc/svc_synchronization.cpp - hle/kernel/svc/svc_thread.cpp - hle/kernel/svc/svc_thread_profiler.cpp - hle/kernel/svc/svc_tick.cpp - hle/kernel/svc/svc_transfer_memory.cpp - hle/result.h - hle/service/acc/acc.cpp - hle/service/acc/acc.h - hle/service/acc/acc_aa.cpp - hle/service/acc/acc_aa.h - hle/service/acc/acc_su.cpp - hle/service/acc/acc_su.h - hle/service/acc/acc_u0.cpp - hle/service/acc/acc_u0.h - hle/service/acc/acc_u1.cpp - hle/service/acc/acc_u1.h - hle/service/acc/async_context.cpp - hle/service/acc/async_context.h - hle/service/acc/errors.h - hle/service/acc/profile_manager.cpp - hle/service/acc/profile_manager.h - hle/service/am/am.cpp - hle/service/am/am.h - hle/service/am/applet_ae.cpp - hle/service/am/applet_ae.h - hle/service/am/applet_oe.cpp - hle/service/am/applet_oe.h - hle/service/am/applets/applet_cabinet.cpp - hle/service/am/applets/applet_cabinet.h - hle/service/am/applets/applet_controller.cpp - hle/service/am/applets/applet_controller.h - hle/service/am/applets/applet_error.cpp - hle/service/am/applets/applet_error.h - hle/service/am/applets/applet_general_backend.cpp - hle/service/am/applets/applet_general_backend.h - hle/service/am/applets/applet_mii_edit.cpp - hle/service/am/applets/applet_mii_edit.h - hle/service/am/applets/applet_mii_edit_types.h - hle/service/am/applets/applet_profile_select.cpp - hle/service/am/applets/applet_profile_select.h - hle/service/am/applets/applet_software_keyboard.cpp - hle/service/am/applets/applet_software_keyboard.h - hle/service/am/applets/applet_software_keyboard_types.h - hle/service/am/applets/applet_web_browser.cpp - hle/service/am/applets/applet_web_browser.h - hle/service/am/applets/applet_web_browser_types.h - hle/service/am/applets/applets.cpp - hle/service/am/applets/applets.h - hle/service/am/idle.cpp - hle/service/am/idle.h - hle/service/am/omm.cpp - hle/service/am/omm.h - hle/service/am/spsm.cpp - hle/service/am/spsm.h - hle/service/aoc/aoc_u.cpp - hle/service/aoc/aoc_u.h - hle/service/apm/apm.cpp - hle/service/apm/apm.h - hle/service/apm/apm_controller.cpp - hle/service/apm/apm_controller.h - hle/service/apm/apm_interface.cpp - hle/service/apm/apm_interface.h - hle/service/audio/audctl.cpp - hle/service/audio/audctl.h - hle/service/audio/audin_u.cpp - hle/service/audio/audin_u.h - hle/service/audio/audio.cpp - hle/service/audio/audio.h - hle/service/audio/audout_u.cpp - hle/service/audio/audout_u.h - hle/service/audio/audrec_a.cpp - hle/service/audio/audrec_a.h - hle/service/audio/audrec_u.cpp - hle/service/audio/audrec_u.h - hle/service/audio/audren_u.cpp - hle/service/audio/audren_u.h - hle/service/audio/errors.h - hle/service/audio/hwopus.cpp - hle/service/audio/hwopus.h - hle/service/bcat/backend/backend.cpp - hle/service/bcat/backend/backend.h - hle/service/bcat/bcat.cpp - hle/service/bcat/bcat.h - hle/service/bcat/bcat_module.cpp - hle/service/bcat/bcat_module.h - hle/service/bpc/bpc.cpp - hle/service/bpc/bpc.h - hle/service/btdrv/btdrv.cpp - hle/service/btdrv/btdrv.h - hle/service/btm/btm.cpp - hle/service/btm/btm.h - hle/service/caps/caps.cpp - hle/service/caps/caps.h - hle/service/caps/caps_a.cpp - hle/service/caps/caps_a.h - hle/service/caps/caps_c.cpp - hle/service/caps/caps_c.h - hle/service/caps/caps_manager.cpp - hle/service/caps/caps_manager.h - hle/service/caps/caps_result.h - hle/service/caps/caps_sc.cpp - hle/service/caps/caps_sc.h - hle/service/caps/caps_ss.cpp - hle/service/caps/caps_ss.h - hle/service/caps/caps_su.cpp - hle/service/caps/caps_su.h - hle/service/caps/caps_types.h - hle/service/caps/caps_u.cpp - hle/service/caps/caps_u.h - hle/service/erpt/erpt.cpp - hle/service/erpt/erpt.h - hle/service/es/es.cpp - hle/service/es/es.h - hle/service/eupld/eupld.cpp - hle/service/eupld/eupld.h - hle/service/fatal/fatal.cpp - hle/service/fatal/fatal.h - hle/service/fatal/fatal_p.cpp - hle/service/fatal/fatal_p.h - hle/service/fatal/fatal_u.cpp - hle/service/fatal/fatal_u.h - hle/service/filesystem/filesystem.cpp - hle/service/filesystem/filesystem.h - hle/service/filesystem/fsp_ldr.cpp - hle/service/filesystem/fsp_ldr.h - hle/service/filesystem/fsp_pr.cpp - hle/service/filesystem/fsp_pr.h - hle/service/filesystem/fsp_srv.cpp - hle/service/filesystem/fsp_srv.h - hle/service/fgm/fgm.cpp - hle/service/fgm/fgm.h - hle/service/friend/friend.cpp - hle/service/friend/friend.h - hle/service/friend/friend_interface.cpp - hle/service/friend/friend_interface.h - hle/service/glue/arp.cpp - hle/service/glue/arp.h - hle/service/glue/bgtc.cpp - hle/service/glue/bgtc.h - hle/service/glue/ectx.cpp - hle/service/glue/ectx.h - hle/service/glue/errors.h - hle/service/glue/glue.cpp - hle/service/glue/glue.h - hle/service/glue/glue_manager.cpp - hle/service/glue/glue_manager.h - hle/service/glue/notif.cpp - hle/service/glue/notif.h - hle/service/grc/grc.cpp - hle/service/grc/grc.h - hle/service/hid/hid.cpp - hle/service/hid/hid.h - hle/service/hid/hidbus.cpp - hle/service/hid/hidbus.h - hle/service/hid/irs.cpp - hle/service/hid/irs.h - hle/service/hid/irs_ring_lifo.h - hle/service/hid/ring_lifo.h - hle/service/hid/xcd.cpp - hle/service/hid/xcd.h - hle/service/hid/errors.h - hle/service/hid/controllers/console_sixaxis.cpp - hle/service/hid/controllers/console_sixaxis.h - hle/service/hid/controllers/controller_base.cpp - hle/service/hid/controllers/controller_base.h - hle/service/hid/controllers/debug_pad.cpp - hle/service/hid/controllers/debug_pad.h - hle/service/hid/controllers/gesture.cpp - hle/service/hid/controllers/gesture.h - hle/service/hid/controllers/keyboard.cpp - hle/service/hid/controllers/keyboard.h - hle/service/hid/controllers/mouse.cpp - hle/service/hid/controllers/mouse.h - hle/service/hid/controllers/npad.cpp - hle/service/hid/controllers/npad.h - hle/service/hid/controllers/palma.cpp - hle/service/hid/controllers/palma.h - hle/service/hid/controllers/stubbed.cpp - hle/service/hid/controllers/stubbed.h - hle/service/hid/controllers/touchscreen.cpp - hle/service/hid/controllers/touchscreen.h - hle/service/hid/controllers/xpad.cpp - hle/service/hid/controllers/xpad.h - hle/service/hid/hidbus/hidbus_base.cpp - hle/service/hid/hidbus/hidbus_base.h - hle/service/hid/hidbus/ringcon.cpp - hle/service/hid/hidbus/ringcon.h - hle/service/hid/hidbus/starlink.cpp - hle/service/hid/hidbus/starlink.h - hle/service/hid/hidbus/stubbed.cpp - hle/service/hid/hidbus/stubbed.h - hle/service/hid/irsensor/clustering_processor.cpp - hle/service/hid/irsensor/clustering_processor.h - hle/service/hid/irsensor/image_transfer_processor.cpp - hle/service/hid/irsensor/image_transfer_processor.h - hle/service/hid/irsensor/ir_led_processor.cpp - hle/service/hid/irsensor/ir_led_processor.h - hle/service/hid/irsensor/moment_processor.cpp - hle/service/hid/irsensor/moment_processor.h - hle/service/hid/irsensor/pointing_processor.cpp - hle/service/hid/irsensor/pointing_processor.h - hle/service/hid/irsensor/processor_base.cpp - hle/service/hid/irsensor/processor_base.h - hle/service/hid/irsensor/tera_plugin_processor.cpp - hle/service/hid/irsensor/tera_plugin_processor.h - hle/service/lbl/lbl.cpp - hle/service/lbl/lbl.h - hle/service/ldn/lan_discovery.cpp - hle/service/ldn/lan_discovery.h - hle/service/ldn/ldn_results.h - hle/service/ldn/ldn.cpp - hle/service/ldn/ldn.h - hle/service/ldn/ldn_types.h - hle/service/ldr/ldr.cpp - hle/service/ldr/ldr.h - hle/service/lm/lm.cpp - hle/service/lm/lm.h - hle/service/mig/mig.cpp - hle/service/mig/mig.h - hle/service/mii/types/char_info.cpp - hle/service/mii/types/char_info.h - hle/service/mii/types/core_data.cpp - hle/service/mii/types/core_data.h - hle/service/mii/types/raw_data.cpp - hle/service/mii/types/raw_data.h - hle/service/mii/types/store_data.cpp - hle/service/mii/types/store_data.h - hle/service/mii/types/ver3_store_data.cpp - hle/service/mii/types/ver3_store_data.h - hle/service/mii/mii.cpp - hle/service/mii/mii.h - hle/service/mii/mii_database.cpp - hle/service/mii/mii_database.h - hle/service/mii/mii_database_manager.cpp - hle/service/mii/mii_database_manager.h - hle/service/mii/mii_manager.cpp - hle/service/mii/mii_manager.h - hle/service/mii/mii_result.h - hle/service/mii/mii_types.h - hle/service/mii/mii_util.h - hle/service/mm/mm_u.cpp - hle/service/mm/mm_u.h - hle/service/mnpp/mnpp_app.cpp - hle/service/mnpp/mnpp_app.h - hle/service/ncm/ncm.cpp - hle/service/ncm/ncm.h - hle/service/nfc/common/amiibo_crypto.cpp - hle/service/nfc/common/amiibo_crypto.h - hle/service/nfc/common/device.cpp - hle/service/nfc/common/device.h - hle/service/nfc/common/device_manager.cpp - hle/service/nfc/common/device_manager.h - hle/service/nfc/mifare_result.h - hle/service/nfc/mifare_types.h - hle/service/nfc/nfc.cpp - hle/service/nfc/nfc.h - hle/service/nfc/nfc_interface.cpp - hle/service/nfc/nfc_interface.h - hle/service/nfc/nfc_result.h - hle/service/nfc/nfc_types.h - hle/service/nfp/nfp.cpp - hle/service/nfp/nfp.h - hle/service/nfp/nfp_interface.cpp - hle/service/nfp/nfp_interface.h - hle/service/nfp/nfp_result.h - hle/service/nfp/nfp_types.h - hle/service/ngc/ngc.cpp - hle/service/ngc/ngc.h - hle/service/nifm/nifm.cpp - hle/service/nifm/nifm.h - hle/service/nim/nim.cpp - hle/service/nim/nim.h - hle/service/npns/npns.cpp - hle/service/npns/npns.h - hle/service/ns/errors.h - hle/service/ns/iplatform_service_manager.cpp - hle/service/ns/iplatform_service_manager.h - hle/service/ns/language.cpp - hle/service/ns/language.h - hle/service/ns/ns.cpp - hle/service/ns/ns.h - hle/service/ns/pdm_qry.cpp - hle/service/ns/pdm_qry.h - hle/service/nvdrv/core/container.cpp - hle/service/nvdrv/core/container.h - hle/service/nvdrv/core/nvmap.cpp - hle/service/nvdrv/core/nvmap.h - hle/service/nvdrv/core/syncpoint_manager.cpp - hle/service/nvdrv/core/syncpoint_manager.h - hle/service/nvdrv/devices/nvdevice.h - hle/service/nvdrv/devices/nvdisp_disp0.cpp - hle/service/nvdrv/devices/nvdisp_disp0.h - hle/service/nvdrv/devices/nvhost_as_gpu.cpp - hle/service/nvdrv/devices/nvhost_as_gpu.h - hle/service/nvdrv/devices/nvhost_ctrl.cpp - hle/service/nvdrv/devices/nvhost_ctrl.h - hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp - hle/service/nvdrv/devices/nvhost_ctrl_gpu.h - hle/service/nvdrv/devices/nvhost_gpu.cpp - hle/service/nvdrv/devices/nvhost_gpu.h - hle/service/nvdrv/devices/nvhost_nvdec.cpp - hle/service/nvdrv/devices/nvhost_nvdec.h - hle/service/nvdrv/devices/nvhost_nvdec_common.cpp - hle/service/nvdrv/devices/nvhost_nvdec_common.h - hle/service/nvdrv/devices/nvhost_nvjpg.cpp - hle/service/nvdrv/devices/nvhost_nvjpg.h - hle/service/nvdrv/devices/nvhost_vic.cpp - hle/service/nvdrv/devices/nvhost_vic.h - hle/service/nvdrv/devices/nvmap.cpp - hle/service/nvdrv/devices/nvmap.h - hle/service/nvdrv/nvdata.h - hle/service/nvdrv/nvdrv.cpp - hle/service/nvdrv/nvdrv.h - hle/service/nvdrv/nvdrv_interface.cpp - hle/service/nvdrv/nvdrv_interface.h - hle/service/nvdrv/nvmemp.cpp - hle/service/nvdrv/nvmemp.h - hle/service/nvnflinger/binder.h - hle/service/nvnflinger/buffer_item.h - hle/service/nvnflinger/buffer_item_consumer.cpp - hle/service/nvnflinger/buffer_item_consumer.h - hle/service/nvnflinger/buffer_queue_consumer.cpp - hle/service/nvnflinger/buffer_queue_consumer.h - hle/service/nvnflinger/buffer_queue_core.cpp - hle/service/nvnflinger/buffer_queue_core.h - hle/service/nvnflinger/buffer_queue_defs.h - hle/service/nvnflinger/buffer_queue_producer.cpp - hle/service/nvnflinger/buffer_queue_producer.h - hle/service/nvnflinger/buffer_slot.h - hle/service/nvnflinger/buffer_transform_flags.h - hle/service/nvnflinger/consumer_base.cpp - hle/service/nvnflinger/consumer_base.h - hle/service/nvnflinger/consumer_listener.h - hle/service/nvnflinger/fb_share_buffer_manager.cpp - hle/service/nvnflinger/fb_share_buffer_manager.h - hle/service/nvnflinger/graphic_buffer_producer.cpp - hle/service/nvnflinger/graphic_buffer_producer.h - hle/service/nvnflinger/hos_binder_driver_server.cpp - hle/service/nvnflinger/hos_binder_driver_server.h - hle/service/nvnflinger/nvnflinger.cpp - hle/service/nvnflinger/nvnflinger.h - hle/service/nvnflinger/parcel.h - hle/service/nvnflinger/pixel_format.h - hle/service/nvnflinger/producer_listener.h - hle/service/nvnflinger/status.h - hle/service/nvnflinger/ui/fence.h - hle/service/nvnflinger/ui/graphic_buffer.h - hle/service/nvnflinger/window.h - hle/service/olsc/olsc.cpp - hle/service/olsc/olsc.h - hle/service/pcie/pcie.cpp - hle/service/pcie/pcie.h - hle/service/pctl/pctl.cpp - hle/service/pctl/pctl.h - hle/service/pctl/pctl_module.cpp - hle/service/pctl/pctl_module.h - hle/service/pcv/pcv.cpp - hle/service/pcv/pcv.h - hle/service/pm/pm.cpp - hle/service/pm/pm.h - hle/service/prepo/prepo.cpp - hle/service/prepo/prepo.h - hle/service/psc/psc.cpp - hle/service/psc/psc.h - hle/service/ptm/psm.cpp - hle/service/ptm/psm.h - hle/service/ptm/ptm.cpp - hle/service/ptm/ptm.h - hle/service/ptm/ts.cpp - hle/service/ptm/ts.h - hle/service/hle_ipc.cpp - hle/service/hle_ipc.h - hle/service/ipc_helpers.h - hle/service/kernel_helpers.cpp - hle/service/kernel_helpers.h - hle/service/mutex.cpp - hle/service/mutex.h - hle/service/server_manager.cpp - hle/service/server_manager.h - hle/service/service.cpp - hle/service/service.h - hle/service/set/set.cpp - hle/service/set/set.h - hle/service/set/set_cal.cpp - hle/service/set/set_cal.h - hle/service/set/set_fd.cpp - hle/service/set/set_fd.h - hle/service/set/set_sys.cpp - hle/service/set/set_sys.h - hle/service/set/settings.cpp - hle/service/set/settings.h - hle/service/sm/sm.cpp - hle/service/sm/sm.h - hle/service/sm/sm_controller.cpp - hle/service/sm/sm_controller.h - hle/service/sockets/bsd.cpp - hle/service/sockets/bsd.h - hle/service/sockets/nsd.cpp - hle/service/sockets/nsd.h - hle/service/sockets/sfdnsres.cpp - hle/service/sockets/sfdnsres.h - hle/service/sockets/sockets.cpp - hle/service/sockets/sockets.h - hle/service/sockets/sockets_translate.cpp - hle/service/sockets/sockets_translate.h - hle/service/spl/csrng.cpp - hle/service/spl/csrng.h - hle/service/spl/spl.cpp - hle/service/spl/spl.h - hle/service/spl/spl_module.cpp - hle/service/spl/spl_module.h - hle/service/spl/spl_results.h - hle/service/spl/spl_types.h - hle/service/ssl/ssl.cpp - hle/service/ssl/ssl.h - hle/service/ssl/ssl_backend.h - hle/service/time/clock_types.h - hle/service/time/ephemeral_network_system_clock_context_writer.h - hle/service/time/ephemeral_network_system_clock_core.h - hle/service/time/errors.h - hle/service/time/local_system_clock_context_writer.h - hle/service/time/network_system_clock_context_writer.h - hle/service/time/standard_local_system_clock_core.h - hle/service/time/standard_network_system_clock_core.h - hle/service/time/standard_steady_clock_core.cpp - hle/service/time/standard_steady_clock_core.h - hle/service/time/standard_user_system_clock_core.cpp - hle/service/time/standard_user_system_clock_core.h - hle/service/time/steady_clock_core.h - hle/service/time/system_clock_context_update_callback.cpp - hle/service/time/system_clock_context_update_callback.h - hle/service/time/system_clock_core.cpp - hle/service/time/system_clock_core.h - hle/service/time/tick_based_steady_clock_core.cpp - hle/service/time/tick_based_steady_clock_core.h - hle/service/time/time.cpp - hle/service/time/time.h - hle/service/time/time_interface.cpp - hle/service/time/time_interface.h - hle/service/time/time_manager.cpp - hle/service/time/time_manager.h - hle/service/time/time_sharedmemory.cpp - hle/service/time/time_sharedmemory.h - hle/service/time/time_zone_content_manager.cpp - hle/service/time/time_zone_content_manager.h - hle/service/time/time_zone_manager.cpp - hle/service/time/time_zone_manager.h - hle/service/time/time_zone_service.cpp - hle/service/time/time_zone_service.h - hle/service/time/time_zone_types.h - hle/service/usb/usb.cpp - hle/service/usb/usb.h - hle/service/vi/display/vi_display.cpp - hle/service/vi/display/vi_display.h - hle/service/vi/layer/vi_layer.cpp - hle/service/vi/layer/vi_layer.h - hle/service/vi/vi.cpp - hle/service/vi/vi.h - hle/service/vi/vi_m.cpp - hle/service/vi/vi_m.h - hle/service/vi/vi_s.cpp - hle/service/vi/vi_s.h - hle/service/vi/vi_u.cpp - hle/service/vi/vi_u.h + api_version.h + ipc.h + result.h internal_network/network.cpp internal_network/network.h internal_network/network_interface.cpp @@ -899,8 +266,9 @@ endif() create_target_directory_groups(core) -target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core nx_tzdb) +target_link_libraries(core PUBLIC common PRIVATE audio_core kernel network service video_core nx_tzdb) target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls RenderDoc::API) + if (MINGW) target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY}) endif() @@ -921,31 +289,10 @@ if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) arm/dynarmic/dynarmic_cp15.h arm/dynarmic/dynarmic_exclusive_monitor.cpp arm/dynarmic/dynarmic_exclusive_monitor.h - hle/service/jit/jit_context.cpp - hle/service/jit/jit_context.h - hle/service/jit/jit.cpp - hle/service/jit/jit.h ) target_link_libraries(core PRIVATE dynarmic::dynarmic) endif() -if(ENABLE_OPENSSL) - target_sources(core PRIVATE - hle/service/ssl/ssl_backend_openssl.cpp) - target_link_libraries(core PRIVATE OpenSSL::SSL) -elseif (APPLE) - target_sources(core PRIVATE - hle/service/ssl/ssl_backend_securetransport.cpp) - target_link_libraries(core PRIVATE "-framework Security") -elseif (WIN32) - target_sources(core PRIVATE - hle/service/ssl/ssl_backend_schannel.cpp) - target_link_libraries(core PRIVATE crypt32 secur32) -else() - target_sources(core PRIVATE - hle/service/ssl/ssl_backend_none.cpp) -endif() - if (YUZU_USE_PRECOMPILED_HEADERS) target_precompile_headers(core PRIVATE precompiled_headers.h) endif() diff --git a/src/core/hle/api_version.h b/src/core/api_version.h similarity index 95% rename from src/core/hle/api_version.h rename to src/core/api_version.h index bd15606e13..ce68946001 100644 --- a/src/core/hle/api_version.h +++ b/src/core/api_version.h @@ -7,7 +7,7 @@ // This file contains yuzu's HLE API version constants. -namespace HLE::ApiVersion { +namespace Core::ApiVersion { // Horizon OS version constants. @@ -43,4 +43,4 @@ constexpr u32 GetTargetFirmware() { return AtmosphereTargetFirmware(HOS_VERSION_MAJOR, HOS_VERSION_MINOR, HOS_VERSION_MICRO); } -} // namespace HLE::ApiVersion +} // namespace Core::ApiVersion diff --git a/src/core/arm/arm_interface.cpp b/src/core/arm/arm_interface.cpp index 558fba5bd2..ad2cc6e740 100644 --- a/src/core/arm/arm_interface.cpp +++ b/src/core/arm/arm_interface.cpp @@ -12,11 +12,11 @@ #include "core/arm/symbols.h" #include "core/core.h" #include "core/debugger/debugger.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/svc.h" #include "core/loader/loader.h" #include "core/memory.h" +#include "kernel/k_process.h" +#include "kernel/k_thread.h" +#include "kernel/svc.h" namespace Core { diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index 44a297cdcb..714b606efb 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp @@ -17,9 +17,9 @@ #include "core/core.h" #include "core/core_timing.h" #include "core/debugger/debugger.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/svc.h" #include "core/memory.h" +#include "kernel/k_process.h" +#include "kernel/svc.h" namespace Core { diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp index 2e3674b6d8..ea68beefe6 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp @@ -17,9 +17,9 @@ #include "core/core_timing.h" #include "core/debugger/debugger.h" #include "core/hardware_properties.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/svc.h" #include "core/memory.h" +#include "kernel/k_process.h" +#include "kernel/svc.h" namespace Core { diff --git a/src/core/core.cpp b/src/core/core.cpp index 14d6c8c270..e3c0f210b4 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -30,19 +30,6 @@ #include "core/file_sys/vfs_real.h" #include "core/gpu_dirty_memory_manager.h" #include "core/hid/hid_core.h" -#include "core/hle/kernel/k_memory_manager.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_resource_limit.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/physical_core.h" -#include "core/hle/service/am/applets/applets.h" -#include "core/hle/service/apm/apm_controller.h" -#include "core/hle/service/filesystem/filesystem.h" -#include "core/hle/service/glue/glue_manager.h" -#include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" -#include "core/hle/service/time/time_manager.h" #include "core/internal_network/network.h" #include "core/loader/loader.h" #include "core/memory.h" @@ -52,7 +39,20 @@ #include "core/telemetry_session.h" #include "core/tools/freezer.h" #include "core/tools/renderdoc.h" +#include "kernel/k_memory_manager.h" +#include "kernel/k_process.h" +#include "kernel/k_resource_limit.h" +#include "kernel/k_scheduler.h" +#include "kernel/kernel.h" +#include "kernel/physical_core.h" #include "network/network.h" +#include "service/am/applets/applets.h" +#include "service/apm/apm_controller.h" +#include "service/filesystem/filesystem.h" +#include "service/glue/glue_manager.h" +#include "service/service.h" +#include "service/sm/sm.h" +#include "service/time/time_manager.h" #include "video_core/host1x/host1x.h" #include "video_core/renderer_base.h" #include "video_core/video_core.h" diff --git a/src/core/cpu_manager.cpp b/src/core/cpu_manager.cpp index 980bb97f95..2429087932 100644 --- a/src/core/cpu_manager.cpp +++ b/src/core/cpu_manager.cpp @@ -8,11 +8,11 @@ #include "core/core.h" #include "core/core_timing.h" #include "core/cpu_manager.h" -#include "core/hle/kernel/k_interrupt_manager.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/physical_core.h" +#include "kernel/k_interrupt_manager.h" +#include "kernel/k_scheduler.h" +#include "kernel/k_thread.h" +#include "kernel/kernel.h" +#include "kernel/physical_core.h" #include "video_core/gpu.h" namespace Core { diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp index 43a3c5ffd6..75ba0852ca 100644 --- a/src/core/crypto/key_manager.cpp +++ b/src/core/crypto/key_manager.cpp @@ -28,8 +28,8 @@ #include "core/file_sys/content_archive.h" #include "core/file_sys/nca_metadata.h" #include "core/file_sys/registered_cache.h" -#include "core/hle/service/filesystem/filesystem.h" #include "core/loader/loader.h" +#include "service/filesystem/filesystem.h" namespace Core::Crypto { namespace { diff --git a/src/core/debugger/debugger.cpp b/src/core/debugger/debugger.cpp index 0e270eb504..2d459b494d 100644 --- a/src/core/debugger/debugger.cpp +++ b/src/core/debugger/debugger.cpp @@ -15,9 +15,9 @@ #include "core/debugger/debugger.h" #include "core/debugger/debugger_interface.h" #include "core/debugger/gdbstub.h" -#include "core/hle/kernel/global_scheduler_context.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_scheduler.h" +#include "kernel/global_scheduler_context.h" +#include "kernel/k_process.h" +#include "kernel/k_scheduler.h" template static void AsyncReceiveInto(Readable& r, Buffer& buffer, Callback&& c) { diff --git a/src/core/debugger/gdbstub.cpp b/src/core/debugger/gdbstub.cpp index 148dd3e397..7a4d93bbf7 100644 --- a/src/core/debugger/gdbstub.cpp +++ b/src/core/debugger/gdbstub.cpp @@ -19,11 +19,11 @@ #include "core/core.h" #include "core/debugger/gdbstub.h" #include "core/debugger/gdbstub_arch.h" -#include "core/hle/kernel/k_page_table.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_thread.h" #include "core/loader/loader.h" #include "core/memory.h" +#include "kernel/k_page_table.h" +#include "kernel/k_process.h" +#include "kernel/k_thread.h" namespace Core { diff --git a/src/core/debugger/gdbstub_arch.cpp b/src/core/debugger/gdbstub_arch.cpp index 75c94a91a3..0beb7622e3 100644 --- a/src/core/debugger/gdbstub_arch.cpp +++ b/src/core/debugger/gdbstub_arch.cpp @@ -3,7 +3,7 @@ #include "common/hex_util.h" #include "core/debugger/gdbstub_arch.h" -#include "core/hle/kernel/k_thread.h" +#include "kernel/k_thread.h" namespace Core { diff --git a/src/core/device_memory.cpp b/src/core/device_memory.cpp index de3f8ef8f4..9b57473004 100644 --- a/src/core/device_memory.cpp +++ b/src/core/device_memory.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/device_memory.h" -#include "hle/kernel/board/nintendo/nx/k_system_control.h" +#include "kernel/board/nintendo/nx/k_system_control.h" namespace Core { diff --git a/src/core/file_sys/errors.h b/src/core/file_sys/errors.h index 2f5045a675..facbddcabd 100644 --- a/src/core/file_sys/errors.h +++ b/src/core/file_sys/errors.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/result.h" +#include "core/result.h" namespace FileSys { diff --git a/src/core/file_sys/fssystem/fssystem_bucket_tree.h b/src/core/file_sys/fssystem/fssystem_bucket_tree.h index 46850cd48b..2997bebbf6 100644 --- a/src/core/file_sys/fssystem/fssystem_bucket_tree.h +++ b/src/core/file_sys/fssystem/fssystem_bucket_tree.h @@ -11,7 +11,7 @@ #include "common/literals.h" #include "core/file_sys/vfs.h" -#include "core/hle/result.h" +#include "core/result.h" namespace FileSys { diff --git a/src/core/file_sys/fssystem/fssystem_compression_common.h b/src/core/file_sys/fssystem/fssystem_compression_common.h index 266e0a7e54..602ed81d61 100644 --- a/src/core/file_sys/fssystem/fssystem_compression_common.h +++ b/src/core/file_sys/fssystem/fssystem_compression_common.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/result.h" +#include "core/result.h" namespace FileSys { diff --git a/src/core/file_sys/fssystem/fssystem_pooled_buffer.h b/src/core/file_sys/fssystem/fssystem_pooled_buffer.h index 9a6adbcb5a..d9fe577a10 100644 --- a/src/core/file_sys/fssystem/fssystem_pooled_buffer.h +++ b/src/core/file_sys/fssystem/fssystem_pooled_buffer.h @@ -6,7 +6,7 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "common/literals.h" -#include "core/hle/result.h" +#include "core/result.h" namespace FileSys { diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp index 0bca055878..7d241c4242 100644 --- a/src/core/file_sys/patch_manager.cpp +++ b/src/core/file_sys/patch_manager.cpp @@ -24,12 +24,12 @@ #include "core/file_sys/vfs_cached.h" #include "core/file_sys/vfs_layered.h" #include "core/file_sys/vfs_vector.h" -#include "core/hle/service/filesystem/filesystem.h" -#include "core/hle/service/ns/language.h" -#include "core/hle/service/set/set.h" #include "core/loader/loader.h" #include "core/loader/nso.h" #include "core/memory/cheat_engine.h" +#include "service/filesystem/filesystem.h" +#include "service/ns/language.h" +#include "service/set/set.h" namespace FileSys { namespace { diff --git a/src/core/file_sys/romfs_factory.cpp b/src/core/file_sys/romfs_factory.cpp index 1bc07dae5a..5ee14d9198 100644 --- a/src/core/file_sys/romfs_factory.cpp +++ b/src/core/file_sys/romfs_factory.cpp @@ -11,9 +11,9 @@ #include "core/file_sys/patch_manager.h" #include "core/file_sys/registered_cache.h" #include "core/file_sys/romfs_factory.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/service/filesystem/filesystem.h" #include "core/loader/loader.h" +#include "kernel/k_process.h" +#include "service/filesystem/filesystem.h" namespace FileSys { diff --git a/src/core/file_sys/romfs_factory.h b/src/core/file_sys/romfs_factory.h index e4809bc94e..bbcd8acdb7 100644 --- a/src/core/file_sys/romfs_factory.h +++ b/src/core/file_sys/romfs_factory.h @@ -7,7 +7,7 @@ #include "common/common_types.h" #include "core/file_sys/vfs_types.h" -#include "core/hle/result.h" +#include "core/result.h" namespace Loader { class AppLoader; diff --git a/src/core/file_sys/savedata_factory.h b/src/core/file_sys/savedata_factory.h index 45c7c81fb0..e2266d8cf3 100644 --- a/src/core/file_sys/savedata_factory.h +++ b/src/core/file_sys/savedata_factory.h @@ -8,7 +8,7 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "core/file_sys/vfs.h" -#include "core/hle/result.h" +#include "core/result.h" namespace Core { class System; diff --git a/src/core/file_sys/sdmc_factory.h b/src/core/file_sys/sdmc_factory.h index a445fdb167..96bd133493 100644 --- a/src/core/file_sys/sdmc_factory.h +++ b/src/core/file_sys/sdmc_factory.h @@ -5,7 +5,7 @@ #include #include "core/file_sys/vfs_types.h" -#include "core/hle/result.h" +#include "core/result.h" namespace FileSys { diff --git a/src/core/file_sys/system_archive/shared_font.cpp b/src/core/file_sys/system_archive/shared_font.cpp index 3210583f09..f807d09366 100644 --- a/src/core/file_sys/system_archive/shared_font.cpp +++ b/src/core/file_sys/system_archive/shared_font.cpp @@ -9,7 +9,7 @@ #include "core/file_sys/system_archive/data/font_standard.h" #include "core/file_sys/system_archive/shared_font.h" #include "core/file_sys/vfs_vector.h" -#include "core/hle/service/ns/iplatform_service_manager.h" +#include "service/ns/iplatform_service_manager.h" namespace FileSys::SystemArchive { diff --git a/src/core/file_sys/system_archive/system_version.cpp b/src/core/file_sys/system_archive/system_version.cpp index e4751c2b47..9c587058bf 100644 --- a/src/core/file_sys/system_archive/system_version.cpp +++ b/src/core/file_sys/system_archive/system_version.cpp @@ -2,14 +2,14 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" +#include "core/api_version.h" #include "core/file_sys/system_archive/system_version.h" #include "core/file_sys/vfs_vector.h" -#include "core/hle/api_version.h" namespace FileSys::SystemArchive { std::string GetLongDisplayVersion() { - return HLE::ApiVersion::DISPLAY_TITLE; + return Core::ApiVersion::DISPLAY_TITLE; } VirtualDir SystemVersion() { @@ -17,19 +17,19 @@ VirtualDir SystemVersion() { GetLongDisplayVersion()); VirtualFile file = std::make_shared(std::vector(0x100), "file"); - file->WriteObject(HLE::ApiVersion::HOS_VERSION_MAJOR, 0); - file->WriteObject(HLE::ApiVersion::HOS_VERSION_MINOR, 1); - file->WriteObject(HLE::ApiVersion::HOS_VERSION_MICRO, 2); - file->WriteObject(HLE::ApiVersion::SDK_REVISION_MAJOR, 4); - file->WriteObject(HLE::ApiVersion::SDK_REVISION_MINOR, 5); - file->WriteArray(HLE::ApiVersion::PLATFORM_STRING, - std::min(sizeof(HLE::ApiVersion::PLATFORM_STRING), 0x20ULL), 0x8); - file->WriteArray(HLE::ApiVersion::VERSION_HASH, - std::min(sizeof(HLE::ApiVersion::VERSION_HASH), 0x40ULL), 0x28); - file->WriteArray(HLE::ApiVersion::DISPLAY_VERSION, - std::min(sizeof(HLE::ApiVersion::DISPLAY_VERSION), 0x18ULL), 0x68); - file->WriteArray(HLE::ApiVersion::DISPLAY_TITLE, - std::min(sizeof(HLE::ApiVersion::DISPLAY_TITLE), 0x80ULL), 0x80); + file->WriteObject(Core::ApiVersion::HOS_VERSION_MAJOR, 0); + file->WriteObject(Core::ApiVersion::HOS_VERSION_MINOR, 1); + file->WriteObject(Core::ApiVersion::HOS_VERSION_MICRO, 2); + file->WriteObject(Core::ApiVersion::SDK_REVISION_MAJOR, 4); + file->WriteObject(Core::ApiVersion::SDK_REVISION_MINOR, 5); + file->WriteArray(Core::ApiVersion::PLATFORM_STRING, + std::min(sizeof(Core::ApiVersion::PLATFORM_STRING), 0x20ULL), 0x8); + file->WriteArray(Core::ApiVersion::VERSION_HASH, + std::min(sizeof(Core::ApiVersion::VERSION_HASH), 0x40ULL), 0x28); + file->WriteArray(Core::ApiVersion::DISPLAY_VERSION, + std::min(sizeof(Core::ApiVersion::DISPLAY_VERSION), 0x18ULL), 0x68); + file->WriteArray(Core::ApiVersion::DISPLAY_TITLE, + std::min(sizeof(Core::ApiVersion::DISPLAY_TITLE), 0x80ULL), 0x80); return std::make_shared(std::vector{file}, std::vector{}, "data"); } diff --git a/src/core/file_sys/system_archive/time_zone_binary.cpp b/src/core/file_sys/system_archive/time_zone_binary.cpp index 7c17bbefa5..2f7b1f03ed 100644 --- a/src/core/file_sys/system_archive/time_zone_binary.cpp +++ b/src/core/file_sys/system_archive/time_zone_binary.cpp @@ -6,7 +6,7 @@ #include "common/swap.h" #include "core/file_sys/system_archive/time_zone_binary.h" #include "core/file_sys/vfs_vector.h" -#include "core/hle/service/time/time_zone_types.h" +#include "service/time/time_zone_types.h" #include "nx_tzdb.h" diff --git a/src/core/frontend/applets/cabinet.h b/src/core/frontend/applets/cabinet.h index af3fc6c3d5..3d9f8cde2f 100644 --- a/src/core/frontend/applets/cabinet.h +++ b/src/core/frontend/applets/cabinet.h @@ -5,7 +5,7 @@ #include #include "core/frontend/applets/applet.h" -#include "core/hle/service/nfp/nfp_types.h" +#include "service/nfp/nfp_types.h" namespace Service::NFC { class NfcDevice; diff --git a/src/core/frontend/applets/error.h b/src/core/frontend/applets/error.h index 3a12196ce4..22cf6be626 100644 --- a/src/core/frontend/applets/error.h +++ b/src/core/frontend/applets/error.h @@ -7,7 +7,7 @@ #include #include "core/frontend/applets/applet.h" -#include "core/hle/result.h" +#include "core/result.h" namespace Core::Frontend { diff --git a/src/core/frontend/applets/profile_select.cpp b/src/core/frontend/applets/profile_select.cpp index c18f17a365..61e68d8773 100644 --- a/src/core/frontend/applets/profile_select.cpp +++ b/src/core/frontend/applets/profile_select.cpp @@ -3,7 +3,7 @@ #include "common/settings.h" #include "core/frontend/applets/profile_select.h" -#include "core/hle/service/acc/profile_manager.h" +#include "service/acc/profile_manager.h" namespace Core::Frontend { diff --git a/src/core/frontend/applets/profile_select.h b/src/core/frontend/applets/profile_select.h index 92e2737ea7..a942bd3b88 100644 --- a/src/core/frontend/applets/profile_select.h +++ b/src/core/frontend/applets/profile_select.h @@ -8,7 +8,7 @@ #include "common/uuid.h" #include "core/frontend/applets/applet.h" -#include "core/hle/service/am/applets/applet_profile_select.h" +#include "service/am/applets/applet_profile_select.h" namespace Core::Frontend { diff --git a/src/core/frontend/applets/software_keyboard.h b/src/core/frontend/applets/software_keyboard.h index 8ed96da240..4a6dd91306 100644 --- a/src/core/frontend/applets/software_keyboard.h +++ b/src/core/frontend/applets/software_keyboard.h @@ -8,7 +8,7 @@ #include "common/common_types.h" #include "core/frontend/applets/applet.h" -#include "core/hle/service/am/applets/applet_software_keyboard_types.h" +#include "service/am/applets/applet_software_keyboard_types.h" namespace Core::Frontend { diff --git a/src/core/frontend/applets/web_browser.h b/src/core/frontend/applets/web_browser.h index 178bbdd3f5..6879f0f75c 100644 --- a/src/core/frontend/applets/web_browser.h +++ b/src/core/frontend/applets/web_browser.h @@ -6,7 +6,7 @@ #include #include "core/frontend/applets/applet.h" -#include "core/hle/service/am/applets/applet_web_browser_types.h" +#include "service/am/applets/applet_web_browser_types.h" namespace Core::Frontend { diff --git a/src/core/hid/input_interpreter.cpp b/src/core/hid/input_interpreter.cpp index 76d6b8ab02..d492ecf22c 100644 --- a/src/core/hid/input_interpreter.cpp +++ b/src/core/hid/input_interpreter.cpp @@ -4,9 +4,9 @@ #include "core/core.h" #include "core/hid/hid_types.h" #include "core/hid/input_interpreter.h" -#include "core/hle/service/hid/controllers/npad.h" -#include "core/hle/service/hid/hid.h" -#include "core/hle/service/sm/sm.h" +#include "service/hid/controllers/npad.h" +#include "service/hid/hid.h" +#include "service/sm/sm.h" InputInterpreter::InputInterpreter(Core::System& system) : npad{system.ServiceManager() diff --git a/src/core/hle/ipc.h b/src/core/ipc.h similarity index 100% rename from src/core/hle/ipc.h rename to src/core/ipc.h diff --git a/src/core/loader/deconstructed_rom_directory.cpp b/src/core/loader/deconstructed_rom_directory.cpp index 5c36b71e53..277ca6cde1 100644 --- a/src/core/loader/deconstructed_rom_directory.cpp +++ b/src/core/loader/deconstructed_rom_directory.cpp @@ -8,11 +8,11 @@ #include "core/file_sys/control_metadata.h" #include "core/file_sys/patch_manager.h" #include "core/file_sys/romfs_factory.h" -#include "core/hle/kernel/k_page_table.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/service/filesystem/filesystem.h" #include "core/loader/deconstructed_rom_directory.h" #include "core/loader/nso.h" +#include "kernel/k_page_table.h" +#include "kernel/k_process.h" +#include "service/filesystem/filesystem.h" namespace Loader { diff --git a/src/core/loader/kip.cpp b/src/core/loader/kip.cpp index bf56a08b40..e438260082 100644 --- a/src/core/loader/kip.cpp +++ b/src/core/loader/kip.cpp @@ -4,11 +4,11 @@ #include #include "core/file_sys/kernel_executable.h" #include "core/file_sys/program_metadata.h" -#include "core/hle/kernel/code_set.h" -#include "core/hle/kernel/k_page_table.h" -#include "core/hle/kernel/k_process.h" #include "core/loader/kip.h" #include "core/memory.h" +#include "kernel/code_set.h" +#include "kernel/k_page_table.h" +#include "kernel/k_process.h" namespace Loader { diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index b6e355622e..b62524eecf 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp @@ -10,7 +10,6 @@ #include "common/logging/log.h" #include "common/string_util.h" #include "core/core.h" -#include "core/hle/kernel/k_process.h" #include "core/loader/deconstructed_rom_directory.h" #include "core/loader/kip.h" #include "core/loader/nax.h" @@ -19,6 +18,7 @@ #include "core/loader/nso.h" #include "core/loader/nsp.h" #include "core/loader/xci.h" +#include "kernel/k_process.h" namespace Loader { diff --git a/src/core/loader/nax.cpp b/src/core/loader/nax.cpp index 3b7b005ff4..aedb582bd8 100644 --- a/src/core/loader/nax.cpp +++ b/src/core/loader/nax.cpp @@ -4,9 +4,9 @@ #include "core/file_sys/content_archive.h" #include "core/file_sys/romfs.h" #include "core/file_sys/xts_archive.h" -#include "core/hle/kernel/k_process.h" #include "core/loader/nax.h" #include "core/loader/nca.h" +#include "kernel/k_process.h" namespace Loader { namespace { diff --git a/src/core/loader/nca.cpp b/src/core/loader/nca.cpp index 4feb6968ae..b2dd075261 100644 --- a/src/core/loader/nca.cpp +++ b/src/core/loader/nca.cpp @@ -10,11 +10,11 @@ #include "core/file_sys/nca_metadata.h" #include "core/file_sys/registered_cache.h" #include "core/file_sys/romfs_factory.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/service/filesystem/filesystem.h" #include "core/loader/deconstructed_rom_directory.h" #include "core/loader/nca.h" +#include "kernel/k_process.h" #include "mbedtls/sha256.h" +#include "service/filesystem/filesystem.h" namespace Loader { diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index 69f1a54ed6..c3a49fdec0 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp @@ -13,14 +13,14 @@ #include "core/file_sys/control_metadata.h" #include "core/file_sys/romfs_factory.h" #include "core/file_sys/vfs_offset.h" -#include "core/hle/kernel/code_set.h" -#include "core/hle/kernel/k_page_table.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/service/filesystem/filesystem.h" #include "core/loader/nro.h" #include "core/loader/nso.h" #include "core/memory.h" +#include "kernel/code_set.h" +#include "kernel/k_page_table.h" +#include "kernel/k_process.h" +#include "kernel/k_thread.h" +#include "service/filesystem/filesystem.h" namespace Loader { diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index 1350da8dca..754af672aa 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp @@ -13,12 +13,12 @@ #include "common/swap.h" #include "core/core.h" #include "core/file_sys/patch_manager.h" -#include "core/hle/kernel/code_set.h" -#include "core/hle/kernel/k_page_table.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_thread.h" #include "core/loader/nso.h" #include "core/memory.h" +#include "kernel/code_set.h" +#include "kernel/k_page_table.h" +#include "kernel/k_process.h" +#include "kernel/k_thread.h" namespace Loader { namespace { diff --git a/src/core/loader/nsp.cpp b/src/core/loader/nsp.cpp index f4ab75b770..48bbc697e8 100644 --- a/src/core/loader/nsp.cpp +++ b/src/core/loader/nsp.cpp @@ -11,11 +11,11 @@ #include "core/file_sys/patch_manager.h" #include "core/file_sys/registered_cache.h" #include "core/file_sys/submission_package.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/service/filesystem/filesystem.h" #include "core/loader/deconstructed_rom_directory.h" #include "core/loader/nca.h" #include "core/loader/nsp.h" +#include "kernel/k_process.h" +#include "service/filesystem/filesystem.h" namespace Loader { diff --git a/src/core/loader/xci.cpp b/src/core/loader/xci.cpp index 12d72c3809..7ba0877007 100644 --- a/src/core/loader/xci.cpp +++ b/src/core/loader/xci.cpp @@ -11,10 +11,10 @@ #include "core/file_sys/patch_manager.h" #include "core/file_sys/registered_cache.h" #include "core/file_sys/submission_package.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/service/filesystem/filesystem.h" #include "core/loader/nca.h" #include "core/loader/xci.h" +#include "kernel/k_process.h" +#include "service/filesystem/filesystem.h" namespace Loader { diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 84b60a928b..6caf19448c 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -16,9 +16,9 @@ #include "core/device_memory.h" #include "core/gpu_dirty_memory_manager.h" #include "core/hardware_properties.h" -#include "core/hle/kernel/k_page_table.h" -#include "core/hle/kernel/k_process.h" #include "core/memory.h" +#include "kernel/k_page_table.h" +#include "kernel/k_process.h" #include "video_core/gpu.h" #include "video_core/rasterizer_download_area.h" diff --git a/src/core/memory.h b/src/core/memory.h index 13047a5451..85a1d898d4 100644 --- a/src/core/memory.h +++ b/src/core/memory.h @@ -12,7 +12,7 @@ #include "common/scratch_buffer.h" #include "common/typed_address.h" -#include "core/hle/result.h" +#include "core/result.h" namespace Common { struct PageTable; diff --git a/src/core/memory/cheat_engine.cpp b/src/core/memory/cheat_engine.cpp index 53a89cc8f3..45e2010aa6 100644 --- a/src/core/memory/cheat_engine.cpp +++ b/src/core/memory/cheat_engine.cpp @@ -7,13 +7,13 @@ #include "common/swap.h" #include "core/core.h" #include "core/core_timing.h" -#include "core/hle/kernel/k_page_table.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/service/hid/controllers/npad.h" -#include "core/hle/service/hid/hid.h" -#include "core/hle/service/sm/sm.h" #include "core/memory.h" #include "core/memory/cheat_engine.h" +#include "kernel/k_page_table.h" +#include "kernel/k_process.h" +#include "service/hid/controllers/npad.h" +#include "service/hid/hid.h" +#include "service/sm/sm.h" namespace Core::Memory { namespace { diff --git a/src/core/precompiled_headers.h b/src/core/precompiled_headers.h index 30a31001de..d3f963b5bd 100644 --- a/src/core/precompiled_headers.h +++ b/src/core/precompiled_headers.h @@ -8,4 +8,4 @@ #include "common/common_precompiled_headers.h" -#include "core/hle/kernel/k_process.h" +#include "kernel/k_process.h" diff --git a/src/core/reporter.cpp b/src/core/reporter.cpp index 5d168cbc1c..29484bc4f5 100644 --- a/src/core/reporter.cpp +++ b/src/core/reporter.cpp @@ -17,12 +17,12 @@ #include "common/settings.h" #include "core/arm/arm_interface.h" #include "core/core.h" -#include "core/hle/kernel/k_page_table.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/result.h" -#include "core/hle/service/hle_ipc.h" #include "core/memory.h" #include "core/reporter.h" +#include "core/result.h" +#include "kernel/k_page_table.h" +#include "kernel/k_process.h" +#include "service/hle_ipc.h" namespace { diff --git a/src/core/hle/result.h b/src/core/result.h similarity index 100% rename from src/core/hle/result.h rename to src/core/result.h diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt new file mode 100644 index 0000000000..ce6a752334 --- /dev/null +++ b/src/kernel/CMakeLists.txt @@ -0,0 +1,217 @@ +# SPDX-FileCopyrightText: 2018 yuzu Emulator Project +# SPDX-License-Identifier: GPL-2.0-or-later + +add_library(kernel STATIC + board/nintendo/nx/k_memory_layout.cpp + board/nintendo/nx/k_memory_layout.h + board/nintendo/nx/k_system_control.cpp + board/nintendo/nx/k_system_control.h + board/nintendo/nx/secure_monitor.h + code_set.cpp + code_set.h + svc_results.h + global_scheduler_context.cpp + global_scheduler_context.h + init/init_slab_setup.cpp + init/init_slab_setup.h + initial_process.h + k_address_arbiter.cpp + k_address_arbiter.h + k_address_space_info.cpp + k_address_space_info.h + k_auto_object.cpp + k_auto_object.h + k_auto_object_container.cpp + k_auto_object_container.h + k_affinity_mask.h + k_capabilities.cpp + k_capabilities.h + k_class_token.cpp + k_class_token.h + k_client_port.cpp + k_client_port.h + k_client_session.cpp + k_client_session.h + k_code_memory.cpp + k_code_memory.h + k_condition_variable.cpp + k_condition_variable.h + k_debug.h + k_device_address_space.cpp + k_device_address_space.h + k_dynamic_page_manager.h + k_dynamic_resource_manager.h + k_dynamic_slab_heap.h + k_event.cpp + k_event.h + k_event_info.h + k_handle_table.cpp + k_handle_table.h + k_hardware_timer_base.h + k_hardware_timer.cpp + k_hardware_timer.h + k_interrupt_manager.cpp + k_interrupt_manager.h + k_light_condition_variable.cpp + k_light_condition_variable.h + k_light_lock.cpp + k_light_lock.h + k_memory_block.h + k_memory_block_manager.cpp + k_memory_block_manager.h + k_memory_layout.cpp + k_memory_layout.h + k_memory_manager.cpp + k_memory_manager.h + k_memory_region.h + k_memory_region_type.h + k_object_name.cpp + k_object_name.h + k_page_bitmap.h + k_page_buffer.cpp + k_page_buffer.h + k_page_heap.cpp + k_page_heap.h + k_page_group.cpp + k_page_group.h + k_page_table.h + k_page_table_base.cpp + k_page_table_base.h + k_page_table_manager.h + k_page_table_slab_heap.h + k_port.cpp + k_port.h + k_priority_queue.h + k_process.cpp + k_process.h + k_process_page_table.h + k_readable_event.cpp + k_readable_event.h + k_resource_limit.cpp + k_resource_limit.h + k_scheduler.cpp + k_scheduler.h + k_scheduler_lock.h + k_scoped_lock.h + k_scoped_resource_reservation.h + k_scoped_scheduler_lock_and_sleep.h + k_server_port.cpp + k_server_port.h + k_server_session.cpp + k_server_session.h + k_session.cpp + k_session.h + k_session_request.cpp + k_session_request.h + k_shared_memory.cpp + k_shared_memory.h + k_shared_memory_info.h + k_slab_heap.h + k_spin_lock.cpp + k_spin_lock.h + k_synchronization_object.cpp + k_synchronization_object.h + k_system_control.h + k_system_resource.cpp + k_system_resource.h + k_thread.cpp + k_thread.h + k_thread_local_page.cpp + k_thread_local_page.h + k_thread_queue.cpp + k_thread_queue.h + k_timer_task.h + k_trace.h + k_transfer_memory.cpp + k_transfer_memory.h + k_typed_address.h + k_worker_task.h + k_worker_task_manager.cpp + k_worker_task_manager.h + kernel.cpp + kernel.h + memory_types.h + message_buffer.h + physical_core.cpp + physical_core.h + physical_memory.h + slab_helpers.h + svc.cpp + svc.h + svc_common.h + svc_types.h + svc_version.h + svc/svc_activity.cpp + svc/svc_address_arbiter.cpp + svc/svc_address_translation.cpp + svc/svc_cache.cpp + svc/svc_code_memory.cpp + svc/svc_condition_variable.cpp + svc/svc_debug.cpp + svc/svc_debug_string.cpp + svc/svc_device_address_space.cpp + svc/svc_event.cpp + svc/svc_exception.cpp + svc/svc_info.cpp + svc/svc_insecure_memory.cpp + svc/svc_interrupt_event.cpp + svc/svc_io_pool.cpp + svc/svc_ipc.cpp + svc/svc_kernel_debug.cpp + svc/svc_light_ipc.cpp + svc/svc_lock.cpp + svc/svc_memory.cpp + svc/svc_physical_memory.cpp + svc/svc_port.cpp + svc/svc_power_management.cpp + svc/svc_process.cpp + svc/svc_process_memory.cpp + svc/svc_processor.cpp + svc/svc_query_memory.cpp + svc/svc_register.cpp + svc/svc_resource_limit.cpp + svc/svc_secure_monitor_call.cpp + svc/svc_session.cpp + svc/svc_shared_memory.cpp + svc/svc_synchronization.cpp + svc/svc_thread.cpp + svc/svc_thread_profiler.cpp + svc/svc_tick.cpp + svc/svc_transfer_memory.cpp +) + +if (MSVC) + target_compile_options(kernel PRIVATE + /we4242 # 'identifier': conversion from 'type1' to 'type2', possible loss of data + /we4244 # 'conversion': conversion from 'type1' to 'type2', possible loss of data + /we4245 # 'conversion': conversion from 'type1' to 'type2', signed/unsigned mismatch + /we4254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data + /we4800 # Implicit conversion from 'type' to bool. Possible information loss + ) +else() + target_compile_options(kernel PRIVATE + -Werror=conversion + + -Wno-sign-conversion + -Wno-cast-function-type + + $<$:-fsized-deallocation> + ) +endif() + +create_target_directory_groups(kernel) + +target_link_libraries(kernel PUBLIC common) +target_link_libraries(kernel PUBLIC Boost::headers PRIVATE fmt::fmt) + +if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) + target_link_libraries(kernel PRIVATE core dynarmic::dynarmic) +endif() + +if (YUZU_USE_PRECOMPILED_HEADERS) + target_precompile_headers(kernel PRIVATE precompiled_headers.h) +endif() + +if (YUZU_ENABLE_LTO) + set_property(TARGET kernel PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) +endif() diff --git a/src/core/hle/kernel/arch/arm64/k_memory_region_device_types.inc b/src/kernel/arch/arm64/k_memory_region_device_types.inc similarity index 100% rename from src/core/hle/kernel/arch/arm64/k_memory_region_device_types.inc rename to src/kernel/arch/arm64/k_memory_region_device_types.inc diff --git a/src/core/hle/kernel/board/nintendo/nx/k_memory_layout.cpp b/src/kernel/board/nintendo/nx/k_memory_layout.cpp similarity index 98% rename from src/core/hle/kernel/board/nintendo/nx/k_memory_layout.cpp rename to src/kernel/board/nintendo/nx/k_memory_layout.cpp index 24eb3f8866..7b2f56d6e1 100644 --- a/src/core/hle/kernel/board/nintendo/nx/k_memory_layout.cpp +++ b/src/kernel/board/nintendo/nx/k_memory_layout.cpp @@ -3,10 +3,10 @@ #include "common/alignment.h" #include "common/literals.h" -#include "core/hle/kernel/k_memory_layout.h" -#include "core/hle/kernel/k_memory_manager.h" -#include "core/hle/kernel/k_system_control.h" -#include "core/hle/kernel/k_trace.h" +#include "kernel/k_memory_layout.h" +#include "kernel/k_memory_manager.h" +#include "kernel/k_system_control.h" +#include "kernel/k_trace.h" namespace Kernel { diff --git a/src/core/hle/kernel/board/nintendo/nx/k_memory_layout.h b/src/kernel/board/nintendo/nx/k_memory_layout.h similarity index 83% rename from src/core/hle/kernel/board/nintendo/nx/k_memory_layout.h rename to src/kernel/board/nintendo/nx/k_memory_layout.h index f8fee4f5b9..b9afe62307 100644 --- a/src/core/hle/kernel/board/nintendo/nx/k_memory_layout.h +++ b/src/kernel/board/nintendo/nx/k_memory_layout.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/kernel/k_typed_address.h" +#include "kernel/k_typed_address.h" namespace Kernel { diff --git a/src/core/hle/kernel/board/nintendo/nx/k_memory_region_device_types.inc b/src/kernel/board/nintendo/nx/k_memory_region_device_types.inc similarity index 100% rename from src/core/hle/kernel/board/nintendo/nx/k_memory_region_device_types.inc rename to src/kernel/board/nintendo/nx/k_memory_region_device_types.inc diff --git a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp b/src/kernel/board/nintendo/nx/k_system_control.cpp similarity index 96% rename from src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp rename to src/kernel/board/nintendo/nx/k_system_control.cpp index 37fa39a734..9a310687f0 100644 --- a/src/core/hle/kernel/board/nintendo/nx/k_system_control.cpp +++ b/src/kernel/board/nintendo/nx/k_system_control.cpp @@ -6,13 +6,13 @@ #include "common/literals.h" #include "common/settings.h" -#include "core/hle/kernel/board/nintendo/nx/k_system_control.h" -#include "core/hle/kernel/board/nintendo/nx/secure_monitor.h" -#include "core/hle/kernel/k_memory_manager.h" -#include "core/hle/kernel/k_page_table.h" -#include "core/hle/kernel/k_trace.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/board/nintendo/nx/k_system_control.h" +#include "kernel/board/nintendo/nx/secure_monitor.h" +#include "kernel/k_memory_manager.h" +#include "kernel/k_page_table.h" +#include "kernel/k_trace.h" +#include "kernel/kernel.h" +#include "kernel/svc_results.h" namespace Kernel::Board::Nintendo::Nx { diff --git a/src/core/hle/kernel/board/nintendo/nx/k_system_control.h b/src/kernel/board/nintendo/nx/k_system_control.h similarity index 95% rename from src/core/hle/kernel/board/nintendo/nx/k_system_control.h rename to src/kernel/board/nintendo/nx/k_system_control.h index 60c5e58b73..1eeaaacfa6 100644 --- a/src/core/hle/kernel/board/nintendo/nx/k_system_control.h +++ b/src/kernel/board/nintendo/nx/k_system_control.h @@ -3,8 +3,8 @@ #pragma once -#include "core/hle/kernel/k_typed_address.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/k_typed_address.h" namespace Kernel { class KernelCore; diff --git a/src/core/hle/kernel/board/nintendo/nx/secure_monitor.h b/src/kernel/board/nintendo/nx/secure_monitor.h similarity index 100% rename from src/core/hle/kernel/board/nintendo/nx/secure_monitor.h rename to src/kernel/board/nintendo/nx/secure_monitor.h diff --git a/src/core/hle/kernel/code_set.cpp b/src/kernel/code_set.cpp similarity index 84% rename from src/core/hle/kernel/code_set.cpp rename to src/kernel/code_set.cpp index 41386048b6..18ae5fe161 100644 --- a/src/core/hle/kernel/code_set.cpp +++ b/src/kernel/code_set.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/code_set.h" +#include "kernel/code_set.h" namespace Kernel { diff --git a/src/core/hle/kernel/code_set.h b/src/kernel/code_set.h similarity index 95% rename from src/core/hle/kernel/code_set.h rename to src/kernel/code_set.h index af1af2b78a..a3917cc16f 100644 --- a/src/core/hle/kernel/code_set.h +++ b/src/kernel/code_set.h @@ -5,8 +5,8 @@ #include -#include "core/hle/kernel/k_typed_address.h" -#include "core/hle/kernel/physical_memory.h" +#include "kernel/k_typed_address.h" +#include "kernel/physical_memory.h" namespace Kernel { diff --git a/src/core/hle/kernel/global_scheduler_context.cpp b/src/kernel/global_scheduler_context.cpp similarity index 91% rename from src/core/hle/kernel/global_scheduler_context.cpp rename to src/kernel/global_scheduler_context.cpp index 7b090ccb5e..cb897c4fef 100644 --- a/src/core/hle/kernel/global_scheduler_context.cpp +++ b/src/kernel/global_scheduler_context.cpp @@ -5,10 +5,10 @@ #include "common/assert.h" #include "core/core.h" -#include "core/hle/kernel/global_scheduler_context.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/physical_core.h" +#include "kernel/global_scheduler_context.h" +#include "kernel/k_scheduler.h" +#include "kernel/kernel.h" +#include "kernel/physical_core.h" namespace Kernel { diff --git a/src/core/hle/kernel/global_scheduler_context.h b/src/kernel/global_scheduler_context.h similarity index 93% rename from src/core/hle/kernel/global_scheduler_context.h rename to src/kernel/global_scheduler_context.h index c48e8cd120..37f1196fdb 100644 --- a/src/core/hle/kernel/global_scheduler_context.h +++ b/src/kernel/global_scheduler_context.h @@ -9,10 +9,10 @@ #include "common/common_types.h" #include "core/hardware_properties.h" -#include "core/hle/kernel/k_priority_queue.h" -#include "core/hle/kernel/k_scheduler_lock.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/svc_types.h" +#include "kernel/k_priority_queue.h" +#include "kernel/k_scheduler_lock.h" +#include "kernel/k_thread.h" +#include "kernel/svc_types.h" namespace Kernel { diff --git a/src/core/hle/kernel/init/init_slab_setup.cpp b/src/kernel/init/init_slab_setup.cpp similarity index 92% rename from src/core/hle/kernel/init/init_slab_setup.cpp rename to src/kernel/init/init_slab_setup.cpp index a0e20bbbb4..103f4ac065 100644 --- a/src/core/hle/kernel/init/init_slab_setup.cpp +++ b/src/kernel/init/init_slab_setup.cpp @@ -7,29 +7,29 @@ #include "core/core.h" #include "core/device_memory.h" #include "core/hardware_properties.h" -#include "core/hle/kernel/init/init_slab_setup.h" -#include "core/hle/kernel/k_code_memory.h" -#include "core/hle/kernel/k_debug.h" -#include "core/hle/kernel/k_device_address_space.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_event_info.h" -#include "core/hle/kernel/k_memory_layout.h" -#include "core/hle/kernel/k_memory_manager.h" -#include "core/hle/kernel/k_object_name.h" -#include "core/hle/kernel/k_page_buffer.h" -#include "core/hle/kernel/k_port.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_resource_limit.h" -#include "core/hle/kernel/k_session.h" -#include "core/hle/kernel/k_session_request.h" -#include "core/hle/kernel/k_shared_memory.h" -#include "core/hle/kernel/k_shared_memory_info.h" -#include "core/hle/kernel/k_system_control.h" -#include "core/hle/kernel/k_system_resource.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/k_thread_local_page.h" -#include "core/hle/kernel/k_transfer_memory.h" -#include "core/hle/kernel/k_typed_address.h" +#include "kernel/init/init_slab_setup.h" +#include "kernel/k_code_memory.h" +#include "kernel/k_debug.h" +#include "kernel/k_device_address_space.h" +#include "kernel/k_event.h" +#include "kernel/k_event_info.h" +#include "kernel/k_memory_layout.h" +#include "kernel/k_memory_manager.h" +#include "kernel/k_object_name.h" +#include "kernel/k_page_buffer.h" +#include "kernel/k_port.h" +#include "kernel/k_process.h" +#include "kernel/k_resource_limit.h" +#include "kernel/k_session.h" +#include "kernel/k_session_request.h" +#include "kernel/k_shared_memory.h" +#include "kernel/k_shared_memory_info.h" +#include "kernel/k_system_control.h" +#include "kernel/k_system_resource.h" +#include "kernel/k_thread.h" +#include "kernel/k_thread_local_page.h" +#include "kernel/k_transfer_memory.h" +#include "kernel/k_typed_address.h" namespace Kernel::Init { diff --git a/src/core/hle/kernel/init/init_slab_setup.h b/src/kernel/init/init_slab_setup.h similarity index 100% rename from src/core/hle/kernel/init/init_slab_setup.h rename to src/kernel/init/init_slab_setup.h diff --git a/src/core/hle/kernel/initial_process.h b/src/kernel/initial_process.h similarity index 82% rename from src/core/hle/kernel/initial_process.h rename to src/kernel/initial_process.h index 2c95269fc5..d05628ad10 100644 --- a/src/core/hle/kernel/initial_process.h +++ b/src/kernel/initial_process.h @@ -5,8 +5,8 @@ #include "common/common_types.h" #include "common/literals.h" -#include "core/hle/kernel/board/nintendo/nx/k_memory_layout.h" -#include "core/hle/kernel/board/nintendo/nx/k_system_control.h" +#include "kernel/board/nintendo/nx/k_memory_layout.h" +#include "kernel/board/nintendo/nx/k_system_control.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_address_arbiter.cpp b/src/kernel/k_address_arbiter.cpp similarity index 96% rename from src/core/hle/kernel/k_address_arbiter.cpp rename to src/kernel/k_address_arbiter.cpp index 78d43d729c..58f4eb966a 100644 --- a/src/core/hle/kernel/k_address_arbiter.cpp +++ b/src/kernel/k_address_arbiter.cpp @@ -3,15 +3,15 @@ #include "core/arm/exclusive_monitor.h" #include "core/core.h" -#include "core/hle/kernel/k_address_arbiter.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/k_thread_queue.h" -#include "core/hle/kernel/k_typed_address.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/svc_results.h" #include "core/memory.h" +#include "kernel/k_address_arbiter.h" +#include "kernel/k_scheduler.h" +#include "kernel/k_scoped_scheduler_lock_and_sleep.h" +#include "kernel/k_thread.h" +#include "kernel/k_thread_queue.h" +#include "kernel/k_typed_address.h" +#include "kernel/kernel.h" +#include "kernel/svc_results.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_address_arbiter.h b/src/kernel/k_address_arbiter.h similarity index 95% rename from src/core/hle/kernel/k_address_arbiter.h rename to src/kernel/k_address_arbiter.h index 3b70e1ab28..740eb8ee4d 100644 --- a/src/core/hle/kernel/k_address_arbiter.h +++ b/src/kernel/k_address_arbiter.h @@ -5,8 +5,8 @@ #include "common/assert.h" #include "common/common_types.h" -#include "core/hle/kernel/k_condition_variable.h" -#include "core/hle/kernel/svc_types.h" +#include "kernel/k_condition_variable.h" +#include "kernel/svc_types.h" union Result; diff --git a/src/core/hle/kernel/k_address_space_info.cpp b/src/kernel/k_address_space_info.cpp similarity index 98% rename from src/core/hle/kernel/k_address_space_info.cpp rename to src/kernel/k_address_space_info.cpp index 32173e52b4..ce8741f3eb 100644 --- a/src/core/hle/kernel/k_address_space_info.cpp +++ b/src/kernel/k_address_space_info.cpp @@ -5,7 +5,7 @@ #include "common/assert.h" #include "common/literals.h" -#include "core/hle/kernel/k_address_space_info.h" +#include "kernel/k_address_space_info.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_address_space_info.h b/src/kernel/k_address_space_info.h similarity index 100% rename from src/core/hle/kernel/k_address_space_info.h rename to src/kernel/k_address_space_info.h diff --git a/src/core/hle/kernel/k_affinity_mask.h b/src/kernel/k_affinity_mask.h similarity index 100% rename from src/core/hle/kernel/k_affinity_mask.h rename to src/kernel/k_affinity_mask.h diff --git a/src/core/hle/kernel/k_auto_object.cpp b/src/kernel/k_auto_object.cpp similarity index 85% rename from src/core/hle/kernel/k_auto_object.cpp rename to src/kernel/k_auto_object.cpp index 9cd7a9fd51..2a3a470537 100644 --- a/src/core/hle/kernel/k_auto_object.cpp +++ b/src/kernel/k_auto_object.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/k_auto_object.h" -#include "core/hle/kernel/kernel.h" +#include "kernel/k_auto_object.h" +#include "kernel/kernel.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_auto_object.h b/src/kernel/k_auto_object.h similarity index 99% rename from src/core/hle/kernel/k_auto_object.h rename to src/kernel/k_auto_object.h index 8d4e0df44f..cd9a857e37 100644 --- a/src/core/hle/kernel/k_auto_object.h +++ b/src/kernel/k_auto_object.h @@ -11,7 +11,7 @@ #include "common/assert.h" #include "common/common_funcs.h" #include "common/common_types.h" -#include "core/hle/kernel/k_class_token.h" +#include "kernel/k_class_token.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_auto_object_container.cpp b/src/kernel/k_auto_object_container.cpp similarity index 93% rename from src/core/hle/kernel/k_auto_object_container.cpp rename to src/kernel/k_auto_object_container.cpp index 636b3f9936..ef9086b335 100644 --- a/src/core/hle/kernel/k_auto_object_container.cpp +++ b/src/kernel/k_auto_object_container.cpp @@ -3,7 +3,7 @@ #include -#include "core/hle/kernel/k_auto_object_container.h" +#include "kernel/k_auto_object_container.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_auto_object_container.h b/src/kernel/k_auto_object_container.h similarity index 95% rename from src/core/hle/kernel/k_auto_object_container.h rename to src/kernel/k_auto_object_container.h index badd75d2a0..83f60dc739 100644 --- a/src/core/hle/kernel/k_auto_object_container.h +++ b/src/kernel/k_auto_object_container.h @@ -6,8 +6,8 @@ #include #include "common/common_funcs.h" -#include "core/hle/kernel/k_auto_object.h" -#include "core/hle/kernel/k_light_lock.h" +#include "kernel/k_auto_object.h" +#include "kernel/k_light_lock.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_capabilities.cpp b/src/kernel/k_capabilities.cpp similarity index 97% rename from src/core/hle/kernel/k_capabilities.cpp rename to src/kernel/k_capabilities.cpp index 274fee493f..01a619d7e2 100644 --- a/src/core/hle/kernel/k_capabilities.cpp +++ b/src/kernel/k_capabilities.cpp @@ -2,13 +2,13 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/hardware_properties.h" -#include "core/hle/kernel/k_capabilities.h" -#include "core/hle/kernel/k_memory_layout.h" -#include "core/hle/kernel/k_process_page_table.h" -#include "core/hle/kernel/k_trace.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/svc_results.h" -#include "core/hle/kernel/svc_version.h" +#include "kernel/k_capabilities.h" +#include "kernel/k_memory_layout.h" +#include "kernel/k_process_page_table.h" +#include "kernel/k_trace.h" +#include "kernel/kernel.h" +#include "kernel/svc_results.h" +#include "kernel/svc_version.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_capabilities.h b/src/kernel/k_capabilities.h similarity index 99% rename from src/core/hle/kernel/k_capabilities.h rename to src/kernel/k_capabilities.h index 013d952ad4..ed3c1a9666 100644 --- a/src/core/hle/kernel/k_capabilities.h +++ b/src/kernel/k_capabilities.h @@ -10,8 +10,8 @@ #include "common/bit_field.h" #include "common/common_types.h" -#include "core/hle/kernel/svc_types.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/svc_types.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_class_token.cpp b/src/kernel/k_class_token.cpp similarity index 89% rename from src/core/hle/kernel/k_class_token.cpp rename to src/kernel/k_class_token.cpp index a850db3c47..1cf23c5a72 100644 --- a/src/core/hle/kernel/k_class_token.cpp +++ b/src/kernel/k_class_token.cpp @@ -1,24 +1,24 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/k_auto_object.h" -#include "core/hle/kernel/k_class_token.h" -#include "core/hle/kernel/k_client_port.h" -#include "core/hle/kernel/k_client_session.h" -#include "core/hle/kernel/k_code_memory.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_port.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/kernel/k_resource_limit.h" -#include "core/hle/kernel/k_server_port.h" -#include "core/hle/kernel/k_server_session.h" -#include "core/hle/kernel/k_session.h" -#include "core/hle/kernel/k_shared_memory.h" -#include "core/hle/kernel/k_synchronization_object.h" -#include "core/hle/kernel/k_system_resource.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/k_transfer_memory.h" +#include "kernel/k_auto_object.h" +#include "kernel/k_class_token.h" +#include "kernel/k_client_port.h" +#include "kernel/k_client_session.h" +#include "kernel/k_code_memory.h" +#include "kernel/k_event.h" +#include "kernel/k_port.h" +#include "kernel/k_process.h" +#include "kernel/k_readable_event.h" +#include "kernel/k_resource_limit.h" +#include "kernel/k_server_port.h" +#include "kernel/k_server_session.h" +#include "kernel/k_session.h" +#include "kernel/k_shared_memory.h" +#include "kernel/k_synchronization_object.h" +#include "kernel/k_system_resource.h" +#include "kernel/k_thread.h" +#include "kernel/k_transfer_memory.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_class_token.h b/src/kernel/k_class_token.h similarity index 100% rename from src/core/hle/kernel/k_class_token.h rename to src/kernel/k_class_token.h diff --git a/src/core/hle/kernel/k_client_port.cpp b/src/kernel/k_client_port.cpp similarity index 93% rename from src/core/hle/kernel/k_client_port.cpp rename to src/kernel/k_client_port.cpp index 40e09e5325..97eb95d6c3 100644 --- a/src/core/hle/kernel/k_client_port.cpp +++ b/src/kernel/k_client_port.cpp @@ -2,12 +2,12 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/scope_exit.h" -#include "core/hle/kernel/k_client_port.h" -#include "core/hle/kernel/k_port.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_scoped_resource_reservation.h" -#include "core/hle/kernel/k_session.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/k_client_port.h" +#include "kernel/k_port.h" +#include "kernel/k_scheduler.h" +#include "kernel/k_scoped_resource_reservation.h" +#include "kernel/k_session.h" +#include "kernel/svc_results.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_client_port.h b/src/kernel/k_client_port.h similarity index 93% rename from src/core/hle/kernel/k_client_port.h rename to src/kernel/k_client_port.h index 23db06ddf8..409ebe8956 100644 --- a/src/core/hle/kernel/k_client_port.h +++ b/src/kernel/k_client_port.h @@ -6,8 +6,8 @@ #include #include "common/common_types.h" -#include "core/hle/kernel/k_synchronization_object.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/k_synchronization_object.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_client_session.cpp b/src/kernel/k_client_session.cpp similarity index 83% rename from src/core/hle/kernel/k_client_session.cpp rename to src/kernel/k_client_session.cpp index 72b66270d4..a368052e59 100644 --- a/src/core/hle/kernel/k_client_session.cpp +++ b/src/kernel/k_client_session.cpp @@ -2,11 +2,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/scope_exit.h" -#include "core/hle/kernel/k_client_session.h" -#include "core/hle/kernel/k_server_session.h" -#include "core/hle/kernel/k_session.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/k_client_session.h" +#include "kernel/k_server_session.h" +#include "kernel/k_session.h" +#include "kernel/k_thread.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_client_session.h b/src/kernel/k_client_session.h similarity index 89% rename from src/core/hle/kernel/k_client_session.h rename to src/kernel/k_client_session.h index 9b62e55e45..0f3633b47b 100644 --- a/src/core/hle/kernel/k_client_session.h +++ b/src/kernel/k_client_session.h @@ -5,9 +5,9 @@ #include -#include "core/hle/kernel/k_auto_object.h" -#include "core/hle/kernel/slab_helpers.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/k_auto_object.h" +#include "kernel/slab_helpers.h" union Result; diff --git a/src/core/hle/kernel/k_code_memory.cpp b/src/kernel/k_code_memory.cpp similarity index 92% rename from src/core/hle/kernel/k_code_memory.cpp rename to src/kernel/k_code_memory.cpp index 7454be55c9..ddfaf75f06 100644 --- a/src/core/hle/kernel/k_code_memory.cpp +++ b/src/kernel/k_code_memory.cpp @@ -4,15 +4,15 @@ #include "common/alignment.h" #include "common/common_types.h" #include "core/device_memory.h" -#include "core/hle/kernel/k_code_memory.h" -#include "core/hle/kernel/k_light_lock.h" -#include "core/hle/kernel/k_memory_block.h" -#include "core/hle/kernel/k_page_group.h" -#include "core/hle/kernel/k_page_table.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/slab_helpers.h" -#include "core/hle/kernel/svc_types.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/k_code_memory.h" +#include "kernel/k_light_lock.h" +#include "kernel/k_memory_block.h" +#include "kernel/k_page_group.h" +#include "kernel/k_page_table.h" +#include "kernel/k_process.h" +#include "kernel/slab_helpers.h" +#include "kernel/svc_types.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_code_memory.h b/src/kernel/k_code_memory.h similarity index 82% rename from src/core/hle/kernel/k_code_memory.h rename to src/kernel/k_code_memory.h index 26fe6b3dc6..db806e747d 100644 --- a/src/core/hle/kernel/k_code_memory.h +++ b/src/kernel/k_code_memory.h @@ -6,14 +6,14 @@ #include #include "core/device_memory.h" -#include "core/hle/kernel/k_auto_object.h" -#include "core/hle/kernel/k_light_lock.h" -#include "core/hle/kernel/k_page_group.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_typed_address.h" -#include "core/hle/kernel/slab_helpers.h" -#include "core/hle/kernel/svc_types.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/k_auto_object.h" +#include "kernel/k_light_lock.h" +#include "kernel/k_page_group.h" +#include "kernel/k_process.h" +#include "kernel/k_typed_address.h" +#include "kernel/slab_helpers.h" +#include "kernel/svc_types.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_condition_variable.cpp b/src/kernel/k_condition_variable.cpp similarity index 96% rename from src/core/hle/kernel/k_condition_variable.cpp rename to src/kernel/k_condition_variable.cpp index 7633a51fb2..8ecea8e942 100644 --- a/src/core/hle/kernel/k_condition_variable.cpp +++ b/src/kernel/k_condition_variable.cpp @@ -3,16 +3,16 @@ #include "core/arm/exclusive_monitor.h" #include "core/core.h" -#include "core/hle/kernel/k_condition_variable.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/k_thread_queue.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/svc_common.h" -#include "core/hle/kernel/svc_results.h" #include "core/memory.h" +#include "kernel/k_condition_variable.h" +#include "kernel/k_process.h" +#include "kernel/k_scheduler.h" +#include "kernel/k_scoped_scheduler_lock_and_sleep.h" +#include "kernel/k_thread.h" +#include "kernel/k_thread_queue.h" +#include "kernel/kernel.h" +#include "kernel/svc_common.h" +#include "kernel/svc_results.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_condition_variable.h b/src/kernel/k_condition_variable.h similarity index 88% rename from src/core/hle/kernel/k_condition_variable.h rename to src/kernel/k_condition_variable.h index 2620c8e39e..030fdc479b 100644 --- a/src/core/hle/kernel/k_condition_variable.h +++ b/src/kernel/k_condition_variable.h @@ -5,11 +5,11 @@ #include "common/assert.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/k_typed_address.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/k_scheduler.h" +#include "kernel/k_thread.h" +#include "kernel/k_typed_address.h" +#include "kernel/kernel.h" namespace Core { class System; diff --git a/src/core/hle/kernel/k_debug.h b/src/kernel/k_debug.h similarity index 84% rename from src/core/hle/kernel/k_debug.h rename to src/kernel/k_debug.h index 2290e3bcab..b12b691669 100644 --- a/src/core/hle/kernel/k_debug.h +++ b/src/kernel/k_debug.h @@ -3,8 +3,8 @@ #pragma once -#include "core/hle/kernel/k_auto_object.h" -#include "core/hle/kernel/slab_helpers.h" +#include "kernel/k_auto_object.h" +#include "kernel/slab_helpers.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_device_address_space.cpp b/src/kernel/k_device_address_space.cpp similarity index 97% rename from src/core/hle/kernel/k_device_address_space.cpp rename to src/kernel/k_device_address_space.cpp index f0703f795b..51cb244f1a 100644 --- a/src/core/hle/kernel/k_device_address_space.cpp +++ b/src/kernel/k_device_address_space.cpp @@ -3,9 +3,9 @@ #include "common/assert.h" #include "core/core.h" -#include "core/hle/kernel/k_device_address_space.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/k_device_address_space.h" +#include "kernel/kernel.h" +#include "kernel/svc_results.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_device_address_space.h b/src/kernel/k_device_address_space.h similarity index 91% rename from src/core/hle/kernel/k_device_address_space.h rename to src/kernel/k_device_address_space.h index ff0ec8152b..56fd0a2ad0 100644 --- a/src/core/hle/kernel/k_device_address_space.h +++ b/src/kernel/k_device_address_space.h @@ -5,10 +5,10 @@ #include -#include "core/hle/kernel/k_process_page_table.h" -#include "core/hle/kernel/k_typed_address.h" -#include "core/hle/kernel/slab_helpers.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/k_process_page_table.h" +#include "kernel/k_typed_address.h" +#include "kernel/slab_helpers.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_dynamic_page_manager.h b/src/kernel/k_dynamic_page_manager.h similarity index 95% rename from src/core/hle/kernel/k_dynamic_page_manager.h rename to src/kernel/k_dynamic_page_manager.h index ad11e84b71..c0040e93bd 100644 --- a/src/core/hle/kernel/k_dynamic_page_manager.h +++ b/src/kernel/k_dynamic_page_manager.h @@ -6,11 +6,11 @@ #include #include "common/alignment.h" -#include "core/hle/kernel/k_page_bitmap.h" -#include "core/hle/kernel/k_spin_lock.h" -#include "core/hle/kernel/k_typed_address.h" -#include "core/hle/kernel/memory_types.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/k_page_bitmap.h" +#include "kernel/k_spin_lock.h" +#include "kernel/k_typed_address.h" +#include "kernel/memory_types.h" +#include "kernel/svc_results.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_dynamic_resource_manager.h b/src/kernel/k_dynamic_resource_manager.h similarity index 92% rename from src/core/hle/kernel/k_dynamic_resource_manager.h rename to src/kernel/k_dynamic_resource_manager.h index b6a27d648f..ea64d95886 100644 --- a/src/core/hle/kernel/k_dynamic_resource_manager.h +++ b/src/kernel/k_dynamic_resource_manager.h @@ -4,9 +4,9 @@ #pragma once #include "common/common_funcs.h" -#include "core/hle/kernel/k_dynamic_slab_heap.h" -#include "core/hle/kernel/k_memory_block.h" -#include "core/hle/kernel/k_page_group.h" +#include "kernel/k_dynamic_slab_heap.h" +#include "kernel/k_memory_block.h" +#include "kernel/k_page_group.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_dynamic_slab_heap.h b/src/kernel/k_dynamic_slab_heap.h similarity index 97% rename from src/core/hle/kernel/k_dynamic_slab_heap.h rename to src/kernel/k_dynamic_slab_heap.h index 76ed4cac1f..0303a8f876 100644 --- a/src/core/hle/kernel/k_dynamic_slab_heap.h +++ b/src/kernel/k_dynamic_slab_heap.h @@ -6,8 +6,8 @@ #include #include "common/common_funcs.h" -#include "core/hle/kernel/k_dynamic_page_manager.h" -#include "core/hle/kernel/k_slab_heap.h" +#include "kernel/k_dynamic_page_manager.h" +#include "kernel/k_slab_heap.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_event.cpp b/src/kernel/k_event.cpp similarity index 92% rename from src/core/hle/kernel/k_event.cpp rename to src/kernel/k_event.cpp index d92b491f8b..33d4fe20ce 100644 --- a/src/core/hle/kernel/k_event.cpp +++ b/src/kernel/k_event.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_resource_limit.h" +#include "kernel/k_event.h" +#include "kernel/k_process.h" +#include "kernel/k_resource_limit.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_event.h b/src/kernel/k_event.h similarity index 93% rename from src/core/hle/kernel/k_event.h rename to src/kernel/k_event.h index f522b0a84c..b0ed08b4f8 100644 --- a/src/core/hle/kernel/k_event.h +++ b/src/kernel/k_event.h @@ -3,8 +3,8 @@ #pragma once -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/kernel/slab_helpers.h" +#include "kernel/k_readable_event.h" +#include "kernel/slab_helpers.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_event_info.h b/src/kernel/k_event_info.h similarity index 94% rename from src/core/hle/kernel/k_event_info.h rename to src/kernel/k_event_info.h index eacfa5dc61..e69b02f5db 100644 --- a/src/core/hle/kernel/k_event_info.h +++ b/src/kernel/k_event_info.h @@ -7,8 +7,8 @@ #include "common/intrusive_list.h" -#include "core/hle/kernel/slab_helpers.h" -#include "core/hle/kernel/svc_types.h" +#include "kernel/slab_helpers.h" +#include "kernel/svc_types.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_handle_table.cpp b/src/kernel/k_handle_table.cpp similarity index 98% rename from src/core/hle/kernel/k_handle_table.cpp rename to src/kernel/k_handle_table.cpp index 3535ddc0ca..fcaa078412 100644 --- a/src/core/hle/kernel/k_handle_table.cpp +++ b/src/kernel/k_handle_table.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/k_handle_table.h" -#include "core/hle/kernel/k_process.h" +#include "kernel/k_handle_table.h" +#include "kernel/k_process.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_handle_table.h b/src/kernel/k_handle_table.h similarity index 97% rename from src/core/hle/kernel/k_handle_table.h rename to src/kernel/k_handle_table.h index d7660630c0..00824a3c2e 100644 --- a/src/core/hle/kernel/k_handle_table.h +++ b/src/kernel/k_handle_table.h @@ -8,13 +8,13 @@ #include "common/assert.h" #include "common/bit_field.h" #include "common/common_types.h" -#include "core/hle/kernel/k_auto_object.h" -#include "core/hle/kernel/k_spin_lock.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/svc_common.h" -#include "core/hle/kernel/svc_results.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/k_auto_object.h" +#include "kernel/k_spin_lock.h" +#include "kernel/k_thread.h" +#include "kernel/kernel.h" +#include "kernel/svc_common.h" +#include "kernel/svc_results.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_hardware_timer.cpp b/src/kernel/k_hardware_timer.cpp similarity index 96% rename from src/core/hle/kernel/k_hardware_timer.cpp rename to src/kernel/k_hardware_timer.cpp index 8e2e40307d..2a1cf6b566 100644 --- a/src/core/hle/kernel/k_hardware_timer.cpp +++ b/src/kernel/k_hardware_timer.cpp @@ -3,8 +3,8 @@ #include "core/core.h" #include "core/core_timing.h" -#include "core/hle/kernel/k_hardware_timer.h" -#include "core/hle/kernel/k_scheduler.h" +#include "kernel/k_hardware_timer.h" +#include "kernel/k_scheduler.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_hardware_timer.h b/src/kernel/k_hardware_timer.h similarity index 95% rename from src/core/hle/kernel/k_hardware_timer.h rename to src/kernel/k_hardware_timer.h index 27f43cd194..330e55d79c 100644 --- a/src/core/hle/kernel/k_hardware_timer.h +++ b/src/kernel/k_hardware_timer.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/kernel/k_hardware_timer_base.h" +#include "kernel/k_hardware_timer_base.h" namespace Core::Timing { struct EventType; diff --git a/src/core/hle/kernel/k_hardware_timer_base.h b/src/kernel/k_hardware_timer_base.h similarity index 95% rename from src/core/hle/kernel/k_hardware_timer_base.h rename to src/kernel/k_hardware_timer_base.h index 6318b35bdd..6a4d92d938 100644 --- a/src/core/hle/kernel/k_hardware_timer_base.h +++ b/src/kernel/k_hardware_timer_base.h @@ -3,9 +3,9 @@ #pragma once -#include "core/hle/kernel/k_spin_lock.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/k_timer_task.h" +#include "kernel/k_spin_lock.h" +#include "kernel/k_thread.h" +#include "kernel/k_timer_task.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_interrupt_manager.cpp b/src/kernel/k_interrupt_manager.cpp similarity index 83% rename from src/core/hle/kernel/k_interrupt_manager.cpp rename to src/kernel/k_interrupt_manager.cpp index 22d79569a5..a50eec1a4b 100644 --- a/src/core/hle/kernel/k_interrupt_manager.cpp +++ b/src/kernel/k_interrupt_manager.cpp @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/k_interrupt_manager.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/physical_core.h" +#include "kernel/k_interrupt_manager.h" +#include "kernel/k_process.h" +#include "kernel/k_scheduler.h" +#include "kernel/k_thread.h" +#include "kernel/kernel.h" +#include "kernel/physical_core.h" namespace Kernel::KInterruptManager { diff --git a/src/core/hle/kernel/k_interrupt_manager.h b/src/kernel/k_interrupt_manager.h similarity index 100% rename from src/core/hle/kernel/k_interrupt_manager.h rename to src/kernel/k_interrupt_manager.h diff --git a/src/core/hle/kernel/k_light_condition_variable.cpp b/src/kernel/k_light_condition_variable.cpp similarity index 90% rename from src/core/hle/kernel/k_light_condition_variable.cpp rename to src/kernel/k_light_condition_variable.cpp index 6d5a815aab..c66b4c2dc2 100644 --- a/src/core/hle/kernel/k_light_condition_variable.cpp +++ b/src/kernel/k_light_condition_variable.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/k_light_condition_variable.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h" -#include "core/hle/kernel/k_thread_queue.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/k_light_condition_variable.h" +#include "kernel/k_scheduler.h" +#include "kernel/k_scoped_scheduler_lock_and_sleep.h" +#include "kernel/k_thread_queue.h" +#include "kernel/svc_results.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_light_condition_variable.h b/src/kernel/k_light_condition_variable.h similarity index 93% rename from src/core/hle/kernel/k_light_condition_variable.h rename to src/kernel/k_light_condition_variable.h index ab612426d6..7ec0d422bb 100644 --- a/src/core/hle/kernel/k_light_condition_variable.h +++ b/src/kernel/k_light_condition_variable.h @@ -4,7 +4,7 @@ #pragma once #include "common/common_types.h" -#include "core/hle/kernel/k_thread.h" +#include "kernel/k_thread.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_light_lock.cpp b/src/kernel/k_light_lock.cpp similarity index 95% rename from src/core/hle/kernel/k_light_lock.cpp rename to src/kernel/k_light_lock.cpp index e87ee8b652..f736d30fac 100644 --- a/src/core/hle/kernel/k_light_lock.cpp +++ b/src/kernel/k_light_lock.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/k_light_lock.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/k_thread_queue.h" -#include "core/hle/kernel/kernel.h" +#include "kernel/k_light_lock.h" +#include "kernel/k_scheduler.h" +#include "kernel/k_thread.h" +#include "kernel/k_thread_queue.h" +#include "kernel/kernel.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_light_lock.h b/src/kernel/k_light_lock.h similarity index 94% rename from src/core/hle/kernel/k_light_lock.h rename to src/kernel/k_light_lock.h index 626f57596f..56043dc354 100644 --- a/src/core/hle/kernel/k_light_lock.h +++ b/src/kernel/k_light_lock.h @@ -5,7 +5,7 @@ #include -#include "core/hle/kernel/k_scoped_lock.h" +#include "kernel/k_scoped_lock.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_memory_block.h b/src/kernel/k_memory_block.h similarity index 99% rename from src/core/hle/kernel/k_memory_block.h rename to src/kernel/k_memory_block.h index ef3f61321a..8735aa55e2 100644 --- a/src/core/hle/kernel/k_memory_block.h +++ b/src/kernel/k_memory_block.h @@ -6,9 +6,9 @@ #include "common/alignment.h" #include "common/assert.h" #include "common/intrusive_red_black_tree.h" -#include "core/hle/kernel/k_typed_address.h" -#include "core/hle/kernel/memory_types.h" -#include "core/hle/kernel/svc_types.h" +#include "kernel/k_typed_address.h" +#include "kernel/memory_types.h" +#include "kernel/svc_types.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_memory_block_manager.cpp b/src/kernel/k_memory_block_manager.cpp similarity index 99% rename from src/core/hle/kernel/k_memory_block_manager.cpp rename to src/kernel/k_memory_block_manager.cpp index 58a1e7216b..b19b90baec 100644 --- a/src/core/hle/kernel/k_memory_block_manager.cpp +++ b/src/kernel/k_memory_block_manager.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/k_memory_block_manager.h" +#include "kernel/k_memory_block_manager.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_memory_block_manager.h b/src/kernel/k_memory_block_manager.h similarity index 97% rename from src/core/hle/kernel/k_memory_block_manager.h rename to src/kernel/k_memory_block_manager.h index cb7b6f4305..ad2ba1ce3a 100644 --- a/src/core/hle/kernel/k_memory_block_manager.h +++ b/src/kernel/k_memory_block_manager.h @@ -7,9 +7,9 @@ #include #include "common/common_funcs.h" -#include "core/hle/kernel/k_dynamic_resource_manager.h" -#include "core/hle/kernel/k_memory_block.h" -#include "core/hle/kernel/k_typed_address.h" +#include "kernel/k_dynamic_resource_manager.h" +#include "kernel/k_memory_block.h" +#include "kernel/k_typed_address.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_memory_layout.cpp b/src/kernel/k_memory_layout.cpp similarity index 98% rename from src/core/hle/kernel/k_memory_layout.cpp rename to src/kernel/k_memory_layout.cpp index bec7146688..58089659d7 100644 --- a/src/core/hle/kernel/k_memory_layout.cpp +++ b/src/kernel/k_memory_layout.cpp @@ -4,8 +4,8 @@ #include #include "common/alignment.h" -#include "core/hle/kernel/k_memory_layout.h" -#include "core/hle/kernel/k_system_control.h" +#include "kernel/k_memory_layout.h" +#include "kernel/k_system_control.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_memory_layout.h b/src/kernel/k_memory_layout.h similarity index 98% rename from src/core/hle/kernel/k_memory_layout.h rename to src/kernel/k_memory_layout.h index d7adb31699..a26a3b7802 100644 --- a/src/core/hle/kernel/k_memory_layout.h +++ b/src/kernel/k_memory_layout.h @@ -8,10 +8,10 @@ #include "common/alignment.h" #include "common/literals.h" #include "core/device_memory.h" -#include "core/hle/kernel/k_memory_region.h" -#include "core/hle/kernel/k_memory_region_type.h" -#include "core/hle/kernel/k_typed_address.h" -#include "core/hle/kernel/memory_types.h" +#include "kernel/k_memory_region.h" +#include "kernel/k_memory_region_type.h" +#include "kernel/k_typed_address.h" +#include "kernel/memory_types.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_memory_manager.cpp b/src/kernel/k_memory_manager.cpp similarity index 98% rename from src/core/hle/kernel/k_memory_manager.cpp rename to src/kernel/k_memory_manager.cpp index 0a973ec8ce..f74547f0e1 100644 --- a/src/core/hle/kernel/k_memory_manager.cpp +++ b/src/kernel/k_memory_manager.cpp @@ -8,12 +8,12 @@ #include "common/scope_exit.h" #include "core/core.h" #include "core/device_memory.h" -#include "core/hle/kernel/initial_process.h" -#include "core/hle/kernel/k_memory_manager.h" -#include "core/hle/kernel/k_page_group.h" -#include "core/hle/kernel/k_page_table.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/initial_process.h" +#include "kernel/k_memory_manager.h" +#include "kernel/k_page_group.h" +#include "kernel/k_page_table.h" +#include "kernel/kernel.h" +#include "kernel/svc_results.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_memory_manager.h b/src/kernel/k_memory_manager.h similarity index 98% rename from src/core/hle/kernel/k_memory_manager.h rename to src/kernel/k_memory_manager.h index c5a487af92..93de2cf83b 100644 --- a/src/core/hle/kernel/k_memory_manager.h +++ b/src/kernel/k_memory_manager.h @@ -7,11 +7,11 @@ #include #include "common/common_funcs.h" -#include "core/hle/kernel/k_light_lock.h" -#include "core/hle/kernel/k_memory_layout.h" -#include "core/hle/kernel/k_page_heap.h" -#include "core/hle/kernel/k_typed_address.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/k_light_lock.h" +#include "kernel/k_memory_layout.h" +#include "kernel/k_page_heap.h" +#include "kernel/k_typed_address.h" namespace Core { class System; diff --git a/src/core/hle/kernel/k_memory_region.h b/src/kernel/k_memory_region.h similarity index 99% rename from src/core/hle/kernel/k_memory_region.h rename to src/kernel/k_memory_region.h index e3044f0227..ffe06c3081 100644 --- a/src/core/hle/kernel/k_memory_region.h +++ b/src/kernel/k_memory_region.h @@ -6,8 +6,8 @@ #include "common/assert.h" #include "common/common_funcs.h" #include "common/intrusive_red_black_tree.h" -#include "core/hle/kernel/k_memory_region_type.h" -#include "core/hle/kernel/k_typed_address.h" +#include "kernel/k_memory_region_type.h" +#include "kernel/k_typed_address.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_memory_region_type.h b/src/kernel/k_memory_region_type.h similarity index 99% rename from src/core/hle/kernel/k_memory_region_type.h rename to src/kernel/k_memory_region_type.h index bcbf450f0b..9303d3ce61 100644 --- a/src/core/hle/kernel/k_memory_region_type.h +++ b/src/kernel/k_memory_region_type.h @@ -311,7 +311,7 @@ static_assert(KMemoryRegionType_ArchDeviceBase.GetValue() == 0x5); static_assert(KMemoryRegionType_BoardDeviceBase.GetValue() == 0x5); #if defined(ARCH_ARM64) -#include "core/hle/kernel/arch/arm64/k_memory_region_device_types.inc" +#include "kernel/arch/arm64/k_memory_region_device_types.inc" #elif defined(ARCH_ARM) #error "Unimplemented" #else @@ -321,7 +321,7 @@ constexpr inline auto NumArchitectureDeviceRegions = 0; static_assert(NumArchitectureDeviceRegions >= 0); #if defined(BOARD_NINTENDO_NX) -#include "core/hle/kernel/board/nintendo/nx/k_memory_region_device_types.inc" +#include "kernel/board/nintendo/nx/k_memory_region_device_types.inc" #else // Default to no board devices. constexpr inline auto NumBoardDeviceRegions = 0; diff --git a/src/core/hle/kernel/k_object_name.cpp b/src/kernel/k_object_name.cpp similarity index 98% rename from src/core/hle/kernel/k_object_name.cpp rename to src/kernel/k_object_name.cpp index df3a1c4c56..8350d2b59c 100644 --- a/src/core/hle/kernel/k_object_name.cpp +++ b/src/kernel/k_object_name.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/k_object_name.h" +#include "kernel/k_object_name.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_object_name.h b/src/kernel/k_object_name.h similarity index 95% rename from src/core/hle/kernel/k_object_name.h rename to src/kernel/k_object_name.h index a8876fe370..323f7900d1 100644 --- a/src/core/hle/kernel/k_object_name.h +++ b/src/kernel/k_object_name.h @@ -8,9 +8,9 @@ #include "common/intrusive_list.h" -#include "core/hle/kernel/k_light_lock.h" -#include "core/hle/kernel/slab_helpers.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/k_light_lock.h" +#include "kernel/slab_helpers.h" +#include "kernel/svc_results.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_page_bitmap.h b/src/kernel/k_page_bitmap.h similarity index 99% rename from src/core/hle/kernel/k_page_bitmap.h rename to src/kernel/k_page_bitmap.h index 0ff9877326..e9be872013 100644 --- a/src/core/hle/kernel/k_page_bitmap.h +++ b/src/kernel/k_page_bitmap.h @@ -11,7 +11,7 @@ #include "common/bit_util.h" #include "common/common_types.h" #include "common/tiny_mt.h" -#include "core/hle/kernel/k_system_control.h" +#include "kernel/k_system_control.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_page_buffer.cpp b/src/kernel/k_page_buffer.cpp similarity index 85% rename from src/core/hle/kernel/k_page_buffer.cpp rename to src/kernel/k_page_buffer.cpp index e9830e6d9f..301ad2fca5 100644 --- a/src/core/hle/kernel/k_page_buffer.cpp +++ b/src/kernel/k_page_buffer.cpp @@ -5,8 +5,8 @@ #include "common/assert.h" #include "core/core.h" #include "core/device_memory.h" -#include "core/hle/kernel/k_page_buffer.h" -#include "core/hle/kernel/memory_types.h" +#include "kernel/k_page_buffer.h" +#include "kernel/memory_types.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_page_buffer.h b/src/kernel/k_page_buffer.h similarity index 90% rename from src/core/hle/kernel/k_page_buffer.h rename to src/kernel/k_page_buffer.h index f6a7f1e393..7e22e0effe 100644 --- a/src/core/hle/kernel/k_page_buffer.h +++ b/src/kernel/k_page_buffer.h @@ -6,8 +6,8 @@ #include #include "common/common_types.h" -#include "core/hle/kernel/memory_types.h" -#include "core/hle/kernel/slab_helpers.h" +#include "kernel/memory_types.h" +#include "kernel/slab_helpers.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_page_group.cpp b/src/kernel/k_page_group.cpp similarity index 92% rename from src/core/hle/kernel/k_page_group.cpp rename to src/kernel/k_page_group.cpp index d8c644a336..d84d6a79d4 100644 --- a/src/core/hle/kernel/k_page_group.cpp +++ b/src/kernel/k_page_group.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/k_dynamic_resource_manager.h" -#include "core/hle/kernel/k_memory_manager.h" -#include "core/hle/kernel/k_page_group.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/k_dynamic_resource_manager.h" +#include "kernel/k_memory_manager.h" +#include "kernel/k_page_group.h" +#include "kernel/kernel.h" +#include "kernel/svc_results.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_page_group.h b/src/kernel/k_page_group.h similarity index 98% rename from src/core/hle/kernel/k_page_group.h rename to src/kernel/k_page_group.h index de9d63a8d2..9530430c0a 100644 --- a/src/core/hle/kernel/k_page_group.h +++ b/src/kernel/k_page_group.h @@ -8,8 +8,8 @@ #include "common/alignment.h" #include "common/assert.h" #include "common/common_types.h" -#include "core/hle/kernel/memory_types.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/memory_types.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_page_heap.cpp b/src/kernel/k_page_heap.cpp similarity index 99% rename from src/core/hle/kernel/k_page_heap.cpp rename to src/kernel/k_page_heap.cpp index 95762b5a29..276c645a96 100644 --- a/src/core/hle/kernel/k_page_heap.cpp +++ b/src/kernel/k_page_heap.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/kernel/k_page_heap.h" +#include "kernel/k_page_heap.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_page_heap.h b/src/kernel/k_page_heap.h similarity index 98% rename from src/core/hle/kernel/k_page_heap.h rename to src/kernel/k_page_heap.h index c55225bac6..0a81d873ed 100644 --- a/src/core/hle/kernel/k_page_heap.h +++ b/src/kernel/k_page_heap.h @@ -8,9 +8,9 @@ #include "common/alignment.h" #include "common/common_funcs.h" -#include "core/hle/kernel/k_page_bitmap.h" -#include "core/hle/kernel/k_typed_address.h" -#include "core/hle/kernel/memory_types.h" +#include "kernel/k_page_bitmap.h" +#include "kernel/k_typed_address.h" +#include "kernel/memory_types.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_page_table.h b/src/kernel/k_page_table.h similarity index 87% rename from src/core/hle/kernel/k_page_table.h rename to src/kernel/k_page_table.h index 5541bc13f8..ff02bd850f 100644 --- a/src/core/hle/kernel/k_page_table.h +++ b/src/kernel/k_page_table.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/kernel/k_page_table_base.h" +#include "kernel/k_page_table_base.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_page_table_base.cpp b/src/kernel/k_page_table_base.cpp similarity index 99% rename from src/core/hle/kernel/k_page_table_base.cpp rename to src/kernel/k_page_table_base.cpp index 47dc8fd35c..5dcab66774 100644 --- a/src/core/hle/kernel/k_page_table_base.cpp +++ b/src/kernel/k_page_table_base.cpp @@ -4,10 +4,10 @@ #include "common/scope_exit.h" #include "common/settings.h" #include "core/core.h" -#include "core/hle/kernel/k_address_space_info.h" -#include "core/hle/kernel/k_page_table_base.h" -#include "core/hle/kernel/k_scoped_resource_reservation.h" -#include "core/hle/kernel/k_system_resource.h" +#include "kernel/k_address_space_info.h" +#include "kernel/k_page_table_base.h" +#include "kernel/k_scoped_resource_reservation.h" +#include "kernel/k_system_resource.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_page_table_base.h b/src/kernel/k_page_table_base.h similarity index 98% rename from src/core/hle/kernel/k_page_table_base.h rename to src/kernel/k_page_table_base.h index ee2c41e67b..bd619d0f0d 100644 --- a/src/core/hle/kernel/k_page_table_base.h +++ b/src/kernel/k_page_table_base.h @@ -8,16 +8,16 @@ #include "common/common_funcs.h" #include "common/page_table.h" #include "core/core.h" -#include "core/hle/kernel/k_dynamic_resource_manager.h" -#include "core/hle/kernel/k_light_lock.h" -#include "core/hle/kernel/k_memory_block.h" -#include "core/hle/kernel/k_memory_block_manager.h" -#include "core/hle/kernel/k_memory_layout.h" -#include "core/hle/kernel/k_memory_manager.h" -#include "core/hle/kernel/k_typed_address.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/result.h" #include "core/memory.h" +#include "core/result.h" +#include "kernel/k_dynamic_resource_manager.h" +#include "kernel/k_light_lock.h" +#include "kernel/k_memory_block.h" +#include "kernel/k_memory_block_manager.h" +#include "kernel/k_memory_layout.h" +#include "kernel/k_memory_manager.h" +#include "kernel/k_typed_address.h" +#include "kernel/kernel.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_page_table_manager.h b/src/kernel/k_page_table_manager.h similarity index 89% rename from src/core/hle/kernel/k_page_table_manager.h rename to src/kernel/k_page_table_manager.h index 4b0e034d04..e554c7b320 100644 --- a/src/core/hle/kernel/k_page_table_manager.h +++ b/src/kernel/k_page_table_manager.h @@ -5,9 +5,9 @@ #include -#include "core/hle/kernel/k_dynamic_resource_manager.h" -#include "core/hle/kernel/k_page_table_slab_heap.h" -#include "core/hle/kernel/k_typed_address.h" +#include "kernel/k_dynamic_resource_manager.h" +#include "kernel/k_page_table_slab_heap.h" +#include "kernel/k_typed_address.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_page_table_slab_heap.h b/src/kernel/k_page_table_slab_heap.h similarity index 94% rename from src/core/hle/kernel/k_page_table_slab_heap.h rename to src/kernel/k_page_table_slab_heap.h index 7da0ea669e..7e0b01de3d 100644 --- a/src/core/hle/kernel/k_page_table_slab_heap.h +++ b/src/kernel/k_page_table_slab_heap.h @@ -6,9 +6,9 @@ #include #include -#include "core/hle/kernel/k_dynamic_slab_heap.h" -#include "core/hle/kernel/k_typed_address.h" -#include "core/hle/kernel/slab_helpers.h" +#include "kernel/k_dynamic_slab_heap.h" +#include "kernel/k_typed_address.h" +#include "kernel/slab_helpers.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_port.cpp b/src/kernel/k_port.cpp similarity index 92% rename from src/core/hle/kernel/k_port.cpp rename to src/kernel/k_port.cpp index 1621ca1d38..1341300bfb 100644 --- a/src/core/hle/kernel/k_port.cpp +++ b/src/kernel/k_port.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/k_port.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/k_port.h" +#include "kernel/k_scheduler.h" +#include "kernel/svc_results.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_port.h b/src/kernel/k_port.h similarity index 89% rename from src/core/hle/kernel/k_port.h rename to src/kernel/k_port.h index 991be27ab9..e4fc0f7f21 100644 --- a/src/core/hle/kernel/k_port.h +++ b/src/kernel/k_port.h @@ -6,10 +6,10 @@ #include #include "common/common_types.h" -#include "core/hle/kernel/k_client_port.h" -#include "core/hle/kernel/k_server_port.h" -#include "core/hle/kernel/slab_helpers.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/k_client_port.h" +#include "kernel/k_server_port.h" +#include "kernel/slab_helpers.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_priority_queue.h b/src/kernel/k_priority_queue.h similarity index 100% rename from src/core/hle/kernel/k_priority_queue.h rename to src/kernel/k_priority_queue.h diff --git a/src/core/hle/kernel/k_process.cpp b/src/kernel/k_process.cpp similarity index 99% rename from src/core/hle/kernel/k_process.cpp rename to src/kernel/k_process.cpp index 3cfb414e5d..42b812a5c7 100644 --- a/src/core/hle/kernel/k_process.cpp +++ b/src/kernel/k_process.cpp @@ -5,13 +5,13 @@ #include "common/scope_exit.h" #include "common/settings.h" #include "core/core.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_scoped_resource_reservation.h" -#include "core/hle/kernel/k_shared_memory.h" -#include "core/hle/kernel/k_shared_memory_info.h" -#include "core/hle/kernel/k_thread_local_page.h" -#include "core/hle/kernel/k_thread_queue.h" -#include "core/hle/kernel/k_worker_task_manager.h" +#include "kernel/k_process.h" +#include "kernel/k_scoped_resource_reservation.h" +#include "kernel/k_shared_memory.h" +#include "kernel/k_shared_memory_info.h" +#include "kernel/k_thread_local_page.h" +#include "kernel/k_thread_queue.h" +#include "kernel/k_worker_task_manager.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_process.h b/src/kernel/k_process.h similarity index 97% rename from src/core/hle/kernel/k_process.h rename to src/kernel/k_process.h index 8339465fd8..f627f7494a 100644 --- a/src/core/hle/kernel/k_process.h +++ b/src/kernel/k_process.h @@ -6,16 +6,16 @@ #include #include "core/file_sys/program_metadata.h" -#include "core/hle/kernel/code_set.h" -#include "core/hle/kernel/k_address_arbiter.h" -#include "core/hle/kernel/k_capabilities.h" -#include "core/hle/kernel/k_condition_variable.h" -#include "core/hle/kernel/k_handle_table.h" -#include "core/hle/kernel/k_page_table_manager.h" -#include "core/hle/kernel/k_process_page_table.h" -#include "core/hle/kernel/k_system_resource.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/k_thread_local_page.h" +#include "kernel/code_set.h" +#include "kernel/k_address_arbiter.h" +#include "kernel/k_capabilities.h" +#include "kernel/k_condition_variable.h" +#include "kernel/k_handle_table.h" +#include "kernel/k_page_table_manager.h" +#include "kernel/k_process_page_table.h" +#include "kernel/k_system_resource.h" +#include "kernel/k_thread.h" +#include "kernel/k_thread_local_page.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_process_page_table.h b/src/kernel/k_process_page_table.h similarity index 99% rename from src/core/hle/kernel/k_process_page_table.h rename to src/kernel/k_process_page_table.h index b7ae5abd01..8d60f52ca5 100644 --- a/src/core/hle/kernel/k_process_page_table.h +++ b/src/kernel/k_process_page_table.h @@ -3,9 +3,9 @@ #pragma once -#include "core/hle/kernel/k_page_table.h" -#include "core/hle/kernel/k_scoped_lock.h" -#include "core/hle/kernel/svc_types.h" +#include "kernel/k_page_table.h" +#include "kernel/k_scoped_lock.h" +#include "kernel/svc_types.h" namespace Core { class ARM_Interface; diff --git a/src/core/hle/kernel/k_readable_event.cpp b/src/kernel/k_readable_event.cpp similarity index 84% rename from src/core/hle/kernel/k_readable_event.cpp rename to src/kernel/k_readable_event.cpp index c30662666b..50357f988c 100644 --- a/src/core/hle/kernel/k_readable_event.cpp +++ b/src/kernel/k_readable_event.cpp @@ -2,12 +2,12 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/assert.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/k_event.h" +#include "kernel/k_readable_event.h" +#include "kernel/k_scheduler.h" +#include "kernel/k_thread.h" +#include "kernel/kernel.h" +#include "kernel/svc_results.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_readable_event.h b/src/kernel/k_readable_event.h similarity index 80% rename from src/core/hle/kernel/k_readable_event.h rename to src/kernel/k_readable_event.h index d2ec363233..9b697bdd0a 100644 --- a/src/core/hle/kernel/k_readable_event.h +++ b/src/kernel/k_readable_event.h @@ -3,10 +3,10 @@ #pragma once -#include "core/hle/kernel/k_auto_object.h" -#include "core/hle/kernel/k_synchronization_object.h" -#include "core/hle/kernel/slab_helpers.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/k_auto_object.h" +#include "kernel/k_synchronization_object.h" +#include "kernel/slab_helpers.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_resource_limit.cpp b/src/kernel/k_resource_limit.cpp similarity index 97% rename from src/core/hle/kernel/k_resource_limit.cpp rename to src/kernel/k_resource_limit.cpp index d8a63aaf8c..ed6bf9f292 100644 --- a/src/core/hle/kernel/k_resource_limit.cpp +++ b/src/kernel/k_resource_limit.cpp @@ -5,9 +5,9 @@ #include "common/overflow.h" #include "core/core.h" #include "core/core_timing.h" -#include "core/hle/kernel/k_hardware_timer.h" -#include "core/hle/kernel/k_resource_limit.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/k_hardware_timer.h" +#include "kernel/k_resource_limit.h" +#include "kernel/svc_results.h" namespace Kernel { constexpr s64 DefaultTimeout = 10000000000; // 10 seconds diff --git a/src/core/hle/kernel/k_resource_limit.h b/src/kernel/k_resource_limit.h similarity index 94% rename from src/core/hle/kernel/k_resource_limit.h rename to src/kernel/k_resource_limit.h index b733ec8f81..b380d47bf3 100644 --- a/src/core/hle/kernel/k_resource_limit.h +++ b/src/kernel/k_resource_limit.h @@ -5,8 +5,8 @@ #include #include "common/common_types.h" -#include "core/hle/kernel/k_light_condition_variable.h" -#include "core/hle/kernel/k_light_lock.h" +#include "kernel/k_light_condition_variable.h" +#include "kernel/k_light_lock.h" union Result; diff --git a/src/core/hle/kernel/k_scheduler.cpp b/src/kernel/k_scheduler.cpp similarity index 99% rename from src/core/hle/kernel/k_scheduler.cpp rename to src/kernel/k_scheduler.cpp index 1bce63a560..3a50ba736e 100644 --- a/src/core/hle/kernel/k_scheduler.cpp +++ b/src/kernel/k_scheduler.cpp @@ -11,13 +11,13 @@ #include "core/core.h" #include "core/core_timing.h" #include "core/cpu_manager.h" -#include "core/hle/kernel/k_interrupt_manager.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/physical_core.h" +#include "kernel/k_interrupt_manager.h" +#include "kernel/k_process.h" +#include "kernel/k_scheduler.h" +#include "kernel/k_scoped_scheduler_lock_and_sleep.h" +#include "kernel/k_thread.h" +#include "kernel/kernel.h" +#include "kernel/physical_core.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_scheduler.h b/src/kernel/k_scheduler.h similarity index 94% rename from src/core/hle/kernel/k_scheduler.h rename to src/kernel/k_scheduler.h index d85a0c0408..9410cf45c5 100644 --- a/src/core/hle/kernel/k_scheduler.h +++ b/src/kernel/k_scheduler.h @@ -6,12 +6,12 @@ #include #include "common/common_types.h" -#include "core/hle/kernel/global_scheduler_context.h" -#include "core/hle/kernel/k_priority_queue.h" -#include "core/hle/kernel/k_scheduler_lock.h" -#include "core/hle/kernel/k_scoped_lock.h" -#include "core/hle/kernel/k_spin_lock.h" -#include "core/hle/kernel/k_thread.h" +#include "kernel/global_scheduler_context.h" +#include "kernel/k_priority_queue.h" +#include "kernel/k_scheduler_lock.h" +#include "kernel/k_scoped_lock.h" +#include "kernel/k_spin_lock.h" +#include "kernel/k_thread.h" namespace Common { class Fiber; diff --git a/src/core/hle/kernel/k_scheduler_lock.h b/src/kernel/k_scheduler_lock.h similarity index 91% rename from src/core/hle/kernel/k_scheduler_lock.h rename to src/kernel/k_scheduler_lock.h index caa1404f17..d01760831c 100644 --- a/src/core/hle/kernel/k_scheduler_lock.h +++ b/src/kernel/k_scheduler_lock.h @@ -5,11 +5,11 @@ #include #include "common/assert.h" -#include "core/hle/kernel/k_interrupt_manager.h" -#include "core/hle/kernel/k_spin_lock.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/physical_core.h" +#include "kernel/k_interrupt_manager.h" +#include "kernel/k_spin_lock.h" +#include "kernel/k_thread.h" +#include "kernel/kernel.h" +#include "kernel/physical_core.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_scoped_lock.h b/src/kernel/k_scoped_lock.h similarity index 100% rename from src/core/hle/kernel/k_scoped_lock.h rename to src/kernel/k_scoped_lock.h diff --git a/src/core/hle/kernel/k_scoped_resource_reservation.h b/src/kernel/k_scoped_resource_reservation.h similarity index 95% rename from src/core/hle/kernel/k_scoped_resource_reservation.h rename to src/kernel/k_scoped_resource_reservation.h index 2cc464612a..b4d8d45d19 100644 --- a/src/core/hle/kernel/k_scoped_resource_reservation.h +++ b/src/kernel/k_scoped_resource_reservation.h @@ -4,8 +4,8 @@ #pragma once #include "common/common_types.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_resource_limit.h" +#include "kernel/k_process.h" +#include "kernel/k_resource_limit.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h b/src/kernel/k_scoped_scheduler_lock_and_sleep.h similarity index 87% rename from src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h rename to src/kernel/k_scoped_scheduler_lock_and_sleep.h index b62415da70..d673d92f4d 100644 --- a/src/core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h +++ b/src/kernel/k_scoped_scheduler_lock_and_sleep.h @@ -4,10 +4,10 @@ #pragma once #include "common/common_types.h" -#include "core/hle/kernel/global_scheduler_context.h" -#include "core/hle/kernel/k_hardware_timer.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/kernel.h" +#include "kernel/global_scheduler_context.h" +#include "kernel/k_hardware_timer.h" +#include "kernel/k_thread.h" +#include "kernel/kernel.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_server_port.cpp b/src/kernel/k_server_port.cpp similarity index 90% rename from src/core/hle/kernel/k_server_port.cpp rename to src/kernel/k_server_port.cpp index a29d34bc1f..647b8d4f2b 100644 --- a/src/core/hle/kernel/k_server_port.cpp +++ b/src/kernel/k_server_port.cpp @@ -3,12 +3,12 @@ #include #include "common/assert.h" -#include "core/hle/kernel/k_client_port.h" -#include "core/hle/kernel/k_port.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_server_port.h" -#include "core/hle/kernel/k_server_session.h" -#include "core/hle/kernel/k_thread.h" +#include "kernel/k_client_port.h" +#include "kernel/k_port.h" +#include "kernel/k_scheduler.h" +#include "kernel/k_server_port.h" +#include "kernel/k_server_session.h" +#include "kernel/k_thread.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_server_port.h b/src/kernel/k_server_port.h similarity index 91% rename from src/core/hle/kernel/k_server_port.h rename to src/kernel/k_server_port.h index 625280290b..0b6ff5fccd 100644 --- a/src/core/hle/kernel/k_server_port.h +++ b/src/kernel/k_server_port.h @@ -9,8 +9,8 @@ #include "common/intrusive_list.h" -#include "core/hle/kernel/k_server_session.h" -#include "core/hle/kernel/k_synchronization_object.h" +#include "kernel/k_server_session.h" +#include "kernel/k_synchronization_object.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_server_session.cpp b/src/kernel/k_server_session.cpp similarity index 97% rename from src/core/hle/kernel/k_server_session.cpp rename to src/kernel/k_server_session.cpp index 3ea653163b..3d07603184 100644 --- a/src/core/hle/kernel/k_server_session.cpp +++ b/src/kernel/k_server_session.cpp @@ -10,20 +10,20 @@ #include "common/scope_exit.h" #include "core/core.h" #include "core/core_timing.h" -#include "core/hle/kernel/k_client_port.h" -#include "core/hle/kernel/k_handle_table.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_server_port.h" -#include "core/hle/kernel/k_server_session.h" -#include "core/hle/kernel/k_session.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/k_thread_queue.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/message_buffer.h" -#include "core/hle/service/hle_ipc.h" -#include "core/hle/service/ipc_helpers.h" #include "core/memory.h" +#include "kernel/k_client_port.h" +#include "kernel/k_handle_table.h" +#include "kernel/k_process.h" +#include "kernel/k_scheduler.h" +#include "kernel/k_server_port.h" +#include "kernel/k_server_session.h" +#include "kernel/k_session.h" +#include "kernel/k_thread.h" +#include "kernel/k_thread_queue.h" +#include "kernel/kernel.h" +#include "kernel/message_buffer.h" +#include "service/hle_ipc.h" +#include "service/ipc_helpers.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_server_session.h b/src/kernel/k_server_session.h similarity index 91% rename from src/core/hle/kernel/k_server_session.h rename to src/kernel/k_server_session.h index 4038919194..747ab78f1a 100644 --- a/src/core/hle/kernel/k_server_session.h +++ b/src/kernel/k_server_session.h @@ -10,10 +10,10 @@ #include "common/intrusive_list.h" -#include "core/hle/kernel/k_light_lock.h" -#include "core/hle/kernel/k_session_request.h" -#include "core/hle/kernel/k_synchronization_object.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/k_light_lock.h" +#include "kernel/k_session_request.h" +#include "kernel/k_synchronization_object.h" namespace Service { class HLERequestContext; diff --git a/src/core/hle/kernel/k_session.cpp b/src/kernel/k_session.cpp similarity index 89% rename from src/core/hle/kernel/k_session.cpp rename to src/kernel/k_session.cpp index 44d7a8f028..1fc4933b77 100644 --- a/src/core/hle/kernel/k_session.cpp +++ b/src/kernel/k_session.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/k_client_port.h" -#include "core/hle/kernel/k_client_session.h" -#include "core/hle/kernel/k_scoped_resource_reservation.h" -#include "core/hle/kernel/k_server_session.h" -#include "core/hle/kernel/k_session.h" +#include "kernel/k_client_port.h" +#include "kernel/k_client_session.h" +#include "kernel/k_scoped_resource_reservation.h" +#include "kernel/k_server_session.h" +#include "kernel/k_session.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_session.h b/src/kernel/k_session.h similarity index 93% rename from src/core/hle/kernel/k_session.h rename to src/kernel/k_session.h index f69bab0888..f5d72a9222 100644 --- a/src/core/hle/kernel/k_session.h +++ b/src/kernel/k_session.h @@ -6,9 +6,9 @@ #include #include -#include "core/hle/kernel/k_client_session.h" -#include "core/hle/kernel/k_server_session.h" -#include "core/hle/kernel/slab_helpers.h" +#include "kernel/k_client_session.h" +#include "kernel/k_server_session.h" +#include "kernel/slab_helpers.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_session_request.cpp b/src/kernel/k_session_request.cpp similarity index 96% rename from src/core/hle/kernel/k_session_request.cpp rename to src/kernel/k_session_request.cpp index 9a69b4ffc1..7745d76dc5 100644 --- a/src/core/hle/kernel/k_session_request.cpp +++ b/src/kernel/k_session_request.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/k_page_buffer.h" -#include "core/hle/kernel/k_session_request.h" +#include "kernel/k_page_buffer.h" +#include "kernel/k_session_request.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_session_request.h b/src/kernel/k_session_request.h similarity index 97% rename from src/core/hle/kernel/k_session_request.h rename to src/kernel/k_session_request.h index 283669e0ac..cdbc624a64 100644 --- a/src/core/hle/kernel/k_session_request.h +++ b/src/kernel/k_session_request.h @@ -7,12 +7,12 @@ #include "common/intrusive_list.h" -#include "core/hle/kernel/k_auto_object.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_memory_block.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/slab_helpers.h" +#include "kernel/k_auto_object.h" +#include "kernel/k_event.h" +#include "kernel/k_memory_block.h" +#include "kernel/k_process.h" +#include "kernel/k_thread.h" +#include "kernel/slab_helpers.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_shared_memory.cpp b/src/kernel/k_shared_memory.cpp similarity index 93% rename from src/core/hle/kernel/k_shared_memory.cpp rename to src/kernel/k_shared_memory.cpp index f713968f68..e48ef793af 100644 --- a/src/core/hle/kernel/k_shared_memory.cpp +++ b/src/kernel/k_shared_memory.cpp @@ -3,12 +3,12 @@ #include "common/assert.h" #include "core/core.h" -#include "core/hle/kernel/k_page_table.h" -#include "core/hle/kernel/k_scoped_resource_reservation.h" -#include "core/hle/kernel/k_shared_memory.h" -#include "core/hle/kernel/k_system_resource.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/k_page_table.h" +#include "kernel/k_scoped_resource_reservation.h" +#include "kernel/k_shared_memory.h" +#include "kernel/k_system_resource.h" +#include "kernel/kernel.h" +#include "kernel/svc_results.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_shared_memory.h b/src/kernel/k_shared_memory.h similarity index 92% rename from src/core/hle/kernel/k_shared_memory.h rename to src/kernel/k_shared_memory.h index 54b23d7ac2..4522b1bd7a 100644 --- a/src/core/hle/kernel/k_shared_memory.h +++ b/src/kernel/k_shared_memory.h @@ -7,12 +7,12 @@ #include #include "core/device_memory.h" -#include "core/hle/kernel/k_memory_block.h" -#include "core/hle/kernel/k_page_group.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_typed_address.h" -#include "core/hle/kernel/slab_helpers.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/k_memory_block.h" +#include "kernel/k_page_group.h" +#include "kernel/k_process.h" +#include "kernel/k_typed_address.h" +#include "kernel/slab_helpers.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_shared_memory_info.h b/src/kernel/k_shared_memory_info.h similarity index 95% rename from src/core/hle/kernel/k_shared_memory_info.h rename to src/kernel/k_shared_memory_info.h index 2d8ff20d6d..8e8e7e5435 100644 --- a/src/core/hle/kernel/k_shared_memory_info.h +++ b/src/kernel/k_shared_memory_info.h @@ -5,7 +5,7 @@ #include "common/intrusive_list.h" -#include "core/hle/kernel/slab_helpers.h" +#include "kernel/slab_helpers.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_slab_heap.h b/src/kernel/k_slab_heap.h similarity index 100% rename from src/core/hle/kernel/k_slab_heap.h rename to src/kernel/k_slab_heap.h diff --git a/src/core/hle/kernel/k_spin_lock.cpp b/src/kernel/k_spin_lock.cpp similarity index 88% rename from src/core/hle/kernel/k_spin_lock.cpp rename to src/kernel/k_spin_lock.cpp index 8525320374..ea41605281 100644 --- a/src/core/hle/kernel/k_spin_lock.cpp +++ b/src/kernel/k_spin_lock.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/k_spin_lock.h" +#include "kernel/k_spin_lock.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_spin_lock.h b/src/kernel/k_spin_lock.h similarity index 94% rename from src/core/hle/kernel/k_spin_lock.h rename to src/kernel/k_spin_lock.h index 094a1e6be0..d62d038527 100644 --- a/src/core/hle/kernel/k_spin_lock.h +++ b/src/kernel/k_spin_lock.h @@ -6,7 +6,7 @@ #include #include "common/common_funcs.h" -#include "core/hle/kernel/k_scoped_lock.h" +#include "kernel/k_scoped_lock.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_synchronization_object.cpp b/src/kernel/k_synchronization_object.cpp similarity index 94% rename from src/core/hle/kernel/k_synchronization_object.cpp rename to src/kernel/k_synchronization_object.cpp index 3e5b735b1e..3c56b525f8 100644 --- a/src/core/hle/kernel/k_synchronization_object.cpp +++ b/src/kernel/k_synchronization_object.cpp @@ -4,13 +4,13 @@ #include "common/assert.h" #include "common/common_types.h" #include "common/scratch_buffer.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h" -#include "core/hle/kernel/k_synchronization_object.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/k_thread_queue.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/k_scheduler.h" +#include "kernel/k_scoped_scheduler_lock_and_sleep.h" +#include "kernel/k_synchronization_object.h" +#include "kernel/k_thread.h" +#include "kernel/k_thread_queue.h" +#include "kernel/kernel.h" +#include "kernel/svc_results.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_synchronization_object.h b/src/kernel/k_synchronization_object.h similarity index 96% rename from src/core/hle/kernel/k_synchronization_object.h rename to src/kernel/k_synchronization_object.h index d55a2673df..8ea67af34a 100644 --- a/src/core/hle/kernel/k_synchronization_object.h +++ b/src/kernel/k_synchronization_object.h @@ -5,8 +5,8 @@ #include -#include "core/hle/kernel/k_auto_object.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/k_auto_object.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_system_control.h b/src/kernel/k_system_control.h similarity index 84% rename from src/core/hle/kernel/k_system_control.h rename to src/kernel/k_system_control.h index b8292e9d0d..6dda65c489 100644 --- a/src/core/hle/kernel/k_system_control.h +++ b/src/kernel/k_system_control.h @@ -9,7 +9,7 @@ #ifdef BOARD_NINTENDO_NX -#include "core/hle/kernel/board/nintendo/nx/k_system_control.h" +#include "kernel/board/nintendo/nx/k_system_control.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_system_resource.cpp b/src/kernel/k_system_resource.cpp similarity index 97% rename from src/core/hle/kernel/k_system_resource.cpp rename to src/kernel/k_system_resource.cpp index b51941faf4..38f01253b8 100644 --- a/src/core/hle/kernel/k_system_resource.cpp +++ b/src/kernel/k_system_resource.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/kernel/k_scoped_resource_reservation.h" -#include "core/hle/kernel/k_system_resource.h" +#include "kernel/k_scoped_resource_reservation.h" +#include "kernel/k_system_resource.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_system_resource.h b/src/kernel/k_system_resource.h similarity index 93% rename from src/core/hle/kernel/k_system_resource.h rename to src/kernel/k_system_resource.h index 6ea4821858..252f3c3acd 100644 --- a/src/core/hle/kernel/k_system_resource.h +++ b/src/kernel/k_system_resource.h @@ -5,12 +5,12 @@ #include "common/assert.h" #include "common/common_types.h" -#include "core/hle/kernel/k_auto_object.h" -#include "core/hle/kernel/k_dynamic_resource_manager.h" -#include "core/hle/kernel/k_memory_manager.h" -#include "core/hle/kernel/k_page_table_manager.h" -#include "core/hle/kernel/k_resource_limit.h" -#include "core/hle/kernel/slab_helpers.h" +#include "kernel/k_auto_object.h" +#include "kernel/k_dynamic_resource_manager.h" +#include "kernel/k_memory_manager.h" +#include "kernel/k_page_table_manager.h" +#include "kernel/k_resource_limit.h" +#include "kernel/slab_helpers.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_thread.cpp b/src/kernel/k_thread.cpp similarity index 98% rename from src/core/hle/kernel/k_thread.cpp rename to src/kernel/k_thread.cpp index a6deb50ec9..d1cd5ad2fa 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/kernel/k_thread.cpp @@ -19,23 +19,23 @@ #include "core/core.h" #include "core/cpu_manager.h" #include "core/hardware_properties.h" -#include "core/hle/kernel/k_condition_variable.h" -#include "core/hle/kernel/k_handle_table.h" -#include "core/hle/kernel/k_memory_layout.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_resource_limit.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h" -#include "core/hle/kernel/k_system_control.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/k_thread_queue.h" -#include "core/hle/kernel/k_worker_task_manager.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_results.h" -#include "core/hle/kernel/svc_types.h" -#include "core/hle/result.h" #include "core/memory.h" +#include "core/result.h" +#include "kernel/k_condition_variable.h" +#include "kernel/k_handle_table.h" +#include "kernel/k_memory_layout.h" +#include "kernel/k_process.h" +#include "kernel/k_resource_limit.h" +#include "kernel/k_scheduler.h" +#include "kernel/k_scoped_scheduler_lock_and_sleep.h" +#include "kernel/k_system_control.h" +#include "kernel/k_thread.h" +#include "kernel/k_thread_queue.h" +#include "kernel/k_worker_task_manager.h" +#include "kernel/kernel.h" +#include "kernel/svc.h" +#include "kernel/svc_results.h" +#include "kernel/svc_types.h" namespace { diff --git a/src/core/hle/kernel/k_thread.h b/src/kernel/k_thread.h similarity index 98% rename from src/core/hle/kernel/k_thread.h rename to src/kernel/k_thread.h index e1f80b04f4..545c0529e1 100644 --- a/src/core/hle/kernel/k_thread.h +++ b/src/kernel/k_thread.h @@ -18,17 +18,17 @@ #include "common/scratch_buffer.h" #include "common/spin_lock.h" #include "core/arm/arm_interface.h" -#include "core/hle/kernel/k_affinity_mask.h" -#include "core/hle/kernel/k_light_lock.h" -#include "core/hle/kernel/k_spin_lock.h" -#include "core/hle/kernel/k_synchronization_object.h" -#include "core/hle/kernel/k_timer_task.h" -#include "core/hle/kernel/k_typed_address.h" -#include "core/hle/kernel/k_worker_task.h" -#include "core/hle/kernel/slab_helpers.h" -#include "core/hle/kernel/svc_common.h" -#include "core/hle/kernel/svc_types.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/k_affinity_mask.h" +#include "kernel/k_light_lock.h" +#include "kernel/k_spin_lock.h" +#include "kernel/k_synchronization_object.h" +#include "kernel/k_timer_task.h" +#include "kernel/k_typed_address.h" +#include "kernel/k_worker_task.h" +#include "kernel/slab_helpers.h" +#include "kernel/svc_common.h" +#include "kernel/svc_types.h" namespace Common { class Fiber; diff --git a/src/core/hle/kernel/k_thread_local_page.cpp b/src/kernel/k_thread_local_page.cpp similarity index 88% rename from src/core/hle/kernel/k_thread_local_page.cpp rename to src/kernel/k_thread_local_page.cpp index a632d16349..fe31b0dee2 100644 --- a/src/core/hle/kernel/k_thread_local_page.cpp +++ b/src/kernel/k_thread_local_page.cpp @@ -4,12 +4,12 @@ #include "common/scope_exit.h" #include "core/core.h" -#include "core/hle/kernel/k_memory_block.h" -#include "core/hle/kernel/k_page_buffer.h" -#include "core/hle/kernel/k_page_table.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_thread_local_page.h" -#include "core/hle/kernel/kernel.h" +#include "kernel/k_memory_block.h" +#include "kernel/k_page_buffer.h" +#include "kernel/k_page_table.h" +#include "kernel/k_process.h" +#include "kernel/k_thread_local_page.h" +#include "kernel/kernel.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_thread_local_page.h b/src/kernel/k_thread_local_page.h similarity index 96% rename from src/core/hle/kernel/k_thread_local_page.h rename to src/kernel/k_thread_local_page.h index 813f32a7ef..515f86663e 100644 --- a/src/core/hle/kernel/k_thread_local_page.h +++ b/src/kernel/k_thread_local_page.h @@ -11,9 +11,9 @@ #include "common/common_types.h" #include "common/intrusive_red_black_tree.h" #include "common/polyfill_ranges.h" -#include "core/hle/kernel/memory_types.h" -#include "core/hle/kernel/slab_helpers.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/memory_types.h" +#include "kernel/slab_helpers.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_thread_queue.cpp b/src/kernel/k_thread_queue.cpp similarity index 91% rename from src/core/hle/kernel/k_thread_queue.cpp rename to src/kernel/k_thread_queue.cpp index 61488f4ce6..86dfdb1aae 100644 --- a/src/core/hle/kernel/k_thread_queue.cpp +++ b/src/kernel/k_thread_queue.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/k_hardware_timer.h" -#include "core/hle/kernel/k_thread_queue.h" -#include "core/hle/kernel/kernel.h" +#include "kernel/k_hardware_timer.h" +#include "kernel/k_thread_queue.h" +#include "kernel/kernel.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_thread_queue.h b/src/kernel/k_thread_queue.h similarity index 93% rename from src/core/hle/kernel/k_thread_queue.h rename to src/kernel/k_thread_queue.h index 117af0919a..1f2a9ed29a 100644 --- a/src/core/hle/kernel/k_thread_queue.h +++ b/src/kernel/k_thread_queue.h @@ -3,8 +3,8 @@ #pragma once -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_thread.h" +#include "kernel/k_scheduler.h" +#include "kernel/k_thread.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_timer_task.h b/src/kernel/k_timer_task.h similarity index 100% rename from src/core/hle/kernel/k_timer_task.h rename to src/kernel/k_timer_task.h diff --git a/src/core/hle/kernel/k_trace.h b/src/kernel/k_trace.h similarity index 100% rename from src/core/hle/kernel/k_trace.h rename to src/kernel/k_trace.h diff --git a/src/core/hle/kernel/k_transfer_memory.cpp b/src/kernel/k_transfer_memory.cpp similarity index 95% rename from src/core/hle/kernel/k_transfer_memory.cpp rename to src/kernel/k_transfer_memory.cpp index 0e2e11743b..7c651692a2 100644 --- a/src/core/hle/kernel/k_transfer_memory.cpp +++ b/src/kernel/k_transfer_memory.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/scope_exit.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_resource_limit.h" -#include "core/hle/kernel/k_transfer_memory.h" -#include "core/hle/kernel/kernel.h" +#include "kernel/k_process.h" +#include "kernel/k_resource_limit.h" +#include "kernel/k_transfer_memory.h" +#include "kernel/kernel.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_transfer_memory.h b/src/kernel/k_transfer_memory.h similarity index 90% rename from src/core/hle/kernel/k_transfer_memory.h rename to src/kernel/k_transfer_memory.h index 8a0b08761c..0ae27b2845 100644 --- a/src/core/hle/kernel/k_transfer_memory.h +++ b/src/kernel/k_transfer_memory.h @@ -5,10 +5,10 @@ #include -#include "core/hle/kernel/k_page_group.h" -#include "core/hle/kernel/slab_helpers.h" -#include "core/hle/kernel/svc_types.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/k_page_group.h" +#include "kernel/slab_helpers.h" +#include "kernel/svc_types.h" union Result; diff --git a/src/core/hle/kernel/k_typed_address.h b/src/kernel/k_typed_address.h similarity index 100% rename from src/core/hle/kernel/k_typed_address.h rename to src/kernel/k_typed_address.h diff --git a/src/core/hle/kernel/k_worker_task.h b/src/kernel/k_worker_task.h similarity index 84% rename from src/core/hle/kernel/k_worker_task.h rename to src/kernel/k_worker_task.h index 9a230c03c4..83a4239609 100644 --- a/src/core/hle/kernel/k_worker_task.h +++ b/src/kernel/k_worker_task.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/kernel/k_synchronization_object.h" +#include "kernel/k_synchronization_object.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_worker_task_manager.cpp b/src/kernel/k_worker_task_manager.cpp similarity index 83% rename from src/core/hle/kernel/k_worker_task_manager.cpp rename to src/kernel/k_worker_task_manager.cpp index 8ead395911..e17418cae7 100644 --- a/src/core/hle/kernel/k_worker_task_manager.cpp +++ b/src/kernel/k_worker_task_manager.cpp @@ -2,11 +2,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/assert.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/k_worker_task.h" -#include "core/hle/kernel/k_worker_task_manager.h" -#include "core/hle/kernel/kernel.h" +#include "kernel/k_process.h" +#include "kernel/k_thread.h" +#include "kernel/k_worker_task.h" +#include "kernel/k_worker_task_manager.h" +#include "kernel/kernel.h" namespace Kernel { diff --git a/src/core/hle/kernel/k_worker_task_manager.h b/src/kernel/k_worker_task_manager.h similarity index 100% rename from src/core/hle/kernel/k_worker_task_manager.h rename to src/kernel/k_worker_task_manager.h diff --git a/src/core/hle/kernel/kernel.cpp b/src/kernel/kernel.cpp similarity index 98% rename from src/core/hle/kernel/kernel.cpp rename to src/kernel/kernel.cpp index 4a1559291c..e2556ced0c 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/kernel/kernel.cpp @@ -22,29 +22,29 @@ #include "core/core_timing.h" #include "core/cpu_manager.h" #include "core/hardware_properties.h" -#include "core/hle/kernel/init/init_slab_setup.h" -#include "core/hle/kernel/k_client_port.h" -#include "core/hle/kernel/k_dynamic_resource_manager.h" -#include "core/hle/kernel/k_handle_table.h" -#include "core/hle/kernel/k_hardware_timer.h" -#include "core/hle/kernel/k_memory_layout.h" -#include "core/hle/kernel/k_memory_manager.h" -#include "core/hle/kernel/k_object_name.h" -#include "core/hle/kernel/k_page_buffer.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_resource_limit.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_scoped_resource_reservation.h" -#include "core/hle/kernel/k_shared_memory.h" -#include "core/hle/kernel/k_system_resource.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/k_worker_task_manager.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/physical_core.h" -#include "core/hle/result.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/sm/sm.h" #include "core/memory.h" +#include "core/result.h" +#include "kernel/init/init_slab_setup.h" +#include "kernel/k_client_port.h" +#include "kernel/k_dynamic_resource_manager.h" +#include "kernel/k_handle_table.h" +#include "kernel/k_hardware_timer.h" +#include "kernel/k_memory_layout.h" +#include "kernel/k_memory_manager.h" +#include "kernel/k_object_name.h" +#include "kernel/k_page_buffer.h" +#include "kernel/k_process.h" +#include "kernel/k_resource_limit.h" +#include "kernel/k_scheduler.h" +#include "kernel/k_scoped_resource_reservation.h" +#include "kernel/k_shared_memory.h" +#include "kernel/k_system_resource.h" +#include "kernel/k_thread.h" +#include "kernel/k_worker_task_manager.h" +#include "kernel/kernel.h" +#include "kernel/physical_core.h" +#include "service/server_manager.h" +#include "service/sm/sm.h" MICROPROFILE_DEFINE(Kernel_SVC, "Kernel", "SVC", MP_RGB(70, 200, 70)); diff --git a/src/core/hle/kernel/kernel.h b/src/kernel/kernel.h similarity index 98% rename from src/core/hle/kernel/kernel.h rename to src/kernel/kernel.h index d8086c0ea1..64dffee99f 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/kernel/kernel.h @@ -12,10 +12,10 @@ #include "common/polyfill_thread.h" #include "core/hardware_properties.h" -#include "core/hle/kernel/k_auto_object.h" -#include "core/hle/kernel/k_slab_heap.h" -#include "core/hle/kernel/k_typed_address.h" -#include "core/hle/kernel/svc_common.h" +#include "kernel/k_auto_object.h" +#include "kernel/k_slab_heap.h" +#include "kernel/k_typed_address.h" +#include "kernel/svc_common.h" namespace Core { class ExclusiveMonitor; diff --git a/src/core/hle/kernel/memory_types.h b/src/kernel/memory_types.h similarity index 88% rename from src/core/hle/kernel/memory_types.h rename to src/kernel/memory_types.h index 18de675cc1..62a942a5fe 100644 --- a/src/core/hle/kernel/memory_types.h +++ b/src/kernel/memory_types.h @@ -6,7 +6,7 @@ #include #include "common/common_types.h" -#include "core/hle/kernel/k_typed_address.h" +#include "kernel/k_typed_address.h" namespace Kernel { diff --git a/src/core/hle/kernel/message_buffer.h b/src/kernel/message_buffer.h similarity index 99% rename from src/core/hle/kernel/message_buffer.h rename to src/kernel/message_buffer.h index 75b275310e..4d37b0530a 100644 --- a/src/core/hle/kernel/message_buffer.h +++ b/src/kernel/message_buffer.h @@ -5,7 +5,7 @@ #include "common/alignment.h" #include "common/bit_field.h" -#include "core/hle/kernel/k_thread.h" +#include "kernel/k_thread.h" namespace Kernel { diff --git a/src/core/hle/kernel/physical_core.cpp b/src/kernel/physical_core.cpp similarity index 94% rename from src/core/hle/kernel/physical_core.cpp rename to src/kernel/physical_core.cpp index 5ee869fa2f..ff12a05b7f 100644 --- a/src/core/hle/kernel/physical_core.cpp +++ b/src/kernel/physical_core.cpp @@ -4,9 +4,9 @@ #include "core/arm/dynarmic/arm_dynarmic_32.h" #include "core/arm/dynarmic/arm_dynarmic_64.h" #include "core/core.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/physical_core.h" +#include "kernel/k_scheduler.h" +#include "kernel/kernel.h" +#include "kernel/physical_core.h" namespace Kernel { diff --git a/src/core/hle/kernel/physical_core.h b/src/kernel/physical_core.h similarity index 100% rename from src/core/hle/kernel/physical_core.h rename to src/kernel/physical_core.h diff --git a/src/core/hle/kernel/physical_memory.h b/src/kernel/physical_memory.h similarity index 100% rename from src/core/hle/kernel/physical_memory.h rename to src/kernel/physical_memory.h diff --git a/src/kernel/precompiled_headers.h b/src/kernel/precompiled_headers.h new file mode 100644 index 0000000000..aabae730bf --- /dev/null +++ b/src/kernel/precompiled_headers.h @@ -0,0 +1,6 @@ +// SPDX-FileCopyrightText: 2022 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "common/common_precompiled_headers.h" diff --git a/src/core/hle/kernel/slab_helpers.h b/src/kernel/slab_helpers.h similarity index 97% rename from src/core/hle/kernel/slab_helpers.h rename to src/kernel/slab_helpers.h index d1bbc76709..5bd660a68a 100644 --- a/src/core/hle/kernel/slab_helpers.h +++ b/src/kernel/slab_helpers.h @@ -3,9 +3,9 @@ #pragma once -#include "core/hle/kernel/k_auto_object.h" -#include "core/hle/kernel/k_auto_object_container.h" -#include "core/hle/kernel/kernel.h" +#include "kernel/k_auto_object.h" +#include "kernel/k_auto_object_container.h" +#include "kernel/kernel.h" namespace Kernel { diff --git a/src/core/hle/kernel/svc.cpp b/src/kernel/svc.cpp similarity index 99% rename from src/core/hle/kernel/svc.cpp rename to src/kernel/svc.cpp index b766839691..e4c311bbd7 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/kernel/svc.cpp @@ -7,8 +7,8 @@ #include "core/arm/arm_interface.h" #include "core/core.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_process.h" +#include "kernel/svc.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc.h b/src/kernel/svc.h similarity index 99% rename from src/core/hle/kernel/svc.h rename to src/kernel/svc.h index ac46960084..001545bd6f 100644 --- a/src/core/hle/kernel/svc.h +++ b/src/kernel/svc.h @@ -10,8 +10,8 @@ class System; } #include "common/common_types.h" -#include "core/hle/kernel/svc_types.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/svc_types.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_activity.cpp b/src/kernel/svc/svc_activity.cpp similarity index 94% rename from src/core/hle/kernel/svc/svc_activity.cpp rename to src/kernel/svc/svc_activity.cpp index 63bc085554..aff3123d46 100644 --- a/src/core/hle/kernel/svc/svc_activity.cpp +++ b/src/kernel/svc/svc_activity.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/k_process.h" +#include "kernel/k_thread.h" +#include "kernel/svc.h" +#include "kernel/svc_results.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_address_arbiter.cpp b/src/kernel/svc/svc_address_arbiter.cpp similarity index 92% rename from src/core/hle/kernel/svc/svc_address_arbiter.cpp rename to src/kernel/svc/svc_address_arbiter.cpp index 90ee435219..38dd998c94 100644 --- a/src/core/hle/kernel/svc/svc_address_arbiter.cpp +++ b/src/kernel/svc/svc_address_arbiter.cpp @@ -2,13 +2,13 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/kernel/k_hardware_timer.h" -#include "core/hle/kernel/k_memory_layout.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_results.h" -#include "core/hle/kernel/svc_types.h" +#include "kernel/k_hardware_timer.h" +#include "kernel/k_memory_layout.h" +#include "kernel/k_process.h" +#include "kernel/kernel.h" +#include "kernel/svc.h" +#include "kernel/svc_results.h" +#include "kernel/svc_types.h" namespace Kernel::Svc { namespace { diff --git a/src/core/hle/kernel/svc/svc_address_translation.cpp b/src/kernel/svc/svc_address_translation.cpp similarity index 96% rename from src/core/hle/kernel/svc/svc_address_translation.cpp rename to src/kernel/svc/svc_address_translation.cpp index e65a11cda8..3721b991e9 100644 --- a/src/core/hle/kernel/svc/svc_address_translation.cpp +++ b/src/kernel/svc/svc_address_translation.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/svc.h" +#include "kernel/svc_results.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_cache.cpp b/src/kernel/svc/svc_cache.cpp similarity index 95% rename from src/core/hle/kernel/svc/svc_cache.cpp rename to src/kernel/svc/svc_cache.cpp index c2c8be10f5..7653c729de 100644 --- a/src/core/hle/kernel/svc/svc_cache.cpp +++ b/src/kernel/svc/svc_cache.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_results.h" -#include "core/hle/kernel/svc_types.h" +#include "kernel/k_process.h" +#include "kernel/svc.h" +#include "kernel/svc_results.h" +#include "kernel/svc_types.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_code_memory.cpp b/src/kernel/svc/svc_code_memory.cpp similarity index 97% rename from src/core/hle/kernel/svc/svc_code_memory.cpp rename to src/kernel/svc/svc_code_memory.cpp index bae4cb0cd0..8af9927b3e 100644 --- a/src/core/hle/kernel/svc/svc_code_memory.cpp +++ b/src/kernel/svc/svc_code_memory.cpp @@ -3,10 +3,10 @@ #include "common/scope_exit.h" #include "core/core.h" -#include "core/hle/kernel/k_code_memory.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_code_memory.h" +#include "kernel/k_process.h" +#include "kernel/kernel.h" +#include "kernel/svc.h" namespace Kernel::Svc { namespace { diff --git a/src/core/hle/kernel/svc/svc_condition_variable.cpp b/src/kernel/svc/svc_condition_variable.cpp similarity index 91% rename from src/core/hle/kernel/svc/svc_condition_variable.cpp rename to src/kernel/svc/svc_condition_variable.cpp index bb678e6c56..ac6ac159f6 100644 --- a/src/core/hle/kernel/svc/svc_condition_variable.cpp +++ b/src/kernel/svc/svc_condition_variable.cpp @@ -2,12 +2,12 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/kernel/k_hardware_timer.h" -#include "core/hle/kernel/k_memory_layout.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/k_hardware_timer.h" +#include "kernel/k_memory_layout.h" +#include "kernel/k_process.h" +#include "kernel/kernel.h" +#include "kernel/svc.h" +#include "kernel/svc_results.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_debug.cpp b/src/kernel/svc/svc_debug.cpp similarity index 99% rename from src/core/hle/kernel/svc/svc_debug.cpp rename to src/kernel/svc/svc_debug.cpp index a4d1f700e8..4c88915137 100644 --- a/src/core/hle/kernel/svc/svc_debug.cpp +++ b/src/kernel/svc/svc_debug.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/svc.h" +#include "kernel/svc_results.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_debug_string.cpp b/src/kernel/svc/svc_debug_string.cpp similarity index 92% rename from src/core/hle/kernel/svc/svc_debug_string.cpp rename to src/kernel/svc/svc_debug_string.cpp index 00b65429be..b9794b665b 100644 --- a/src/core/hle/kernel/svc/svc_debug_string.cpp +++ b/src/kernel/svc/svc_debug_string.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/svc.h" #include "core/memory.h" +#include "kernel/k_thread.h" +#include "kernel/svc.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_device_address_space.cpp b/src/kernel/svc/svc_device_address_space.cpp similarity index 98% rename from src/core/hle/kernel/svc/svc_device_address_space.cpp rename to src/kernel/svc/svc_device_address_space.cpp index 42add9473a..a9e19253a0 100644 --- a/src/core/hle/kernel/svc/svc_device_address_space.cpp +++ b/src/kernel/svc/svc_device_address_space.cpp @@ -4,9 +4,9 @@ #include "common/alignment.h" #include "common/scope_exit.h" #include "core/core.h" -#include "core/hle/kernel/k_device_address_space.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_device_address_space.h" +#include "kernel/k_process.h" +#include "kernel/svc.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_event.cpp b/src/kernel/svc/svc_event.cpp similarity index 94% rename from src/core/hle/kernel/svc/svc_event.cpp rename to src/kernel/svc/svc_event.cpp index 901202e6a4..9b5806cb9d 100644 --- a/src/core/hle/kernel/svc/svc_event.cpp +++ b/src/kernel/svc/svc_event.cpp @@ -3,11 +3,11 @@ #include "common/scope_exit.h" #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_scoped_resource_reservation.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_event.h" +#include "kernel/k_process.h" +#include "kernel/k_scoped_resource_reservation.h" +#include "kernel/kernel.h" +#include "kernel/svc.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_exception.cpp b/src/kernel/svc/svc_exception.cpp similarity index 97% rename from src/core/hle/kernel/svc/svc_exception.cpp rename to src/kernel/svc/svc_exception.cpp index c581c086b8..bf92cfed58 100644 --- a/src/core/hle/kernel/svc/svc_exception.cpp +++ b/src/kernel/svc/svc_exception.cpp @@ -3,12 +3,12 @@ #include "core/core.h" #include "core/debugger/debugger.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_types.h" #include "core/memory.h" #include "core/reporter.h" +#include "kernel/k_process.h" +#include "kernel/k_thread.h" +#include "kernel/svc.h" +#include "kernel/svc_types.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_info.cpp b/src/kernel/svc/svc_info.cpp similarity index 98% rename from src/core/hle/kernel/svc/svc_info.cpp rename to src/kernel/svc/svc_info.cpp index ada9987722..76cc1a2377 100644 --- a/src/core/hle/kernel/svc/svc_info.cpp +++ b/src/kernel/svc/svc_info.cpp @@ -3,9 +3,9 @@ #include "core/core.h" #include "core/core_timing.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_resource_limit.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_process.h" +#include "kernel/k_resource_limit.h" +#include "kernel/svc.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_insecure_memory.cpp b/src/kernel/svc/svc_insecure_memory.cpp similarity index 93% rename from src/core/hle/kernel/svc/svc_insecure_memory.cpp rename to src/kernel/svc/svc_insecure_memory.cpp index 00457c6bf2..6339c70857 100644 --- a/src/core/hle/kernel/svc/svc_insecure_memory.cpp +++ b/src/kernel/svc/svc_insecure_memory.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/svc.h" +#include "kernel/svc_results.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_interrupt_event.cpp b/src/kernel/svc/svc_interrupt_event.cpp similarity index 92% rename from src/core/hle/kernel/svc/svc_interrupt_event.cpp rename to src/kernel/svc/svc_interrupt_event.cpp index 768b30a1fd..38199c66fd 100644 --- a/src/core/hle/kernel/svc/svc_interrupt_event.cpp +++ b/src/kernel/svc/svc_interrupt_event.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/svc.h" +#include "kernel/svc_results.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_io_pool.cpp b/src/kernel/svc/svc_io_pool.cpp similarity index 97% rename from src/core/hle/kernel/svc/svc_io_pool.cpp rename to src/kernel/svc/svc_io_pool.cpp index f01817e245..87ed437841 100644 --- a/src/core/hle/kernel/svc/svc_io_pool.cpp +++ b/src/kernel/svc/svc_io_pool.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/svc.h" +#include "kernel/svc_results.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_ipc.cpp b/src/kernel/svc/svc_ipc.cpp similarity index 96% rename from src/core/hle/kernel/svc/svc_ipc.cpp rename to src/kernel/svc/svc_ipc.cpp index 6b5e1cb8d7..d7149fe1d6 100644 --- a/src/core/hle/kernel/svc/svc_ipc.cpp +++ b/src/kernel/svc/svc_ipc.cpp @@ -4,12 +4,12 @@ #include "common/scope_exit.h" #include "common/scratch_buffer.h" #include "core/core.h" -#include "core/hle/kernel/k_client_session.h" -#include "core/hle/kernel/k_hardware_timer.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_server_session.h" -#include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/k_client_session.h" +#include "kernel/k_hardware_timer.h" +#include "kernel/k_process.h" +#include "kernel/k_server_session.h" +#include "kernel/svc.h" +#include "kernel/svc_results.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_kernel_debug.cpp b/src/kernel/svc/svc_kernel_debug.cpp similarity index 97% rename from src/core/hle/kernel/svc/svc_kernel_debug.cpp rename to src/kernel/svc/svc_kernel_debug.cpp index cee0482791..dbb56bffc8 100644 --- a/src/core/hle/kernel/svc/svc_kernel_debug.cpp +++ b/src/kernel/svc/svc_kernel_debug.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/svc.h" +#include "kernel/svc.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_light_ipc.cpp b/src/kernel/svc/svc_light_ipc.cpp similarity index 96% rename from src/core/hle/kernel/svc/svc_light_ipc.cpp rename to src/kernel/svc/svc_light_ipc.cpp index b76ce984c4..a2161c42b7 100644 --- a/src/core/hle/kernel/svc/svc_light_ipc.cpp +++ b/src/kernel/svc/svc_light_ipc.cpp @@ -3,8 +3,8 @@ #include "core/arm/arm_interface.h" #include "core/core.h" -#include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/svc.h" +#include "kernel/svc_results.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_lock.cpp b/src/kernel/svc/svc_lock.cpp similarity index 93% rename from src/core/hle/kernel/svc/svc_lock.cpp rename to src/kernel/svc/svc_lock.cpp index 5f0833fcbf..81dcd82a1c 100644 --- a/src/core/hle/kernel/svc/svc_lock.cpp +++ b/src/kernel/svc/svc_lock.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/kernel/k_memory_layout.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_memory_layout.h" +#include "kernel/k_process.h" +#include "kernel/svc.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_memory.cpp b/src/kernel/svc/svc_memory.cpp similarity index 99% rename from src/core/hle/kernel/svc/svc_memory.cpp rename to src/kernel/svc/svc_memory.cpp index 4ca62860d5..39b38f088f 100644 --- a/src/core/hle/kernel/svc/svc_memory.cpp +++ b/src/kernel/svc/svc_memory.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_process.h" +#include "kernel/svc.h" namespace Kernel::Svc { namespace { diff --git a/src/core/hle/kernel/svc/svc_physical_memory.cpp b/src/kernel/svc/svc_physical_memory.cpp similarity index 98% rename from src/core/hle/kernel/svc/svc_physical_memory.cpp rename to src/kernel/svc/svc_physical_memory.cpp index 793e9f8d01..466bd57de4 100644 --- a/src/core/hle/kernel/svc/svc_physical_memory.cpp +++ b/src/kernel/svc/svc_physical_memory.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_process.h" +#include "kernel/svc.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_port.cpp b/src/kernel/svc/svc_port.cpp similarity index 95% rename from src/core/hle/kernel/svc/svc_port.cpp rename to src/kernel/svc/svc_port.cpp index abba757c71..d27487edca 100644 --- a/src/core/hle/kernel/svc/svc_port.cpp +++ b/src/kernel/svc/svc_port.cpp @@ -3,12 +3,12 @@ #include "common/scope_exit.h" #include "core/core.h" -#include "core/hle/kernel/k_client_port.h" -#include "core/hle/kernel/k_client_session.h" -#include "core/hle/kernel/k_object_name.h" -#include "core/hle/kernel/k_port.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_client_port.h" +#include "kernel/k_client_session.h" +#include "kernel/k_object_name.h" +#include "kernel/k_port.h" +#include "kernel/k_process.h" +#include "kernel/svc.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_power_management.cpp b/src/kernel/svc/svc_power_management.cpp similarity index 84% rename from src/core/hle/kernel/svc/svc_power_management.cpp rename to src/kernel/svc/svc_power_management.cpp index f605a03177..9a76974aad 100644 --- a/src/core/hle/kernel/svc/svc_power_management.cpp +++ b/src/kernel/svc/svc_power_management.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/svc.h" +#include "kernel/svc_results.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_process.cpp b/src/kernel/svc/svc_process.cpp similarity index 99% rename from src/core/hle/kernel/svc/svc_process.cpp rename to src/kernel/svc/svc_process.cpp index caa8bee9af..4d5f5354bd 100644 --- a/src/core/hle/kernel/svc/svc_process.cpp +++ b/src/kernel/svc/svc_process.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_process.h" +#include "kernel/svc.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_process_memory.cpp b/src/kernel/svc/svc_process_memory.cpp similarity index 99% rename from src/core/hle/kernel/svc/svc_process_memory.cpp rename to src/kernel/svc/svc_process_memory.cpp index e1427947b0..ecd97031ec 100644 --- a/src/core/hle/kernel/svc/svc_process_memory.cpp +++ b/src/kernel/svc/svc_process_memory.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_process.h" +#include "kernel/svc.h" namespace Kernel::Svc { namespace { diff --git a/src/core/hle/kernel/svc/svc_processor.cpp b/src/kernel/svc/svc_processor.cpp similarity index 89% rename from src/core/hle/kernel/svc/svc_processor.cpp rename to src/kernel/svc/svc_processor.cpp index 7602ce6c03..4350830f4f 100644 --- a/src/core/hle/kernel/svc/svc_processor.cpp +++ b/src/kernel/svc/svc_processor.cpp @@ -3,8 +3,8 @@ #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/kernel/physical_core.h" -#include "core/hle/kernel/svc.h" +#include "kernel/physical_core.h" +#include "kernel/svc.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_query_memory.cpp b/src/kernel/svc/svc_query_memory.cpp similarity index 97% rename from src/core/hle/kernel/svc/svc_query_memory.cpp rename to src/kernel/svc/svc_query_memory.cpp index 816dcb8d0f..6cd809a77e 100644 --- a/src/core/hle/kernel/svc/svc_query_memory.cpp +++ b/src/kernel/svc/svc_query_memory.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_process.h" +#include "kernel/svc.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_register.cpp b/src/kernel/svc/svc_register.cpp similarity index 91% rename from src/core/hle/kernel/svc/svc_register.cpp rename to src/kernel/svc/svc_register.cpp index b883e66183..068a4ee382 100644 --- a/src/core/hle/kernel/svc/svc_register.cpp +++ b/src/kernel/svc/svc_register.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/svc.h" +#include "kernel/svc_results.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_resource_limit.cpp b/src/kernel/svc/svc_resource_limit.cpp similarity index 98% rename from src/core/hle/kernel/svc/svc_resource_limit.cpp rename to src/kernel/svc/svc_resource_limit.cpp index c8e820b6a8..739a05dcb6 100644 --- a/src/core/hle/kernel/svc/svc_resource_limit.cpp +++ b/src/kernel/svc/svc_resource_limit.cpp @@ -3,9 +3,9 @@ #include "common/scope_exit.h" #include "core/core.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_resource_limit.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_process.h" +#include "kernel/k_resource_limit.h" +#include "kernel/svc.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_secure_monitor_call.cpp b/src/kernel/svc/svc_secure_monitor_call.cpp similarity index 94% rename from src/core/hle/kernel/svc/svc_secure_monitor_call.cpp rename to src/kernel/svc/svc_secure_monitor_call.cpp index 62c7815516..e17bbe91c0 100644 --- a/src/core/hle/kernel/svc/svc_secure_monitor_call.cpp +++ b/src/kernel/svc/svc_secure_monitor_call.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/kernel/physical_core.h" -#include "core/hle/kernel/svc.h" +#include "kernel/physical_core.h" +#include "kernel/svc.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_session.cpp b/src/kernel/svc/svc_session.cpp similarity index 96% rename from src/core/hle/kernel/svc/svc_session.cpp rename to src/kernel/svc/svc_session.cpp index 01b8a52add..adeb0e049b 100644 --- a/src/core/hle/kernel/svc/svc_session.cpp +++ b/src/kernel/svc/svc_session.cpp @@ -3,10 +3,10 @@ #include "common/scope_exit.h" #include "core/core.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_scoped_resource_reservation.h" -#include "core/hle/kernel/k_session.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_process.h" +#include "kernel/k_scoped_resource_reservation.h" +#include "kernel/k_session.h" +#include "kernel/svc.h" namespace Kernel::Svc { namespace { diff --git a/src/core/hle/kernel/svc/svc_shared_memory.cpp b/src/kernel/svc/svc_shared_memory.cpp similarity index 97% rename from src/core/hle/kernel/svc/svc_shared_memory.cpp rename to src/kernel/svc/svc_shared_memory.cpp index 012b1ae2bc..413b8eed88 100644 --- a/src/core/hle/kernel/svc/svc_shared_memory.cpp +++ b/src/kernel/svc/svc_shared_memory.cpp @@ -3,9 +3,9 @@ #include "common/scope_exit.h" #include "core/core.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_shared_memory.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_process.h" +#include "kernel/k_shared_memory.h" +#include "kernel/svc.h" namespace Kernel::Svc { namespace { diff --git a/src/core/hle/kernel/svc/svc_synchronization.cpp b/src/kernel/svc/svc_synchronization.cpp similarity index 96% rename from src/core/hle/kernel/svc/svc_synchronization.cpp rename to src/kernel/svc/svc_synchronization.cpp index 6c79cfd8dd..76269f5699 100644 --- a/src/core/hle/kernel/svc/svc_synchronization.cpp +++ b/src/kernel/svc/svc_synchronization.cpp @@ -4,11 +4,11 @@ #include "common/scope_exit.h" #include "common/scratch_buffer.h" #include "core/core.h" -#include "core/hle/kernel/k_hardware_timer.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/k_hardware_timer.h" +#include "kernel/k_process.h" +#include "kernel/k_readable_event.h" +#include "kernel/svc.h" +#include "kernel/svc_results.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_thread.cpp b/src/kernel/svc/svc_thread.cpp similarity index 98% rename from src/core/hle/kernel/svc/svc_thread.cpp rename to src/kernel/svc/svc_thread.cpp index 755fd62b5f..993ad0d87b 100644 --- a/src/core/hle/kernel/svc/svc_thread.cpp +++ b/src/kernel/svc/svc_thread.cpp @@ -4,11 +4,11 @@ #include "common/scope_exit.h" #include "core/core.h" #include "core/core_timing.h" -#include "core/hle/kernel/k_hardware_timer.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_scoped_resource_reservation.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_hardware_timer.h" +#include "kernel/k_process.h" +#include "kernel/k_scoped_resource_reservation.h" +#include "kernel/k_thread.h" +#include "kernel/svc.h" namespace Kernel::Svc { namespace { diff --git a/src/core/hle/kernel/svc/svc_thread_profiler.cpp b/src/kernel/svc/svc_thread_profiler.cpp similarity index 96% rename from src/core/hle/kernel/svc/svc_thread_profiler.cpp rename to src/kernel/svc/svc_thread_profiler.cpp index 40de7708b2..2e134f2456 100644 --- a/src/core/hle/kernel/svc/svc_thread_profiler.cpp +++ b/src/kernel/svc/svc_thread_profiler.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/svc.h" -#include "core/hle/kernel/svc_results.h" +#include "kernel/svc.h" +#include "kernel/svc_results.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_tick.cpp b/src/kernel/svc/svc_tick.cpp similarity index 91% rename from src/core/hle/kernel/svc/svc_tick.cpp rename to src/kernel/svc/svc_tick.cpp index 7dd7c6e518..7ecf9f0b10 100644 --- a/src/core/hle/kernel/svc/svc_tick.cpp +++ b/src/kernel/svc/svc_tick.cpp @@ -3,8 +3,8 @@ #include "core/core.h" #include "core/core_timing.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/svc.h" +#include "kernel/kernel.h" +#include "kernel/svc.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc/svc_transfer_memory.cpp b/src/kernel/svc/svc_transfer_memory.cpp similarity index 97% rename from src/core/hle/kernel/svc/svc_transfer_memory.cpp rename to src/kernel/svc/svc_transfer_memory.cpp index 1f97121b32..9f800e6d0c 100644 --- a/src/core/hle/kernel/svc/svc_transfer_memory.cpp +++ b/src/kernel/svc/svc_transfer_memory.cpp @@ -3,10 +3,10 @@ #include "common/scope_exit.h" #include "core/core.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_scoped_resource_reservation.h" -#include "core/hle/kernel/k_transfer_memory.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_process.h" +#include "kernel/k_scoped_resource_reservation.h" +#include "kernel/k_transfer_memory.h" +#include "kernel/svc.h" namespace Kernel::Svc { namespace { diff --git a/src/core/hle/kernel/svc_common.h b/src/kernel/svc_common.h similarity index 100% rename from src/core/hle/kernel/svc_common.h rename to src/kernel/svc_common.h diff --git a/src/core/hle/kernel/svc_generator.py b/src/kernel/svc_generator.py similarity index 99% rename from src/core/hle/kernel/svc_generator.py rename to src/kernel/svc_generator.py index 5531faac6b..f898417fc2 100644 --- a/src/core/hle/kernel/svc_generator.py +++ b/src/kernel/svc_generator.py @@ -499,8 +499,8 @@ class System; } #include "common/common_types.h" -#include "core/hle/kernel/svc_types.h" -#include "core/hle/result.h" +#include "core/result.h" +#include "kernel/svc_types.h" namespace Kernel::Svc { @@ -545,8 +545,8 @@ PROLOGUE_CPP = """ #include "core/arm/arm_interface.h" #include "core/core.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/svc.h" +#include "kernel/k_process.h" +#include "kernel/svc.h" namespace Kernel::Svc { diff --git a/src/core/hle/kernel/svc_results.h b/src/kernel/svc_results.h similarity index 98% rename from src/core/hle/kernel/svc_results.h rename to src/kernel/svc_results.h index e1ad78607e..5679f264c4 100644 --- a/src/core/hle/kernel/svc_results.h +++ b/src/kernel/svc_results.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/result.h" +#include "core/result.h" namespace Kernel { diff --git a/src/core/hle/kernel/svc_types.h b/src/kernel/svc_types.h similarity index 100% rename from src/core/hle/kernel/svc_types.h rename to src/kernel/svc_types.h diff --git a/src/core/hle/kernel/svc_version.h b/src/kernel/svc_version.h similarity index 100% rename from src/core/hle/kernel/svc_version.h rename to src/kernel/svc_version.h diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt new file mode 100644 index 0000000000..cf080002d5 --- /dev/null +++ b/src/service/CMakeLists.txt @@ -0,0 +1,522 @@ +# SPDX-FileCopyrightText: 2018 yuzu Emulator Project +# SPDX-License-Identifier: GPL-2.0-or-later + +add_library(service STATIC + acc/acc.cpp + acc/acc.h + acc/acc_aa.cpp + acc/acc_aa.h + acc/acc_su.cpp + acc/acc_su.h + acc/acc_u0.cpp + acc/acc_u0.h + acc/acc_u1.cpp + acc/acc_u1.h + acc/async_context.cpp + acc/async_context.h + acc/errors.h + acc/profile_manager.cpp + acc/profile_manager.h + am/am.cpp + am/am.h + am/applet_ae.cpp + am/applet_ae.h + am/applet_oe.cpp + am/applet_oe.h + am/applets/applet_cabinet.cpp + am/applets/applet_cabinet.h + am/applets/applet_controller.cpp + am/applets/applet_controller.h + am/applets/applet_error.cpp + am/applets/applet_error.h + am/applets/applet_general_backend.cpp + am/applets/applet_general_backend.h + am/applets/applet_mii_edit.cpp + am/applets/applet_mii_edit.h + am/applets/applet_mii_edit_types.h + am/applets/applet_profile_select.cpp + am/applets/applet_profile_select.h + am/applets/applet_software_keyboard.cpp + am/applets/applet_software_keyboard.h + am/applets/applet_software_keyboard_types.h + am/applets/applet_web_browser.cpp + am/applets/applet_web_browser.h + am/applets/applet_web_browser_types.h + am/applets/applets.cpp + am/applets/applets.h + am/idle.cpp + am/idle.h + am/omm.cpp + am/omm.h + am/spsm.cpp + am/spsm.h + aoc/aoc_u.cpp + aoc/aoc_u.h + apm/apm.cpp + apm/apm.h + apm/apm_controller.cpp + apm/apm_controller.h + apm/apm_interface.cpp + apm/apm_interface.h + audio/audctl.cpp + audio/audctl.h + audio/audin_u.cpp + audio/audin_u.h + audio/audio.cpp + audio/audio.h + audio/audout_u.cpp + audio/audout_u.h + audio/audrec_a.cpp + audio/audrec_a.h + audio/audrec_u.cpp + audio/audrec_u.h + audio/audren_u.cpp + audio/audren_u.h + audio/errors.h + audio/hwopus.cpp + audio/hwopus.h + bcat/backend/backend.cpp + bcat/backend/backend.h + bcat/bcat.cpp + bcat/bcat.h + bcat/bcat_module.cpp + bcat/bcat_module.h + bpc/bpc.cpp + bpc/bpc.h + btdrv/btdrv.cpp + btdrv/btdrv.h + btm/btm.cpp + btm/btm.h + caps/caps.cpp + caps/caps.h + caps/caps_a.cpp + caps/caps_a.h + caps/caps_c.cpp + caps/caps_c.h + caps/caps_manager.cpp + caps/caps_manager.h + caps/caps_result.h + caps/caps_sc.cpp + caps/caps_sc.h + caps/caps_ss.cpp + caps/caps_ss.h + caps/caps_su.cpp + caps/caps_su.h + caps/caps_types.h + caps/caps_u.cpp + caps/caps_u.h + erpt/erpt.cpp + erpt/erpt.h + es/es.cpp + es/es.h + eupld/eupld.cpp + eupld/eupld.h + fatal/fatal.cpp + fatal/fatal.h + fatal/fatal_p.cpp + fatal/fatal_p.h + fatal/fatal_u.cpp + fatal/fatal_u.h + filesystem/filesystem.cpp + filesystem/filesystem.h + filesystem/fsp_ldr.cpp + filesystem/fsp_ldr.h + filesystem/fsp_pr.cpp + filesystem/fsp_pr.h + filesystem/fsp_srv.cpp + filesystem/fsp_srv.h + fgm/fgm.cpp + fgm/fgm.h + friend/friend.cpp + friend/friend.h + friend/friend_interface.cpp + friend/friend_interface.h + glue/arp.cpp + glue/arp.h + glue/bgtc.cpp + glue/bgtc.h + glue/ectx.cpp + glue/ectx.h + glue/errors.h + glue/glue.cpp + glue/glue.h + glue/glue_manager.cpp + glue/glue_manager.h + glue/notif.cpp + glue/notif.h + grc/grc.cpp + grc/grc.h + hid/hid.cpp + hid/hid.h + hid/hidbus.cpp + hid/hidbus.h + hid/irs.cpp + hid/irs.h + hid/irs_ring_lifo.h + hid/ring_lifo.h + hid/xcd.cpp + hid/xcd.h + hid/errors.h + hid/controllers/console_sixaxis.cpp + hid/controllers/console_sixaxis.h + hid/controllers/controller_base.cpp + hid/controllers/controller_base.h + hid/controllers/debug_pad.cpp + hid/controllers/debug_pad.h + hid/controllers/gesture.cpp + hid/controllers/gesture.h + hid/controllers/keyboard.cpp + hid/controllers/keyboard.h + hid/controllers/mouse.cpp + hid/controllers/mouse.h + hid/controllers/npad.cpp + hid/controllers/npad.h + hid/controllers/palma.cpp + hid/controllers/palma.h + hid/controllers/stubbed.cpp + hid/controllers/stubbed.h + hid/controllers/touchscreen.cpp + hid/controllers/touchscreen.h + hid/controllers/xpad.cpp + hid/controllers/xpad.h + hid/hidbus/hidbus_base.cpp + hid/hidbus/hidbus_base.h + hid/hidbus/ringcon.cpp + hid/hidbus/ringcon.h + hid/hidbus/starlink.cpp + hid/hidbus/starlink.h + hid/hidbus/stubbed.cpp + hid/hidbus/stubbed.h + hid/irsensor/clustering_processor.cpp + hid/irsensor/clustering_processor.h + hid/irsensor/image_transfer_processor.cpp + hid/irsensor/image_transfer_processor.h + hid/irsensor/ir_led_processor.cpp + hid/irsensor/ir_led_processor.h + hid/irsensor/moment_processor.cpp + hid/irsensor/moment_processor.h + hid/irsensor/pointing_processor.cpp + hid/irsensor/pointing_processor.h + hid/irsensor/processor_base.cpp + hid/irsensor/processor_base.h + hid/irsensor/tera_plugin_processor.cpp + hid/irsensor/tera_plugin_processor.h + lbl/lbl.cpp + lbl/lbl.h + ldn/lan_discovery.cpp + ldn/lan_discovery.h + ldn/ldn_results.h + ldn/ldn.cpp + ldn/ldn.h + ldn/ldn_types.h + ldr/ldr.cpp + ldr/ldr.h + lm/lm.cpp + lm/lm.h + mig/mig.cpp + mig/mig.h + mii/types/char_info.cpp + mii/types/char_info.h + mii/types/core_data.cpp + mii/types/core_data.h + mii/types/raw_data.cpp + mii/types/raw_data.h + mii/types/store_data.cpp + mii/types/store_data.h + mii/types/ver3_store_data.cpp + mii/types/ver3_store_data.h + mii/mii.cpp + mii/mii.h + mii/mii_database.cpp + mii/mii_database.h + mii/mii_database_manager.cpp + mii/mii_database_manager.h + mii/mii_manager.cpp + mii/mii_manager.h + mii/mii_result.h + mii/mii_types.h + mii/mii_util.h + mm/mm_u.cpp + mm/mm_u.h + mnpp/mnpp_app.cpp + mnpp/mnpp_app.h + ncm/ncm.cpp + ncm/ncm.h + nfc/common/amiibo_crypto.cpp + nfc/common/amiibo_crypto.h + nfc/common/device.cpp + nfc/common/device.h + nfc/common/device_manager.cpp + nfc/common/device_manager.h + nfc/mifare_result.h + nfc/mifare_types.h + nfc/nfc.cpp + nfc/nfc.h + nfc/nfc_interface.cpp + nfc/nfc_interface.h + nfc/nfc_result.h + nfc/nfc_types.h + nfp/nfp.cpp + nfp/nfp.h + nfp/nfp_interface.cpp + nfp/nfp_interface.h + nfp/nfp_result.h + nfp/nfp_types.h + ngc/ngc.cpp + ngc/ngc.h + nifm/nifm.cpp + nifm/nifm.h + nim/nim.cpp + nim/nim.h + npns/npns.cpp + npns/npns.h + ns/errors.h + ns/iplatform_service_manager.cpp + ns/iplatform_service_manager.h + ns/language.cpp + ns/language.h + ns/ns.cpp + ns/ns.h + ns/pdm_qry.cpp + ns/pdm_qry.h + nvdrv/core/container.cpp + nvdrv/core/container.h + nvdrv/core/nvmap.cpp + nvdrv/core/nvmap.h + nvdrv/core/syncpoint_manager.cpp + nvdrv/core/syncpoint_manager.h + nvdrv/devices/nvdevice.h + nvdrv/devices/nvdisp_disp0.cpp + nvdrv/devices/nvdisp_disp0.h + nvdrv/devices/nvhost_as_gpu.cpp + nvdrv/devices/nvhost_as_gpu.h + nvdrv/devices/nvhost_ctrl.cpp + nvdrv/devices/nvhost_ctrl.h + nvdrv/devices/nvhost_ctrl_gpu.cpp + nvdrv/devices/nvhost_ctrl_gpu.h + nvdrv/devices/nvhost_gpu.cpp + nvdrv/devices/nvhost_gpu.h + nvdrv/devices/nvhost_nvdec.cpp + nvdrv/devices/nvhost_nvdec.h + nvdrv/devices/nvhost_nvdec_common.cpp + nvdrv/devices/nvhost_nvdec_common.h + nvdrv/devices/nvhost_nvjpg.cpp + nvdrv/devices/nvhost_nvjpg.h + nvdrv/devices/nvhost_vic.cpp + nvdrv/devices/nvhost_vic.h + nvdrv/devices/nvmap.cpp + nvdrv/devices/nvmap.h + nvdrv/nvdata.h + nvdrv/nvdrv.cpp + nvdrv/nvdrv.h + nvdrv/nvdrv_interface.cpp + nvdrv/nvdrv_interface.h + nvdrv/nvmemp.cpp + nvdrv/nvmemp.h + nvnflinger/binder.h + nvnflinger/buffer_item.h + nvnflinger/buffer_item_consumer.cpp + nvnflinger/buffer_item_consumer.h + nvnflinger/buffer_queue_consumer.cpp + nvnflinger/buffer_queue_consumer.h + nvnflinger/buffer_queue_core.cpp + nvnflinger/buffer_queue_core.h + nvnflinger/buffer_queue_defs.h + nvnflinger/buffer_queue_producer.cpp + nvnflinger/buffer_queue_producer.h + nvnflinger/buffer_slot.h + nvnflinger/buffer_transform_flags.h + nvnflinger/consumer_base.cpp + nvnflinger/consumer_base.h + nvnflinger/consumer_listener.h + nvnflinger/fb_share_buffer_manager.cpp + nvnflinger/fb_share_buffer_manager.h + nvnflinger/graphic_buffer_producer.cpp + nvnflinger/graphic_buffer_producer.h + nvnflinger/hos_binder_driver_server.cpp + nvnflinger/hos_binder_driver_server.h + nvnflinger/nvnflinger.cpp + nvnflinger/nvnflinger.h + nvnflinger/parcel.h + nvnflinger/pixel_format.h + nvnflinger/producer_listener.h + nvnflinger/status.h + nvnflinger/ui/fence.h + nvnflinger/ui/graphic_buffer.h + nvnflinger/window.h + olsc/olsc.cpp + olsc/olsc.h + pcie/pcie.cpp + pcie/pcie.h + pctl/pctl.cpp + pctl/pctl.h + pctl/pctl_module.cpp + pctl/pctl_module.h + pcv/pcv.cpp + pcv/pcv.h + pm/pm.cpp + pm/pm.h + prepo/prepo.cpp + prepo/prepo.h + psc/psc.cpp + psc/psc.h + ptm/psm.cpp + ptm/psm.h + ptm/ptm.cpp + ptm/ptm.h + ptm/ts.cpp + ptm/ts.h + hle_ipc.cpp + hle_ipc.h + ipc_helpers.h + kernel_helpers.cpp + kernel_helpers.h + mutex.cpp + mutex.h + server_manager.cpp + server_manager.h + service.cpp + service.h + set/set.cpp + set/set.h + set/set_cal.cpp + set/set_cal.h + set/set_fd.cpp + set/set_fd.h + set/set_sys.cpp + set/set_sys.h + set/settings.cpp + set/settings.h + sm/sm.cpp + sm/sm.h + sm/sm_controller.cpp + sm/sm_controller.h + sockets/bsd.cpp + sockets/bsd.h + sockets/nsd.cpp + sockets/nsd.h + sockets/sfdnsres.cpp + sockets/sfdnsres.h + sockets/sockets.cpp + sockets/sockets.h + sockets/sockets_translate.cpp + sockets/sockets_translate.h + spl/csrng.cpp + spl/csrng.h + spl/spl.cpp + spl/spl.h + spl/spl_module.cpp + spl/spl_module.h + spl/spl_results.h + spl/spl_types.h + ssl/ssl.cpp + ssl/ssl.h + ssl/ssl_backend.h + time/clock_types.h + time/ephemeral_network_system_clock_context_writer.h + time/ephemeral_network_system_clock_core.h + time/errors.h + time/local_system_clock_context_writer.h + time/network_system_clock_context_writer.h + time/standard_local_system_clock_core.h + time/standard_network_system_clock_core.h + time/standard_steady_clock_core.cpp + time/standard_steady_clock_core.h + time/standard_user_system_clock_core.cpp + time/standard_user_system_clock_core.h + time/steady_clock_core.h + time/system_clock_context_update_callback.cpp + time/system_clock_context_update_callback.h + time/system_clock_core.cpp + time/system_clock_core.h + time/tick_based_steady_clock_core.cpp + time/tick_based_steady_clock_core.h + time/time.cpp + time/time.h + time/time_interface.cpp + time/time_interface.h + time/time_manager.cpp + time/time_manager.h + time/time_sharedmemory.cpp + time/time_sharedmemory.h + time/time_zone_content_manager.cpp + time/time_zone_content_manager.h + time/time_zone_manager.cpp + time/time_zone_manager.h + time/time_zone_service.cpp + time/time_zone_service.h + time/time_zone_types.h + usb/usb.cpp + usb/usb.h + vi/display/vi_display.cpp + vi/display/vi_display.h + vi/layer/vi_layer.cpp + vi/layer/vi_layer.h + vi/vi.cpp + vi/vi.h + vi/vi_m.cpp + vi/vi_m.h + vi/vi_s.cpp + vi/vi_s.h + vi/vi_u.cpp + vi/vi_u.h +) + +if (MSVC) + target_compile_options(service PRIVATE + /we4242 # 'identifier': conversion from 'type1' to 'type2', possible loss of data + /we4244 # 'conversion': conversion from 'type1' to 'type2', possible loss of data + /we4245 # 'conversion': conversion from 'type1' to 'type2', signed/unsigned mismatch + /we4254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data + /we4800 # Implicit conversion from 'type' to bool. Possible information loss + ) +else() + target_compile_options(service PRIVATE + -Werror=conversion + + -Wno-sign-conversion + -Wno-cast-function-type + + $<$:-fsized-deallocation> + ) +endif() + +create_target_directory_groups(service) + +target_link_libraries(service PUBLIC common PRIVATE audio_core network video_core nx_tzdb) +target_link_libraries(service PUBLIC Boost::headers PRIVATE fmt::fmt mbedtls) + +if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) + target_sources(service PRIVATE + jit/jit_context.cpp + jit/jit_context.h + jit/jit.cpp + jit/jit.h + ) + target_link_libraries(service PRIVATE core dynarmic::dynarmic) +endif() + +if(ENABLE_OPENSSL) + target_sources(service PRIVATE + ssl/ssl_backend_openssl.cpp) + target_link_libraries(service PRIVATE OpenSSL::SSL) +elseif (APPLE) + target_sources(service PRIVATE + ssl/ssl_backend_securetransport.cpp) + target_link_libraries(service PRIVATE "-framework Security") +elseif (WIN32) + target_sources(service PRIVATE + ssl/ssl_backend_schannel.cpp) + target_link_libraries(service PRIVATE crypt32 secur32) +else() + target_sources(service PRIVATE + ssl/ssl_backend_none.cpp) +endif() + +if (YUZU_USE_PRECOMPILED_HEADERS) + target_precompile_headers(service PRIVATE precompiled_headers.h) +endif() + +if (YUZU_ENABLE_LTO) + set_property(TARGET service PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) +endif() diff --git a/src/core/hle/service/acc/acc.cpp b/src/service/acc/acc.cpp similarity index 98% rename from src/core/hle/service/acc/acc.cpp rename to src/service/acc/acc.cpp index f215536446..f329fbfb78 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/service/acc/acc.cpp @@ -17,18 +17,18 @@ #include "core/core_timing.h" #include "core/file_sys/control_metadata.h" #include "core/file_sys/patch_manager.h" -#include "core/hle/service/acc/acc.h" -#include "core/hle/service/acc/acc_aa.h" -#include "core/hle/service/acc/acc_su.h" -#include "core/hle/service/acc/acc_u0.h" -#include "core/hle/service/acc/acc_u1.h" -#include "core/hle/service/acc/async_context.h" -#include "core/hle/service/acc/errors.h" -#include "core/hle/service/acc/profile_manager.h" -#include "core/hle/service/glue/glue_manager.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/server_manager.h" #include "core/loader/loader.h" +#include "service/acc/acc.h" +#include "service/acc/acc_aa.h" +#include "service/acc/acc_su.h" +#include "service/acc/acc_u0.h" +#include "service/acc/acc_u1.h" +#include "service/acc/async_context.h" +#include "service/acc/errors.h" +#include "service/acc/profile_manager.h" +#include "service/glue/glue_manager.h" +#include "service/ipc_helpers.h" +#include "service/server_manager.h" namespace Service::Account { diff --git a/src/core/hle/service/acc/acc.h b/src/service/acc/acc.h similarity index 96% rename from src/core/hle/service/acc/acc.h rename to src/service/acc/acc.h index 0395229b47..7d5f486ab4 100644 --- a/src/core/hle/service/acc/acc.h +++ b/src/service/acc/acc.h @@ -4,8 +4,8 @@ #pragma once #include "common/uuid.h" -#include "core/hle/service/glue/glue_manager.h" -#include "core/hle/service/service.h" +#include "service/glue/glue_manager.h" +#include "service/service.h" namespace Service::Account { diff --git a/src/core/hle/service/acc/acc_aa.cpp b/src/service/acc/acc_aa.cpp similarity index 95% rename from src/core/hle/service/acc/acc_aa.cpp rename to src/service/acc/acc_aa.cpp index 90ed0f5197..5fa97aa85b 100644 --- a/src/core/hle/service/acc/acc_aa.cpp +++ b/src/service/acc/acc_aa.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/acc/acc_aa.h" +#include "service/acc/acc_aa.h" namespace Service::Account { diff --git a/src/core/hle/service/acc/acc_aa.h b/src/service/acc/acc_aa.h similarity index 91% rename from src/core/hle/service/acc/acc_aa.h rename to src/service/acc/acc_aa.h index 623daeaef0..369ab24a34 100644 --- a/src/core/hle/service/acc/acc_aa.h +++ b/src/service/acc/acc_aa.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/acc/acc.h" +#include "service/acc/acc.h" namespace Service::Account { diff --git a/src/core/hle/service/acc/acc_su.cpp b/src/service/acc/acc_su.cpp similarity index 98% rename from src/core/hle/service/acc/acc_su.cpp rename to src/service/acc/acc_su.cpp index 770d13ec55..75db3a0407 100644 --- a/src/core/hle/service/acc/acc_su.cpp +++ b/src/service/acc/acc_su.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/acc/acc_su.h" +#include "service/acc/acc_su.h" namespace Service::Account { diff --git a/src/core/hle/service/acc/acc_su.h b/src/service/acc/acc_su.h similarity index 91% rename from src/core/hle/service/acc/acc_su.h rename to src/service/acc/acc_su.h index 8daef38b8b..5066483ad2 100644 --- a/src/core/hle/service/acc/acc_su.h +++ b/src/service/acc/acc_su.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/acc/acc.h" +#include "service/acc/acc.h" namespace Service::Account { diff --git a/src/core/hle/service/acc/acc_u0.cpp b/src/service/acc/acc_u0.cpp similarity index 98% rename from src/core/hle/service/acc/acc_u0.cpp rename to src/service/acc/acc_u0.cpp index 54844bfe7d..a60d34c955 100644 --- a/src/core/hle/service/acc/acc_u0.cpp +++ b/src/service/acc/acc_u0.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/acc/acc_u0.h" +#include "service/acc/acc_u0.h" namespace Service::Account { diff --git a/src/core/hle/service/acc/acc_u0.h b/src/service/acc/acc_u0.h similarity index 91% rename from src/core/hle/service/acc/acc_u0.h rename to src/service/acc/acc_u0.h index 35cd4b492c..50dd766804 100644 --- a/src/core/hle/service/acc/acc_u0.h +++ b/src/service/acc/acc_u0.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/acc/acc.h" +#include "service/acc/acc.h" namespace Service::Account { diff --git a/src/core/hle/service/acc/acc_u1.cpp b/src/service/acc/acc_u1.cpp similarity index 98% rename from src/core/hle/service/acc/acc_u1.cpp rename to src/service/acc/acc_u1.cpp index 92f704c2f6..fe75b1dab1 100644 --- a/src/core/hle/service/acc/acc_u1.cpp +++ b/src/service/acc/acc_u1.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/acc/acc_u1.h" +#include "service/acc/acc_u1.h" namespace Service::Account { diff --git a/src/core/hle/service/acc/acc_u1.h b/src/service/acc/acc_u1.h similarity index 91% rename from src/core/hle/service/acc/acc_u1.h rename to src/service/acc/acc_u1.h index e711d39252..bc82106d77 100644 --- a/src/core/hle/service/acc/acc_u1.h +++ b/src/service/acc/acc_u1.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/acc/acc.h" +#include "service/acc/acc.h" namespace Service::Account { diff --git a/src/core/hle/service/acc/async_context.cpp b/src/service/acc/async_context.cpp similarity index 93% rename from src/core/hle/service/acc/async_context.cpp rename to src/service/acc/async_context.cpp index c9e0af90ce..321619b468 100644 --- a/src/core/hle/service/acc/async_context.cpp +++ b/src/service/acc/async_context.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/acc/async_context.h" -#include "core/hle/service/ipc_helpers.h" +#include "kernel/k_event.h" +#include "service/acc/async_context.h" +#include "service/ipc_helpers.h" namespace Service::Account { IAsyncContext::IAsyncContext(Core::System& system_) diff --git a/src/core/hle/service/acc/async_context.h b/src/service/acc/async_context.h similarity index 91% rename from src/core/hle/service/acc/async_context.h rename to src/service/acc/async_context.h index d7bffc055e..a53a5cd9f2 100644 --- a/src/core/hle/service/acc/async_context.h +++ b/src/service/acc/async_context.h @@ -4,8 +4,8 @@ #pragma once #include -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/service.h" +#include "service/kernel_helpers.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/acc/errors.h b/src/service/acc/errors.h similarity index 96% rename from src/core/hle/service/acc/errors.h rename to src/service/acc/errors.h index 433ebfe9d6..c50c54080c 100644 --- a/src/core/hle/service/acc/errors.h +++ b/src/service/acc/errors.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/result.h" +#include "core/result.h" namespace Service::Account { diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/service/acc/profile_manager.cpp similarity index 99% rename from src/core/hle/service/acc/profile_manager.cpp rename to src/service/acc/profile_manager.cpp index 5542d6cbc7..1cba871726 100644 --- a/src/core/hle/service/acc/profile_manager.cpp +++ b/src/service/acc/profile_manager.cpp @@ -11,7 +11,7 @@ #include "common/fs/path_util.h" #include "common/polyfill_ranges.h" #include "common/settings.h" -#include "core/hle/service/acc/profile_manager.h" +#include "service/acc/profile_manager.h" namespace Service::Account { diff --git a/src/core/hle/service/acc/profile_manager.h b/src/service/acc/profile_manager.h similarity index 99% rename from src/core/hle/service/acc/profile_manager.h rename to src/service/acc/profile_manager.h index 900e32200b..8c5c50f970 100644 --- a/src/core/hle/service/acc/profile_manager.h +++ b/src/service/acc/profile_manager.h @@ -10,7 +10,7 @@ #include "common/common_types.h" #include "common/swap.h" #include "common/uuid.h" -#include "core/hle/result.h" +#include "core/result.h" namespace Service::Account { diff --git a/src/core/hle/service/am/am.cpp b/src/service/am/am.cpp similarity index 98% rename from src/core/hle/service/am/am.cpp rename to src/service/am/am.cpp index cc643ea091..daa4fec2d1 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/service/am/am.cpp @@ -13,38 +13,38 @@ #include "core/file_sys/patch_manager.h" #include "core/file_sys/registered_cache.h" #include "core/file_sys/savedata_factory.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_transfer_memory.h" -#include "core/hle/result.h" -#include "core/hle/service/acc/profile_manager.h" -#include "core/hle/service/am/am.h" -#include "core/hle/service/am/applet_ae.h" -#include "core/hle/service/am/applet_oe.h" -#include "core/hle/service/am/applets/applet_cabinet.h" -#include "core/hle/service/am/applets/applet_mii_edit_types.h" -#include "core/hle/service/am/applets/applet_profile_select.h" -#include "core/hle/service/am/applets/applet_software_keyboard_types.h" -#include "core/hle/service/am/applets/applet_web_browser.h" -#include "core/hle/service/am/applets/applets.h" -#include "core/hle/service/am/idle.h" -#include "core/hle/service/am/omm.h" -#include "core/hle/service/am/spsm.h" -#include "core/hle/service/apm/apm_controller.h" -#include "core/hle/service/apm/apm_interface.h" -#include "core/hle/service/bcat/backend/backend.h" -#include "core/hle/service/caps/caps_su.h" -#include "core/hle/service/caps/caps_types.h" -#include "core/hle/service/filesystem/filesystem.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/ns/ns.h" -#include "core/hle/service/nvnflinger/fb_share_buffer_manager.h" -#include "core/hle/service/nvnflinger/nvnflinger.h" -#include "core/hle/service/pm/pm.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/sm/sm.h" -#include "core/hle/service/vi/vi.h" -#include "core/hle/service/vi/vi_results.h" #include "core/memory.h" +#include "core/result.h" +#include "kernel/k_event.h" +#include "kernel/k_transfer_memory.h" +#include "service/acc/profile_manager.h" +#include "service/am/am.h" +#include "service/am/applet_ae.h" +#include "service/am/applet_oe.h" +#include "service/am/applets/applet_cabinet.h" +#include "service/am/applets/applet_mii_edit_types.h" +#include "service/am/applets/applet_profile_select.h" +#include "service/am/applets/applet_software_keyboard_types.h" +#include "service/am/applets/applet_web_browser.h" +#include "service/am/applets/applets.h" +#include "service/am/idle.h" +#include "service/am/omm.h" +#include "service/am/spsm.h" +#include "service/apm/apm_controller.h" +#include "service/apm/apm_interface.h" +#include "service/bcat/backend/backend.h" +#include "service/caps/caps_su.h" +#include "service/caps/caps_types.h" +#include "service/filesystem/filesystem.h" +#include "service/ipc_helpers.h" +#include "service/ns/ns.h" +#include "service/nvnflinger/fb_share_buffer_manager.h" +#include "service/nvnflinger/nvnflinger.h" +#include "service/pm/pm.h" +#include "service/server_manager.h" +#include "service/sm/sm.h" +#include "service/vi/vi.h" +#include "service/vi/vi_results.h" namespace Service::AM { diff --git a/src/core/hle/service/am/am.h b/src/service/am/am.h similarity index 99% rename from src/core/hle/service/am/am.h rename to src/service/am/am.h index 8f8cb8a9e6..2b36ce937e 100644 --- a/src/core/hle/service/am/am.h +++ b/src/service/am/am.h @@ -7,8 +7,8 @@ #include #include -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/service.h" +#include "service/kernel_helpers.h" +#include "service/service.h" namespace Kernel { class KernelCore; diff --git a/src/core/hle/service/am/applet_ae.cpp b/src/service/am/applet_ae.cpp similarity index 98% rename from src/core/hle/service/am/applet_ae.cpp rename to src/service/am/applet_ae.cpp index e30e6478a9..93e1be9264 100644 --- a/src/core/hle/service/am/applet_ae.cpp +++ b/src/service/am/applet_ae.cpp @@ -3,10 +3,10 @@ #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/service/am/am.h" -#include "core/hle/service/am/applet_ae.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nvnflinger/nvnflinger.h" +#include "service/am/am.h" +#include "service/am/applet_ae.h" +#include "service/ipc_helpers.h" +#include "service/nvnflinger/nvnflinger.h" namespace Service::AM { diff --git a/src/core/hle/service/am/applet_ae.h b/src/service/am/applet_ae.h similarity index 96% rename from src/core/hle/service/am/applet_ae.h rename to src/service/am/applet_ae.h index 538ce2903a..8c7c5d9793 100644 --- a/src/core/hle/service/am/applet_ae.h +++ b/src/service/am/applet_ae.h @@ -5,7 +5,7 @@ #include -#include "core/hle/service/service.h" +#include "service/service.h" namespace Service { namespace FileSystem { diff --git a/src/core/hle/service/am/applet_oe.cpp b/src/service/am/applet_oe.cpp similarity index 96% rename from src/core/hle/service/am/applet_oe.cpp rename to src/service/am/applet_oe.cpp index d6c565d854..ff9dc2d266 100644 --- a/src/core/hle/service/am/applet_oe.cpp +++ b/src/service/am/applet_oe.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/service/am/am.h" -#include "core/hle/service/am/applet_oe.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nvnflinger/nvnflinger.h" +#include "service/am/am.h" +#include "service/am/applet_oe.h" +#include "service/ipc_helpers.h" +#include "service/nvnflinger/nvnflinger.h" namespace Service::AM { diff --git a/src/core/hle/service/am/applet_oe.h b/src/service/am/applet_oe.h similarity index 95% rename from src/core/hle/service/am/applet_oe.h rename to src/service/am/applet_oe.h index 39eccc4ab5..357006fb82 100644 --- a/src/core/hle/service/am/applet_oe.h +++ b/src/service/am/applet_oe.h @@ -5,7 +5,7 @@ #include -#include "core/hle/service/service.h" +#include "service/service.h" namespace Service { namespace FileSystem { diff --git a/src/core/hle/service/am/applets/applet_cabinet.cpp b/src/service/am/applets/applet_cabinet.cpp similarity index 95% rename from src/core/hle/service/am/applets/applet_cabinet.cpp rename to src/service/am/applets/applet_cabinet.cpp index b379dadebe..db2094830a 100644 --- a/src/core/hle/service/am/applets/applet_cabinet.cpp +++ b/src/service/am/applets/applet_cabinet.cpp @@ -6,12 +6,12 @@ #include "core/core.h" #include "core/frontend/applets/cabinet.h" #include "core/hid/hid_core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/service/am/am.h" -#include "core/hle/service/am/applets/applet_cabinet.h" -#include "core/hle/service/mii/mii_manager.h" -#include "core/hle/service/nfc/common/device.h" +#include "kernel/k_event.h" +#include "kernel/k_readable_event.h" +#include "service/am/am.h" +#include "service/am/applets/applet_cabinet.h" +#include "service/mii/mii_manager.h" +#include "service/nfc/common/device.h" namespace Service::AM::Applets { diff --git a/src/core/hle/service/am/applets/applet_cabinet.h b/src/service/am/applets/applet_cabinet.h similarity index 94% rename from src/core/hle/service/am/applets/applet_cabinet.h rename to src/service/am/applets/applet_cabinet.h index f498796f71..f8216efac5 100644 --- a/src/core/hle/service/am/applets/applet_cabinet.h +++ b/src/service/am/applets/applet_cabinet.h @@ -5,10 +5,10 @@ #include -#include "core/hle/result.h" -#include "core/hle/service/am/applets/applets.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/nfp/nfp_types.h" +#include "core/result.h" +#include "service/am/applets/applets.h" +#include "service/kernel_helpers.h" +#include "service/nfp/nfp_types.h" namespace Kernel { class KEvent; diff --git a/src/core/hle/service/am/applets/applet_controller.cpp b/src/service/am/applets/applet_controller.cpp similarity index 98% rename from src/core/hle/service/am/applets/applet_controller.cpp rename to src/service/am/applets/applet_controller.cpp index 9840d2547b..9bc2dff2de 100644 --- a/src/core/hle/service/am/applets/applet_controller.cpp +++ b/src/service/am/applets/applet_controller.cpp @@ -12,10 +12,10 @@ #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" #include "core/hid/hid_types.h" -#include "core/hle/result.h" -#include "core/hle/service/am/am.h" -#include "core/hle/service/am/applets/applet_controller.h" -#include "core/hle/service/hid/controllers/npad.h" +#include "core/result.h" +#include "service/am/am.h" +#include "service/am/applets/applet_controller.h" +#include "service/hid/controllers/npad.h" namespace Service::AM::Applets { diff --git a/src/core/hle/service/am/applets/applet_controller.h b/src/service/am/applets/applet_controller.h similarity index 98% rename from src/core/hle/service/am/applets/applet_controller.h rename to src/service/am/applets/applet_controller.h index f6c64f6331..d92e193ebb 100644 --- a/src/core/hle/service/am/applets/applet_controller.h +++ b/src/service/am/applets/applet_controller.h @@ -8,8 +8,8 @@ #include "common/common_funcs.h" #include "common/common_types.h" -#include "core/hle/result.h" -#include "core/hle/service/am/applets/applets.h" +#include "core/result.h" +#include "service/am/applets/applets.h" namespace Core { class System; diff --git a/src/core/hle/service/am/applets/applet_error.cpp b/src/service/am/applets/applet_error.cpp similarity index 98% rename from src/core/hle/service/am/applets/applet_error.cpp rename to src/service/am/applets/applet_error.cpp index 5d17c353f6..21bdcbcf8d 100644 --- a/src/core/hle/service/am/applets/applet_error.cpp +++ b/src/service/am/applets/applet_error.cpp @@ -8,9 +8,9 @@ #include "common/string_util.h" #include "core/core.h" #include "core/frontend/applets/error.h" -#include "core/hle/service/am/am.h" -#include "core/hle/service/am/applets/applet_error.h" #include "core/reporter.h" +#include "service/am/am.h" +#include "service/am/applets/applet_error.h" namespace Service::AM::Applets { diff --git a/src/core/hle/service/am/applets/applet_error.h b/src/service/am/applets/applet_error.h similarity index 93% rename from src/core/hle/service/am/applets/applet_error.h rename to src/service/am/applets/applet_error.h index d822a32bbe..10ad704ed3 100644 --- a/src/core/hle/service/am/applets/applet_error.h +++ b/src/service/am/applets/applet_error.h @@ -3,8 +3,8 @@ #pragma once -#include "core/hle/result.h" -#include "core/hle/service/am/applets/applets.h" +#include "core/result.h" +#include "service/am/applets/applets.h" namespace Core { class System; diff --git a/src/core/hle/service/am/applets/applet_general_backend.cpp b/src/service/am/applets/applet_general_backend.cpp similarity index 98% rename from src/core/hle/service/am/applets/applet_general_backend.cpp rename to src/service/am/applets/applet_general_backend.cpp index c0032f652b..b53155d20b 100644 --- a/src/core/hle/service/am/applets/applet_general_backend.cpp +++ b/src/service/am/applets/applet_general_backend.cpp @@ -6,10 +6,10 @@ #include "common/logging/log.h" #include "core/core.h" #include "core/frontend/applets/general_frontend.h" -#include "core/hle/result.h" -#include "core/hle/service/am/am.h" -#include "core/hle/service/am/applets/applet_general_backend.h" #include "core/reporter.h" +#include "core/result.h" +#include "service/am/am.h" +#include "service/am/applets/applet_general_backend.h" namespace Service::AM::Applets { diff --git a/src/core/hle/service/am/applets/applet_general_backend.h b/src/service/am/applets/applet_general_backend.h similarity index 97% rename from src/core/hle/service/am/applets/applet_general_backend.h rename to src/service/am/applets/applet_general_backend.h index 34ecaebb91..56ab508923 100644 --- a/src/core/hle/service/am/applets/applet_general_backend.h +++ b/src/service/am/applets/applet_general_backend.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/am/applets/applets.h" +#include "service/am/applets/applets.h" namespace Core { class System; diff --git a/src/core/hle/service/am/applets/applet_mii_edit.cpp b/src/service/am/applets/applet_mii_edit.cpp similarity index 96% rename from src/core/hle/service/am/applets/applet_mii_edit.cpp rename to src/service/am/applets/applet_mii_edit.cpp index 50adc7c02e..80bbfe4bec 100644 --- a/src/core/hle/service/am/applets/applet_mii_edit.cpp +++ b/src/service/am/applets/applet_mii_edit.cpp @@ -5,11 +5,11 @@ #include "common/logging/log.h" #include "core/core.h" #include "core/frontend/applets/mii_edit.h" -#include "core/hle/service/am/am.h" -#include "core/hle/service/am/applets/applet_mii_edit.h" -#include "core/hle/service/mii/mii.h" -#include "core/hle/service/mii/mii_manager.h" -#include "core/hle/service/sm/sm.h" +#include "service/am/am.h" +#include "service/am/applets/applet_mii_edit.h" +#include "service/mii/mii.h" +#include "service/mii/mii_manager.h" +#include "service/sm/sm.h" namespace Service::AM::Applets { diff --git a/src/core/hle/service/am/applets/applet_mii_edit.h b/src/service/am/applets/applet_mii_edit.h similarity index 90% rename from src/core/hle/service/am/applets/applet_mii_edit.h rename to src/service/am/applets/applet_mii_edit.h index 7ff34af494..512218b7eb 100644 --- a/src/core/hle/service/am/applets/applet_mii_edit.h +++ b/src/service/am/applets/applet_mii_edit.h @@ -3,9 +3,9 @@ #pragma once -#include "core/hle/result.h" -#include "core/hle/service/am/applets/applet_mii_edit_types.h" -#include "core/hle/service/am/applets/applets.h" +#include "core/result.h" +#include "service/am/applets/applet_mii_edit_types.h" +#include "service/am/applets/applets.h" namespace Core { class System; diff --git a/src/core/hle/service/am/applets/applet_mii_edit_types.h b/src/service/am/applets/applet_mii_edit_types.h similarity index 97% rename from src/core/hle/service/am/applets/applet_mii_edit_types.h rename to src/service/am/applets/applet_mii_edit_types.h index f3d7640732..b156634e94 100644 --- a/src/core/hle/service/am/applets/applet_mii_edit_types.h +++ b/src/service/am/applets/applet_mii_edit_types.h @@ -8,7 +8,7 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "common/uuid.h" -#include "core/hle/service/mii/types/char_info.h" +#include "service/mii/types/char_info.h" namespace Service::AM::Applets { diff --git a/src/core/hle/service/am/applets/applet_profile_select.cpp b/src/service/am/applets/applet_profile_select.cpp similarity index 96% rename from src/core/hle/service/am/applets/applet_profile_select.cpp rename to src/service/am/applets/applet_profile_select.cpp index 89cb323e9d..f18b5839a5 100644 --- a/src/core/hle/service/am/applets/applet_profile_select.cpp +++ b/src/service/am/applets/applet_profile_select.cpp @@ -7,9 +7,9 @@ #include "common/string_util.h" #include "core/core.h" #include "core/frontend/applets/profile_select.h" -#include "core/hle/service/acc/errors.h" -#include "core/hle/service/am/am.h" -#include "core/hle/service/am/applets/applet_profile_select.h" +#include "service/acc/errors.h" +#include "service/am/am.h" +#include "service/am/applets/applet_profile_select.h" namespace Service::AM::Applets { diff --git a/src/core/hle/service/am/applets/applet_profile_select.h b/src/service/am/applets/applet_profile_select.h similarity index 98% rename from src/core/hle/service/am/applets/applet_profile_select.h rename to src/service/am/applets/applet_profile_select.h index 369f9250f3..d1b16828b7 100644 --- a/src/core/hle/service/am/applets/applet_profile_select.h +++ b/src/service/am/applets/applet_profile_select.h @@ -7,8 +7,8 @@ #include "common/common_funcs.h" #include "common/uuid.h" -#include "core/hle/result.h" -#include "core/hle/service/am/applets/applets.h" +#include "core/result.h" +#include "service/am/applets/applets.h" namespace Core { class System; diff --git a/src/core/hle/service/am/applets/applet_software_keyboard.cpp b/src/service/am/applets/applet_software_keyboard.cpp similarity index 99% rename from src/core/hle/service/am/applets/applet_software_keyboard.cpp rename to src/service/am/applets/applet_software_keyboard.cpp index 4145bb84f0..8a6054bacc 100644 --- a/src/core/hle/service/am/applets/applet_software_keyboard.cpp +++ b/src/service/am/applets/applet_software_keyboard.cpp @@ -4,8 +4,8 @@ #include "common/string_util.h" #include "core/core.h" #include "core/frontend/applets/software_keyboard.h" -#include "core/hle/service/am/am.h" -#include "core/hle/service/am/applets/applet_software_keyboard.h" +#include "service/am/am.h" +#include "service/am/applets/applet_software_keyboard.h" namespace Service::AM::Applets { diff --git a/src/core/hle/service/am/applets/applet_software_keyboard.h b/src/service/am/applets/applet_software_keyboard.h similarity index 97% rename from src/core/hle/service/am/applets/applet_software_keyboard.h rename to src/service/am/applets/applet_software_keyboard.h index 2e919811b9..37c919810a 100644 --- a/src/core/hle/service/am/applets/applet_software_keyboard.h +++ b/src/service/am/applets/applet_software_keyboard.h @@ -4,9 +4,9 @@ #pragma once #include "common/common_types.h" -#include "core/hle/result.h" -#include "core/hle/service/am/applets/applet_software_keyboard_types.h" -#include "core/hle/service/am/applets/applets.h" +#include "core/result.h" +#include "service/am/applets/applet_software_keyboard_types.h" +#include "service/am/applets/applets.h" namespace Core { class System; diff --git a/src/core/hle/service/am/applets/applet_software_keyboard_types.h b/src/service/am/applets/applet_software_keyboard_types.h similarity index 100% rename from src/core/hle/service/am/applets/applet_software_keyboard_types.h rename to src/service/am/applets/applet_software_keyboard_types.h diff --git a/src/core/hle/service/am/applets/applet_web_browser.cpp b/src/service/am/applets/applet_web_browser.cpp similarity index 98% rename from src/core/hle/service/am/applets/applet_web_browser.cpp rename to src/service/am/applets/applet_web_browser.cpp index b0ea2b3816..efaadca0fb 100644 --- a/src/core/hle/service/am/applets/applet_web_browser.cpp +++ b/src/service/am/applets/applet_web_browser.cpp @@ -17,12 +17,12 @@ #include "core/file_sys/system_archive/system_archive.h" #include "core/file_sys/vfs_vector.h" #include "core/frontend/applets/web_browser.h" -#include "core/hle/result.h" -#include "core/hle/service/am/am.h" -#include "core/hle/service/am/applets/applet_web_browser.h" -#include "core/hle/service/filesystem/filesystem.h" -#include "core/hle/service/ns/iplatform_service_manager.h" #include "core/loader/loader.h" +#include "core/result.h" +#include "service/am/am.h" +#include "service/am/applets/applet_web_browser.h" +#include "service/filesystem/filesystem.h" +#include "service/ns/iplatform_service_manager.h" namespace Service::AM::Applets { diff --git a/src/core/hle/service/am/applets/applet_web_browser.h b/src/service/am/applets/applet_web_browser.h similarity index 93% rename from src/core/hle/service/am/applets/applet_web_browser.h rename to src/service/am/applets/applet_web_browser.h index 99fe186590..84c2346645 100644 --- a/src/core/hle/service/am/applets/applet_web_browser.h +++ b/src/service/am/applets/applet_web_browser.h @@ -8,9 +8,9 @@ #include "common/common_types.h" #include "core/file_sys/vfs_types.h" -#include "core/hle/result.h" -#include "core/hle/service/am/applets/applet_web_browser_types.h" -#include "core/hle/service/am/applets/applets.h" +#include "core/result.h" +#include "service/am/applets/applet_web_browser_types.h" +#include "service/am/applets/applets.h" namespace Core { class System; diff --git a/src/core/hle/service/am/applets/applet_web_browser_types.h b/src/service/am/applets/applet_web_browser_types.h similarity index 100% rename from src/core/hle/service/am/applets/applet_web_browser_types.h rename to src/service/am/applets/applet_web_browser_types.h diff --git a/src/core/hle/service/am/applets/applets.cpp b/src/service/am/applets/applets.cpp similarity index 93% rename from src/core/hle/service/am/applets/applets.cpp rename to src/service/am/applets/applets.cpp index 89d5434afd..92467cbcb1 100644 --- a/src/core/hle/service/am/applets/applets.cpp +++ b/src/service/am/applets/applets.cpp @@ -13,20 +13,20 @@ #include "core/frontend/applets/profile_select.h" #include "core/frontend/applets/software_keyboard.h" #include "core/frontend/applets/web_browser.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/am/am.h" -#include "core/hle/service/am/applet_ae.h" -#include "core/hle/service/am/applet_oe.h" -#include "core/hle/service/am/applets/applet_cabinet.h" -#include "core/hle/service/am/applets/applet_controller.h" -#include "core/hle/service/am/applets/applet_error.h" -#include "core/hle/service/am/applets/applet_general_backend.h" -#include "core/hle/service/am/applets/applet_mii_edit.h" -#include "core/hle/service/am/applets/applet_profile_select.h" -#include "core/hle/service/am/applets/applet_software_keyboard.h" -#include "core/hle/service/am/applets/applet_web_browser.h" -#include "core/hle/service/am/applets/applets.h" -#include "core/hle/service/sm/sm.h" +#include "kernel/k_event.h" +#include "service/am/am.h" +#include "service/am/applet_ae.h" +#include "service/am/applet_oe.h" +#include "service/am/applets/applet_cabinet.h" +#include "service/am/applets/applet_controller.h" +#include "service/am/applets/applet_error.h" +#include "service/am/applets/applet_general_backend.h" +#include "service/am/applets/applet_mii_edit.h" +#include "service/am/applets/applet_profile_select.h" +#include "service/am/applets/applet_software_keyboard.h" +#include "service/am/applets/applet_web_browser.h" +#include "service/am/applets/applets.h" +#include "service/sm/sm.h" namespace Service::AM::Applets { diff --git a/src/core/hle/service/am/applets/applets.h b/src/service/am/applets/applets.h similarity index 99% rename from src/core/hle/service/am/applets/applets.h rename to src/service/am/applets/applets.h index 0bf2598b76..b1ae90b5b5 100644 --- a/src/core/hle/service/am/applets/applets.h +++ b/src/service/am/applets/applets.h @@ -7,7 +7,7 @@ #include #include "common/swap.h" -#include "core/hle/service/kernel_helpers.h" +#include "service/kernel_helpers.h" union Result; diff --git a/src/core/hle/service/am/idle.cpp b/src/service/am/idle.cpp similarity index 94% rename from src/core/hle/service/am/idle.cpp rename to src/service/am/idle.cpp index 6035152843..0bc9754500 100644 --- a/src/core/hle/service/am/idle.cpp +++ b/src/service/am/idle.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/am/idle.h" +#include "service/am/idle.h" namespace Service::AM { diff --git a/src/core/hle/service/am/idle.h b/src/service/am/idle.h similarity index 90% rename from src/core/hle/service/am/idle.h rename to src/service/am/idle.h index 15b31f67ee..d41a483e8b 100644 --- a/src/core/hle/service/am/idle.h +++ b/src/service/am/idle.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/am/omm.cpp b/src/service/am/omm.cpp similarity index 98% rename from src/core/hle/service/am/omm.cpp rename to src/service/am/omm.cpp index 66824e4955..308483b079 100644 --- a/src/core/hle/service/am/omm.cpp +++ b/src/service/am/omm.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/am/omm.h" +#include "service/am/omm.h" namespace Service::AM { diff --git a/src/core/hle/service/am/omm.h b/src/service/am/omm.h similarity index 89% rename from src/core/hle/service/am/omm.h rename to src/service/am/omm.h index 73d0c82d53..207635d4ca 100644 --- a/src/core/hle/service/am/omm.h +++ b/src/service/am/omm.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/am/spsm.cpp b/src/service/am/spsm.cpp similarity index 96% rename from src/core/hle/service/am/spsm.cpp rename to src/service/am/spsm.cpp index ec581e32b0..1bca2c3166 100644 --- a/src/core/hle/service/am/spsm.cpp +++ b/src/service/am/spsm.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/am/spsm.h" +#include "service/am/spsm.h" namespace Service::AM { diff --git a/src/core/hle/service/am/spsm.h b/src/service/am/spsm.h similarity index 89% rename from src/core/hle/service/am/spsm.h rename to src/service/am/spsm.h index 922f8863ea..276a064a53 100644 --- a/src/core/hle/service/am/spsm.h +++ b/src/service/am/spsm.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/service/aoc/aoc_u.cpp similarity index 98% rename from src/core/hle/service/aoc/aoc_u.cpp rename to src/service/aoc/aoc_u.cpp index 7075ab8006..5a139a00d0 100644 --- a/src/core/hle/service/aoc/aoc_u.cpp +++ b/src/service/aoc/aoc_u.cpp @@ -14,11 +14,11 @@ #include "core/file_sys/nca_metadata.h" #include "core/file_sys/patch_manager.h" #include "core/file_sys/registered_cache.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/aoc/aoc_u.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/server_manager.h" #include "core/loader/loader.h" +#include "kernel/k_event.h" +#include "service/aoc/aoc_u.h" +#include "service/ipc_helpers.h" +#include "service/server_manager.h" namespace Service::AOC { diff --git a/src/core/hle/service/aoc/aoc_u.h b/src/service/aoc/aoc_u.h similarity index 93% rename from src/core/hle/service/aoc/aoc_u.h rename to src/service/aoc/aoc_u.h index 12ccfeb6a3..b3d2b72d8b 100644 --- a/src/core/hle/service/aoc/aoc_u.h +++ b/src/service/aoc/aoc_u.h @@ -3,8 +3,8 @@ #pragma once -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/service.h" +#include "service/kernel_helpers.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/apm/apm.cpp b/src/service/apm/apm.cpp similarity index 86% rename from src/core/hle/service/apm/apm.cpp rename to src/service/apm/apm.cpp index c23ff293d3..ac11079641 100644 --- a/src/core/hle/service/apm/apm.cpp +++ b/src/service/apm/apm.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/service/apm/apm.h" -#include "core/hle/service/apm/apm_interface.h" -#include "core/hle/service/server_manager.h" +#include "service/apm/apm.h" +#include "service/apm/apm_interface.h" +#include "service/server_manager.h" namespace Service::APM { diff --git a/src/core/hle/service/apm/apm.h b/src/service/apm/apm.h similarity index 100% rename from src/core/hle/service/apm/apm.h rename to src/service/apm/apm.h diff --git a/src/core/hle/service/apm/apm_controller.cpp b/src/service/apm/apm_controller.cpp similarity index 98% rename from src/core/hle/service/apm/apm_controller.cpp rename to src/service/apm/apm_controller.cpp index 4f1aa5cc27..2a2edfe6cc 100644 --- a/src/core/hle/service/apm/apm_controller.cpp +++ b/src/service/apm/apm_controller.cpp @@ -9,7 +9,7 @@ #include "common/settings.h" #include "common/settings_enums.h" #include "core/core_timing.h" -#include "core/hle/service/apm/apm_controller.h" +#include "service/apm/apm_controller.h" namespace Service::APM { diff --git a/src/core/hle/service/apm/apm_controller.h b/src/service/apm/apm_controller.h similarity index 100% rename from src/core/hle/service/apm/apm_controller.h rename to src/service/apm/apm_controller.h diff --git a/src/core/hle/service/apm/apm_interface.cpp b/src/service/apm/apm_interface.cpp similarity index 96% rename from src/core/hle/service/apm/apm_interface.cpp rename to src/service/apm/apm_interface.cpp index d29051ee77..cfb9e214f3 100644 --- a/src/core/hle/service/apm/apm_interface.cpp +++ b/src/service/apm/apm_interface.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/service/apm/apm.h" -#include "core/hle/service/apm/apm_controller.h" -#include "core/hle/service/apm/apm_interface.h" -#include "core/hle/service/ipc_helpers.h" +#include "service/apm/apm.h" +#include "service/apm/apm_controller.h" +#include "service/apm/apm_interface.h" +#include "service/ipc_helpers.h" namespace Service::APM { diff --git a/src/core/hle/service/apm/apm_interface.h b/src/service/apm/apm_interface.h similarity index 96% rename from src/core/hle/service/apm/apm_interface.h rename to src/service/apm/apm_interface.h index 58718453b6..4e07eb03ba 100644 --- a/src/core/hle/service/apm/apm_interface.h +++ b/src/service/apm/apm_interface.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Service::APM { diff --git a/src/core/hle/service/audio/audctl.cpp b/src/service/audio/audctl.cpp similarity index 98% rename from src/core/hle/service/audio/audctl.cpp rename to src/service/audio/audctl.cpp index 66dd64fd1a..531fdb58de 100644 --- a/src/core/hle/service/audio/audctl.cpp +++ b/src/service/audio/audctl.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/service/audio/audctl.h" -#include "core/hle/service/ipc_helpers.h" +#include "service/audio/audctl.h" +#include "service/ipc_helpers.h" namespace Service::Audio { diff --git a/src/core/hle/service/audio/audctl.h b/src/service/audio/audctl.h similarity index 96% rename from src/core/hle/service/audio/audctl.h rename to src/service/audio/audctl.h index d57abb3836..51611c8863 100644 --- a/src/core/hle/service/audio/audctl.h +++ b/src/service/audio/audctl.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/audio/audin_u.cpp b/src/service/audio/audin_u.cpp similarity index 99% rename from src/core/hle/service/audio/audin_u.cpp rename to src/service/audio/audin_u.cpp index 56fee45919..f81f42e41f 100644 --- a/src/core/hle/service/audio/audin_u.cpp +++ b/src/service/audio/audin_u.cpp @@ -8,9 +8,9 @@ #include "common/scratch_buffer.h" #include "common/string_util.h" #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/audio/audin_u.h" -#include "core/hle/service/ipc_helpers.h" +#include "kernel/k_event.h" +#include "service/audio/audin_u.h" +#include "service/ipc_helpers.h" namespace Service::Audio { using namespace AudioCore::AudioIn; diff --git a/src/core/hle/service/audio/audin_u.h b/src/service/audio/audin_u.h similarity index 91% rename from src/core/hle/service/audio/audin_u.h rename to src/service/audio/audin_u.h index 51e770ff98..0f9830528c 100644 --- a/src/core/hle/service/audio/audin_u.h +++ b/src/service/audio/audin_u.h @@ -5,8 +5,8 @@ #include "audio_core/audio_in_manager.h" #include "audio_core/in/audio_in.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/service.h" +#include "service/kernel_helpers.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/audio/audio.cpp b/src/service/audio/audio.cpp similarity index 69% rename from src/core/hle/service/audio/audio.cpp rename to src/service/audio/audio.cpp index dccd16309f..5aa10cafd3 100644 --- a/src/core/hle/service/audio/audio.cpp +++ b/src/service/audio/audio.cpp @@ -2,16 +2,16 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/service/audio/audctl.h" -#include "core/hle/service/audio/audin_u.h" -#include "core/hle/service/audio/audio.h" -#include "core/hle/service/audio/audout_u.h" -#include "core/hle/service/audio/audrec_a.h" -#include "core/hle/service/audio/audrec_u.h" -#include "core/hle/service/audio/audren_u.h" -#include "core/hle/service/audio/hwopus.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "service/audio/audctl.h" +#include "service/audio/audin_u.h" +#include "service/audio/audio.h" +#include "service/audio/audout_u.h" +#include "service/audio/audrec_a.h" +#include "service/audio/audrec_u.h" +#include "service/audio/audren_u.h" +#include "service/audio/hwopus.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::Audio { diff --git a/src/core/hle/service/audio/audio.h b/src/service/audio/audio.h similarity index 100% rename from src/core/hle/service/audio/audio.h rename to src/service/audio/audio.h diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/service/audio/audout_u.cpp similarity index 98% rename from src/core/hle/service/audio/audout_u.cpp rename to src/service/audio/audout_u.cpp index ca683d72c7..5f1a64198e 100644 --- a/src/core/hle/service/audio/audout_u.cpp +++ b/src/service/audio/audout_u.cpp @@ -13,11 +13,11 @@ #include "common/string_util.h" #include "common/swap.h" #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/audio/audout_u.h" -#include "core/hle/service/audio/errors.h" -#include "core/hle/service/ipc_helpers.h" #include "core/memory.h" +#include "kernel/k_event.h" +#include "service/audio/audout_u.h" +#include "service/audio/errors.h" +#include "service/ipc_helpers.h" namespace Service::Audio { using namespace AudioCore::AudioOut; diff --git a/src/core/hle/service/audio/audout_u.h b/src/service/audio/audout_u.h similarity index 90% rename from src/core/hle/service/audio/audout_u.h rename to src/service/audio/audout_u.h index 8f288c6e09..b7d39d83e2 100644 --- a/src/core/hle/service/audio/audout_u.h +++ b/src/service/audio/audout_u.h @@ -5,8 +5,8 @@ #include "audio_core/audio_out_manager.h" #include "audio_core/out/audio_out.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/service.h" +#include "service/kernel_helpers.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/audio/audrec_a.cpp b/src/service/audio/audrec_a.cpp similarity index 91% rename from src/core/hle/service/audio/audrec_a.cpp rename to src/service/audio/audrec_a.cpp index fa82e9ac73..7930f6c4d1 100644 --- a/src/core/hle/service/audio/audrec_a.cpp +++ b/src/service/audio/audrec_a.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/audio/audrec_a.h" +#include "service/audio/audrec_a.h" namespace Service::Audio { diff --git a/src/core/hle/service/audio/audrec_a.h b/src/service/audio/audrec_a.h similarity index 90% rename from src/core/hle/service/audio/audrec_a.h rename to src/service/audio/audrec_a.h index 9edf89f6c9..07661d57f3 100644 --- a/src/core/hle/service/audio/audrec_a.h +++ b/src/service/audio/audrec_a.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/audio/audrec_u.cpp b/src/service/audio/audrec_u.cpp similarity index 97% rename from src/core/hle/service/audio/audrec_u.cpp rename to src/service/audio/audrec_u.cpp index bc55cec171..0d0bc21114 100644 --- a/src/core/hle/service/audio/audrec_u.cpp +++ b/src/service/audio/audrec_u.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/audio/audrec_u.h" +#include "service/audio/audrec_u.h" namespace Service::Audio { diff --git a/src/core/hle/service/audio/audrec_u.h b/src/service/audio/audrec_u.h similarity index 90% rename from src/core/hle/service/audio/audrec_u.h rename to src/service/audio/audrec_u.h index 8b48178847..3fc422d414 100644 --- a/src/core/hle/service/audio/audrec_u.h +++ b/src/service/audio/audrec_u.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/service/audio/audren_u.cpp similarity index 98% rename from src/core/hle/service/audio/audren_u.cpp rename to src/service/audio/audren_u.cpp index 2f09cade55..c71ba6d350 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/service/audio/audren_u.cpp @@ -18,13 +18,13 @@ #include "common/scratch_buffer.h" #include "common/string_util.h" #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_transfer_memory.h" -#include "core/hle/service/audio/audren_u.h" -#include "core/hle/service/audio/errors.h" -#include "core/hle/service/ipc_helpers.h" #include "core/memory.h" +#include "kernel/k_event.h" +#include "kernel/k_process.h" +#include "kernel/k_transfer_memory.h" +#include "service/audio/audren_u.h" +#include "service/audio/errors.h" +#include "service/ipc_helpers.h" using namespace AudioCore::Renderer; diff --git a/src/core/hle/service/audio/audren_u.h b/src/service/audio/audren_u.h similarity index 91% rename from src/core/hle/service/audio/audren_u.h rename to src/service/audio/audren_u.h index 3d7993a169..52c1d99a63 100644 --- a/src/core/hle/service/audio/audren_u.h +++ b/src/service/audio/audren_u.h @@ -5,8 +5,8 @@ #include "audio_core/audio_render_manager.h" #include "common/scratch_buffer.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/service.h" +#include "service/kernel_helpers.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/audio/errors.h b/src/service/audio/errors.h similarity index 98% rename from src/core/hle/service/audio/errors.h rename to src/service/audio/errors.h index c41345f7e7..9e3f0094e8 100644 --- a/src/core/hle/service/audio/errors.h +++ b/src/service/audio/errors.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/result.h" +#include "core/result.h" namespace Service::Audio { diff --git a/src/core/hle/service/audio/hwopus.cpp b/src/service/audio/hwopus.cpp similarity index 99% rename from src/core/hle/service/audio/hwopus.cpp rename to src/service/audio/hwopus.cpp index 6a7bf94162..e1dd9b785e 100644 --- a/src/core/hle/service/audio/hwopus.cpp +++ b/src/service/audio/hwopus.cpp @@ -10,8 +10,8 @@ #include "common/logging/log.h" #include "common/scratch_buffer.h" #include "core/core.h" -#include "core/hle/service/audio/hwopus.h" -#include "core/hle/service/ipc_helpers.h" +#include "service/audio/hwopus.h" +#include "service/ipc_helpers.h" namespace Service::Audio { using namespace AudioCore::OpusDecoder; diff --git a/src/core/hle/service/audio/hwopus.h b/src/service/audio/hwopus.h similarity index 96% rename from src/core/hle/service/audio/hwopus.h rename to src/service/audio/hwopus.h index d3960065e7..bf2e443368 100644 --- a/src/core/hle/service/audio/hwopus.h +++ b/src/service/audio/hwopus.h @@ -4,7 +4,7 @@ #pragma once #include "audio_core/opus/decoder_manager.h" -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/bcat/backend/backend.cpp b/src/service/bcat/backend/backend.cpp similarity index 97% rename from src/core/hle/service/bcat/backend/backend.cpp rename to src/service/bcat/backend/backend.cpp index 847f769874..74461f835e 100644 --- a/src/core/hle/service/bcat/backend/backend.cpp +++ b/src/service/bcat/backend/backend.cpp @@ -4,8 +4,8 @@ #include "common/hex_util.h" #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/bcat/backend/backend.h" +#include "kernel/k_event.h" +#include "service/bcat/backend/backend.h" namespace Service::BCAT { diff --git a/src/core/hle/service/bcat/backend/backend.h b/src/service/bcat/backend/backend.h similarity index 98% rename from src/core/hle/service/bcat/backend/backend.h rename to src/service/bcat/backend/backend.h index 205ed07025..1bb880943e 100644 --- a/src/core/hle/service/bcat/backend/backend.h +++ b/src/service/bcat/backend/backend.h @@ -9,8 +9,8 @@ #include "common/common_types.h" #include "core/file_sys/vfs_types.h" -#include "core/hle/result.h" -#include "core/hle/service/kernel_helpers.h" +#include "core/result.h" +#include "service/kernel_helpers.h" namespace Core { class System; diff --git a/src/core/hle/service/bcat/bcat.cpp b/src/service/bcat/bcat.cpp similarity index 95% rename from src/core/hle/service/bcat/bcat.cpp rename to src/service/bcat/bcat.cpp index d0ac173241..fa33c013c9 100644 --- a/src/core/hle/service/bcat/bcat.cpp +++ b/src/service/bcat/bcat.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/bcat/bcat.h" +#include "service/bcat/bcat.h" namespace Service::BCAT { diff --git a/src/core/hle/service/bcat/bcat.h b/src/service/bcat/bcat.h similarity index 90% rename from src/core/hle/service/bcat/bcat.h rename to src/service/bcat/bcat.h index db9d3c8c52..655564776e 100644 --- a/src/core/hle/service/bcat/bcat.h +++ b/src/service/bcat/bcat.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/bcat/bcat_module.h" +#include "service/bcat/bcat_module.h" namespace Core { class System; diff --git a/src/core/hle/service/bcat/bcat_module.cpp b/src/service/bcat/bcat_module.cpp similarity index 98% rename from src/core/hle/service/bcat/bcat_module.cpp rename to src/service/bcat/bcat_module.cpp index a6281913a0..0d4bccf466 100644 --- a/src/core/hle/service/bcat/bcat_module.cpp +++ b/src/service/bcat/bcat_module.cpp @@ -9,13 +9,13 @@ #include "common/string_util.h" #include "core/core.h" #include "core/file_sys/vfs.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/service/bcat/backend/backend.h" -#include "core/hle/service/bcat/bcat.h" -#include "core/hle/service/bcat/bcat_module.h" -#include "core/hle/service/filesystem/filesystem.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/server_manager.h" +#include "kernel/k_readable_event.h" +#include "service/bcat/backend/backend.h" +#include "service/bcat/bcat.h" +#include "service/bcat/bcat_module.h" +#include "service/filesystem/filesystem.h" +#include "service/ipc_helpers.h" +#include "service/server_manager.h" namespace Service::BCAT { diff --git a/src/core/hle/service/bcat/bcat_module.h b/src/service/bcat/bcat_module.h similarity index 96% rename from src/core/hle/service/bcat/bcat_module.h rename to src/service/bcat/bcat_module.h index 87576288b3..e9785afb17 100644 --- a/src/core/hle/service/bcat/bcat_module.h +++ b/src/service/bcat/bcat_module.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/bpc/bpc.cpp b/src/service/bpc/bpc.cpp similarity index 94% rename from src/core/hle/service/bpc/bpc.cpp rename to src/service/bpc/bpc.cpp index 91b15e256c..fd90678796 100644 --- a/src/core/hle/service/bpc/bpc.cpp +++ b/src/service/bpc/bpc.cpp @@ -3,9 +3,9 @@ #include -#include "core/hle/service/bpc/bpc.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "service/bpc/bpc.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::BPC { diff --git a/src/core/hle/service/bpc/bpc.h b/src/service/bpc/bpc.h similarity index 100% rename from src/core/hle/service/bpc/bpc.h rename to src/service/bpc/bpc.h diff --git a/src/core/hle/service/btdrv/btdrv.cpp b/src/service/btdrv/btdrv.cpp similarity index 96% rename from src/core/hle/service/btdrv/btdrv.cpp rename to src/service/btdrv/btdrv.cpp index 38cdd57ad0..979c6fd4ef 100644 --- a/src/core/hle/service/btdrv/btdrv.cpp +++ b/src/service/btdrv/btdrv.cpp @@ -3,13 +3,13 @@ #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/btdrv/btdrv.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" +#include "kernel/k_event.h" +#include "service/btdrv/btdrv.h" +#include "service/ipc_helpers.h" +#include "service/kernel_helpers.h" +#include "service/server_manager.h" +#include "service/service.h" +#include "service/sm/sm.h" namespace Service::BtDrv { diff --git a/src/core/hle/service/btdrv/btdrv.h b/src/service/btdrv/btdrv.h similarity index 100% rename from src/core/hle/service/btdrv/btdrv.h rename to src/service/btdrv/btdrv.h diff --git a/src/core/hle/service/btm/btm.cpp b/src/service/btm/btm.cpp similarity index 98% rename from src/core/hle/service/btm/btm.cpp rename to src/service/btm/btm.cpp index 8069f75b7b..bd28e12beb 100644 --- a/src/core/hle/service/btm/btm.cpp +++ b/src/service/btm/btm.cpp @@ -5,12 +5,12 @@ #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/btm/btm.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "kernel/k_event.h" +#include "service/btm/btm.h" +#include "service/ipc_helpers.h" +#include "service/kernel_helpers.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::BTM { diff --git a/src/core/hle/service/btm/btm.h b/src/service/btm/btm.h similarity index 100% rename from src/core/hle/service/btm/btm.h rename to src/service/btm/btm.h diff --git a/src/core/hle/service/caps/caps.cpp b/src/service/caps/caps.cpp similarity index 73% rename from src/core/hle/service/caps/caps.cpp rename to src/service/caps/caps.cpp index cd1dfe9939..86026aef2d 100644 --- a/src/core/hle/service/caps/caps.cpp +++ b/src/service/caps/caps.cpp @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/caps/caps.h" -#include "core/hle/service/caps/caps_a.h" -#include "core/hle/service/caps/caps_c.h" -#include "core/hle/service/caps/caps_manager.h" -#include "core/hle/service/caps/caps_sc.h" -#include "core/hle/service/caps/caps_ss.h" -#include "core/hle/service/caps/caps_su.h" -#include "core/hle/service/caps/caps_u.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "service/caps/caps.h" +#include "service/caps/caps_a.h" +#include "service/caps/caps_c.h" +#include "service/caps/caps_manager.h" +#include "service/caps/caps_sc.h" +#include "service/caps/caps_ss.h" +#include "service/caps/caps_su.h" +#include "service/caps/caps_u.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::Capture { diff --git a/src/core/hle/service/caps/caps.h b/src/service/caps/caps.h similarity index 100% rename from src/core/hle/service/caps/caps.h rename to src/service/caps/caps.h diff --git a/src/core/hle/service/caps/caps_a.cpp b/src/service/caps/caps_a.cpp similarity index 97% rename from src/core/hle/service/caps/caps_a.cpp rename to src/service/caps/caps_a.cpp index 9925720a3d..f8bd6f9ffb 100644 --- a/src/core/hle/service/caps/caps_a.cpp +++ b/src/service/caps/caps_a.cpp @@ -2,11 +2,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/service/caps/caps_a.h" -#include "core/hle/service/caps/caps_manager.h" -#include "core/hle/service/caps/caps_result.h" -#include "core/hle/service/caps/caps_types.h" -#include "core/hle/service/ipc_helpers.h" +#include "service/caps/caps_a.h" +#include "service/caps/caps_manager.h" +#include "service/caps/caps_result.h" +#include "service/caps/caps_types.h" +#include "service/ipc_helpers.h" namespace Service::Capture { diff --git a/src/core/hle/service/caps/caps_a.h b/src/service/caps/caps_a.h similarity index 96% rename from src/core/hle/service/caps/caps_a.h rename to src/service/caps/caps_a.h index c90cff71e5..435ccfbd70 100644 --- a/src/core/hle/service/caps/caps_a.h +++ b/src/service/caps/caps_a.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/caps/caps_c.cpp b/src/service/caps/caps_c.cpp similarity index 90% rename from src/core/hle/service/caps/caps_c.cpp rename to src/service/caps/caps_c.cpp index 1e7fe64744..1bb0c2f91e 100644 --- a/src/core/hle/service/caps/caps_c.cpp +++ b/src/service/caps/caps_c.cpp @@ -2,11 +2,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/service/caps/caps_c.h" -#include "core/hle/service/caps/caps_manager.h" -#include "core/hle/service/caps/caps_result.h" -#include "core/hle/service/caps/caps_types.h" -#include "core/hle/service/ipc_helpers.h" +#include "service/caps/caps_c.h" +#include "service/caps/caps_manager.h" +#include "service/caps/caps_result.h" +#include "service/caps/caps_types.h" +#include "service/ipc_helpers.h" namespace Service::Capture { diff --git a/src/core/hle/service/caps/caps_c.h b/src/service/caps/caps_c.h similarity index 94% rename from src/core/hle/service/caps/caps_c.h rename to src/service/caps/caps_c.h index 92ba242db7..0dc23dbff0 100644 --- a/src/core/hle/service/caps/caps_c.h +++ b/src/service/caps/caps_c.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/caps/caps_manager.cpp b/src/service/caps/caps_manager.cpp similarity index 98% rename from src/core/hle/service/caps/caps_manager.cpp rename to src/service/caps/caps_manager.cpp index 96b225d5f9..6388342737 100644 --- a/src/core/hle/service/caps/caps_manager.cpp +++ b/src/service/caps/caps_manager.cpp @@ -8,10 +8,10 @@ #include "common/logging/log.h" #include "common/stb.h" #include "core/core.h" -#include "core/hle/service/caps/caps_manager.h" -#include "core/hle/service/caps/caps_result.h" -#include "core/hle/service/time/time_manager.h" -#include "core/hle/service/time/time_zone_content_manager.h" +#include "service/caps/caps_manager.h" +#include "service/caps/caps_result.h" +#include "service/time/time_manager.h" +#include "service/time/time_zone_content_manager.h" namespace Service::Capture { diff --git a/src/core/hle/service/caps/caps_manager.h b/src/service/caps/caps_manager.h similarity index 98% rename from src/core/hle/service/caps/caps_manager.h rename to src/service/caps/caps_manager.h index e20c70c7ba..15effb2460 100644 --- a/src/core/hle/service/caps/caps_manager.h +++ b/src/service/caps/caps_manager.h @@ -6,8 +6,8 @@ #include #include "common/fs/fs.h" -#include "core/hle/result.h" -#include "core/hle/service/caps/caps_types.h" +#include "core/result.h" +#include "service/caps/caps_types.h" namespace Core { class System; diff --git a/src/core/hle/service/caps/caps_result.h b/src/service/caps/caps_result.h similarity index 98% rename from src/core/hle/service/caps/caps_result.h rename to src/service/caps/caps_result.h index c65e5fb9af..53bd79b153 100644 --- a/src/core/hle/service/caps/caps_result.h +++ b/src/service/caps/caps_result.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/result.h" +#include "core/result.h" namespace Service::Capture { diff --git a/src/core/hle/service/caps/caps_sc.cpp b/src/service/caps/caps_sc.cpp similarity index 97% rename from src/core/hle/service/caps/caps_sc.cpp rename to src/service/caps/caps_sc.cpp index 6117cb7c6c..3f8111e135 100644 --- a/src/core/hle/service/caps/caps_sc.cpp +++ b/src/service/caps/caps_sc.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/caps/caps_sc.h" +#include "service/caps/caps_sc.h" namespace Service::Capture { diff --git a/src/core/hle/service/caps/caps_sc.h b/src/service/caps/caps_sc.h similarity index 91% rename from src/core/hle/service/caps/caps_sc.h rename to src/service/caps/caps_sc.h index d555f49792..9c4cb846a1 100644 --- a/src/core/hle/service/caps/caps_sc.h +++ b/src/service/caps/caps_sc.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/caps/caps_ss.cpp b/src/service/caps/caps_ss.cpp similarity index 95% rename from src/core/hle/service/caps/caps_ss.cpp rename to src/service/caps/caps_ss.cpp index eab023568f..91e2e83329 100644 --- a/src/core/hle/service/caps/caps_ss.cpp +++ b/src/service/caps/caps_ss.cpp @@ -2,11 +2,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/service/caps/caps_manager.h" -#include "core/hle/service/caps/caps_types.h" -#include "core/hle/service/ipc_helpers.h" +#include "service/caps/caps_manager.h" +#include "service/caps/caps_types.h" +#include "service/ipc_helpers.h" -#include "core/hle/service/caps/caps_ss.h" +#include "service/caps/caps_ss.h" namespace Service::Capture { diff --git a/src/core/hle/service/caps/caps_ss.h b/src/service/caps/caps_ss.h similarity index 94% rename from src/core/hle/service/caps/caps_ss.h rename to src/service/caps/caps_ss.h index a7e9972ab2..6c9e5fd433 100644 --- a/src/core/hle/service/caps/caps_ss.h +++ b/src/service/caps/caps_ss.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/caps/caps_su.cpp b/src/service/caps/caps_su.cpp similarity index 96% rename from src/core/hle/service/caps/caps_su.cpp rename to src/service/caps/caps_su.cpp index 296b07b003..e42aaac366 100644 --- a/src/core/hle/service/caps/caps_su.cpp +++ b/src/service/caps/caps_su.cpp @@ -3,10 +3,10 @@ #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/service/caps/caps_manager.h" -#include "core/hle/service/caps/caps_su.h" -#include "core/hle/service/caps/caps_types.h" -#include "core/hle/service/ipc_helpers.h" +#include "service/caps/caps_manager.h" +#include "service/caps/caps_su.h" +#include "service/caps/caps_types.h" +#include "service/ipc_helpers.h" #include "video_core/renderer_base.h" namespace Service::Capture { diff --git a/src/core/hle/service/caps/caps_su.h b/src/service/caps/caps_su.h similarity index 96% rename from src/core/hle/service/caps/caps_su.h rename to src/service/caps/caps_su.h index 21912e95f6..9278802788 100644 --- a/src/core/hle/service/caps/caps_su.h +++ b/src/service/caps/caps_su.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/caps/caps_types.h b/src/service/caps/caps_types.h similarity index 100% rename from src/core/hle/service/caps/caps_types.h rename to src/service/caps/caps_types.h diff --git a/src/core/hle/service/caps/caps_u.cpp b/src/service/caps/caps_u.cpp similarity index 96% rename from src/core/hle/service/caps/caps_u.cpp rename to src/service/caps/caps_u.cpp index b6b33fb2fd..f2e98d0024 100644 --- a/src/core/hle/service/caps/caps_u.cpp +++ b/src/service/caps/caps_u.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/service/caps/caps_manager.h" -#include "core/hle/service/caps/caps_types.h" -#include "core/hle/service/caps/caps_u.h" -#include "core/hle/service/ipc_helpers.h" +#include "service/caps/caps_manager.h" +#include "service/caps/caps_types.h" +#include "service/caps/caps_u.h" +#include "service/ipc_helpers.h" namespace Service::Capture { diff --git a/src/core/hle/service/caps/caps_u.h b/src/service/caps/caps_u.h similarity index 95% rename from src/core/hle/service/caps/caps_u.h rename to src/service/caps/caps_u.h index 9458c128ef..00c357403b 100644 --- a/src/core/hle/service/caps/caps_u.h +++ b/src/service/caps/caps_u.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/erpt/erpt.cpp b/src/service/erpt/erpt.cpp similarity index 93% rename from src/core/hle/service/erpt/erpt.cpp rename to src/service/erpt/erpt.cpp index 3ea862fad3..8ba0587206 100644 --- a/src/core/hle/service/erpt/erpt.cpp +++ b/src/service/erpt/erpt.cpp @@ -3,10 +3,10 @@ #include -#include "core/hle/service/erpt/erpt.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" +#include "service/erpt/erpt.h" +#include "service/server_manager.h" +#include "service/service.h" +#include "service/sm/sm.h" namespace Service::ERPT { diff --git a/src/core/hle/service/erpt/erpt.h b/src/service/erpt/erpt.h similarity index 100% rename from src/core/hle/service/erpt/erpt.h rename to src/service/erpt/erpt.h diff --git a/src/core/hle/service/es/es.cpp b/src/service/es/es.cpp similarity index 98% rename from src/core/hle/service/es/es.cpp rename to src/service/es/es.cpp index 9eaae4c4bd..b79e33c1cc 100644 --- a/src/core/hle/service/es/es.cpp +++ b/src/service/es/es.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/crypto/key_manager.h" -#include "core/hle/service/es/es.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "service/es/es.h" +#include "service/ipc_helpers.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::ES { diff --git a/src/core/hle/service/es/es.h b/src/service/es/es.h similarity index 100% rename from src/core/hle/service/es/es.h rename to src/service/es/es.h diff --git a/src/core/hle/service/eupld/eupld.cpp b/src/service/eupld/eupld.cpp similarity index 93% rename from src/core/hle/service/eupld/eupld.cpp rename to src/service/eupld/eupld.cpp index 3cf27513ae..49bcea09c9 100644 --- a/src/core/hle/service/eupld/eupld.cpp +++ b/src/service/eupld/eupld.cpp @@ -3,9 +3,9 @@ #include -#include "core/hle/service/eupld/eupld.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "service/eupld/eupld.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::EUPLD { diff --git a/src/core/hle/service/eupld/eupld.h b/src/service/eupld/eupld.h similarity index 100% rename from src/core/hle/service/eupld/eupld.h rename to src/service/eupld/eupld.h diff --git a/src/core/hle/service/fatal/fatal.cpp b/src/service/fatal/fatal.cpp similarity index 96% rename from src/core/hle/service/fatal/fatal.cpp rename to src/service/fatal/fatal.cpp index fe2ed8df87..bd1c60decd 100644 --- a/src/core/hle/service/fatal/fatal.cpp +++ b/src/service/fatal/fatal.cpp @@ -9,12 +9,12 @@ #include "common/scm_rev.h" #include "common/swap.h" #include "core/core.h" -#include "core/hle/service/fatal/fatal.h" -#include "core/hle/service/fatal/fatal_p.h" -#include "core/hle/service/fatal/fatal_u.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/server_manager.h" #include "core/reporter.h" +#include "service/fatal/fatal.h" +#include "service/fatal/fatal_p.h" +#include "service/fatal/fatal_u.h" +#include "service/ipc_helpers.h" +#include "service/server_manager.h" namespace Service::Fatal { diff --git a/src/core/hle/service/fatal/fatal.h b/src/service/fatal/fatal.h similarity index 95% rename from src/core/hle/service/fatal/fatal.h rename to src/service/fatal/fatal.h index f1c1104060..68d96c2a24 100644 --- a/src/core/hle/service/fatal/fatal.h +++ b/src/service/fatal/fatal.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/fatal/fatal_p.cpp b/src/service/fatal/fatal_p.cpp similarity index 91% rename from src/core/hle/service/fatal/fatal_p.cpp rename to src/service/fatal/fatal_p.cpp index 4a81bb5e2f..f8bd1efff3 100644 --- a/src/core/hle/service/fatal/fatal_p.cpp +++ b/src/service/fatal/fatal_p.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/fatal/fatal_p.h" +#include "service/fatal/fatal_p.h" namespace Service::Fatal { diff --git a/src/core/hle/service/fatal/fatal_p.h b/src/service/fatal/fatal_p.h similarity index 89% rename from src/core/hle/service/fatal/fatal_p.h rename to src/service/fatal/fatal_p.h index f743368350..bc42bbaf9c 100644 --- a/src/core/hle/service/fatal/fatal_p.h +++ b/src/service/fatal/fatal_p.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/fatal/fatal.h" +#include "service/fatal/fatal.h" namespace Service::Fatal { diff --git a/src/core/hle/service/fatal/fatal_u.cpp b/src/service/fatal/fatal_u.cpp similarity index 93% rename from src/core/hle/service/fatal/fatal_u.cpp rename to src/service/fatal/fatal_u.cpp index 3739711fce..e66cffc7d3 100644 --- a/src/core/hle/service/fatal/fatal_u.cpp +++ b/src/service/fatal/fatal_u.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/fatal/fatal_u.h" +#include "service/fatal/fatal_u.h" namespace Service::Fatal { diff --git a/src/core/hle/service/fatal/fatal_u.h b/src/service/fatal/fatal_u.h similarity index 89% rename from src/core/hle/service/fatal/fatal_u.h rename to src/service/fatal/fatal_u.h index 65fbe26961..5a4c7d93be 100644 --- a/src/core/hle/service/fatal/fatal_u.h +++ b/src/service/fatal/fatal_u.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/fatal/fatal.h" +#include "service/fatal/fatal.h" namespace Service::Fatal { diff --git a/src/core/hle/service/fgm/fgm.cpp b/src/service/fgm/fgm.cpp similarity index 91% rename from src/core/hle/service/fgm/fgm.cpp rename to src/service/fgm/fgm.cpp index 6b3f77be2b..4fe53b34f1 100644 --- a/src/core/hle/service/fgm/fgm.cpp +++ b/src/service/fgm/fgm.cpp @@ -3,11 +3,11 @@ #include -#include "core/hle/service/fgm/fgm.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" +#include "service/fgm/fgm.h" +#include "service/ipc_helpers.h" +#include "service/server_manager.h" +#include "service/service.h" +#include "service/sm/sm.h" namespace Service::FGM { diff --git a/src/core/hle/service/fgm/fgm.h b/src/service/fgm/fgm.h similarity index 100% rename from src/core/hle/service/fgm/fgm.h rename to src/service/fgm/fgm.h diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/service/filesystem/filesystem.cpp similarity index 99% rename from src/core/hle/service/filesystem/filesystem.cpp rename to src/service/filesystem/filesystem.cpp index 508db73603..d9a8fdac09 100644 --- a/src/core/hle/service/filesystem/filesystem.cpp +++ b/src/service/filesystem/filesystem.cpp @@ -20,12 +20,12 @@ #include "core/file_sys/sdmc_factory.h" #include "core/file_sys/vfs.h" #include "core/file_sys/vfs_offset.h" -#include "core/hle/service/filesystem/filesystem.h" -#include "core/hle/service/filesystem/fsp_ldr.h" -#include "core/hle/service/filesystem/fsp_pr.h" -#include "core/hle/service/filesystem/fsp_srv.h" -#include "core/hle/service/server_manager.h" #include "core/loader/loader.h" +#include "service/filesystem/filesystem.h" +#include "service/filesystem/fsp_ldr.h" +#include "service/filesystem/fsp_pr.h" +#include "service/filesystem/fsp_srv.h" +#include "service/server_manager.h" namespace Service::FileSystem { diff --git a/src/core/hle/service/filesystem/filesystem.h b/src/service/filesystem/filesystem.h similarity index 99% rename from src/core/hle/service/filesystem/filesystem.h rename to src/service/filesystem/filesystem.h index e7e7c4c289..0c34a13c14 100644 --- a/src/core/hle/service/filesystem/filesystem.h +++ b/src/service/filesystem/filesystem.h @@ -7,7 +7,7 @@ #include "common/common_types.h" #include "core/file_sys/directory.h" #include "core/file_sys/vfs.h" -#include "core/hle/result.h" +#include "core/result.h" namespace Core { class System; diff --git a/src/core/hle/service/filesystem/fsp_ldr.cpp b/src/service/filesystem/fsp_ldr.cpp similarity index 91% rename from src/core/hle/service/filesystem/fsp_ldr.cpp rename to src/service/filesystem/fsp_ldr.cpp index 1e3366e712..78a1135747 100644 --- a/src/core/hle/service/filesystem/fsp_ldr.cpp +++ b/src/service/filesystem/fsp_ldr.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/filesystem/fsp_ldr.h" +#include "service/filesystem/fsp_ldr.h" namespace Service::FileSystem { diff --git a/src/core/hle/service/filesystem/fsp_ldr.h b/src/service/filesystem/fsp_ldr.h similarity index 90% rename from src/core/hle/service/filesystem/fsp_ldr.h rename to src/service/filesystem/fsp_ldr.h index 358739a872..eaab0e14e5 100644 --- a/src/core/hle/service/filesystem/fsp_ldr.h +++ b/src/service/filesystem/fsp_ldr.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/filesystem/fsp_pr.cpp b/src/service/filesystem/fsp_pr.cpp similarity index 92% rename from src/core/hle/service/filesystem/fsp_pr.cpp rename to src/service/filesystem/fsp_pr.cpp index 4ffc319776..24c6f3cb37 100644 --- a/src/core/hle/service/filesystem/fsp_pr.cpp +++ b/src/service/filesystem/fsp_pr.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/filesystem/fsp_pr.h" +#include "service/filesystem/fsp_pr.h" namespace Service::FileSystem { diff --git a/src/core/hle/service/filesystem/fsp_pr.h b/src/service/filesystem/fsp_pr.h similarity index 90% rename from src/core/hle/service/filesystem/fsp_pr.h rename to src/service/filesystem/fsp_pr.h index bd4e0a730c..0baee373cc 100644 --- a/src/core/hle/service/filesystem/fsp_pr.h +++ b/src/service/filesystem/fsp_pr.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/service/filesystem/fsp_srv.cpp similarity index 99% rename from src/core/hle/service/filesystem/fsp_srv.cpp rename to src/service/filesystem/fsp_srv.cpp index 126cd6ffdc..6637974398 100644 --- a/src/core/hle/service/filesystem/fsp_srv.cpp +++ b/src/service/filesystem/fsp_srv.cpp @@ -24,12 +24,12 @@ #include "core/file_sys/savedata_factory.h" #include "core/file_sys/system_archive/system_archive.h" #include "core/file_sys/vfs.h" -#include "core/hle/result.h" -#include "core/hle/service/filesystem/filesystem.h" -#include "core/hle/service/filesystem/fsp_srv.h" -#include "core/hle/service/hle_ipc.h" -#include "core/hle/service/ipc_helpers.h" #include "core/reporter.h" +#include "core/result.h" +#include "service/filesystem/filesystem.h" +#include "service/filesystem/fsp_srv.h" +#include "service/hle_ipc.h" +#include "service/ipc_helpers.h" namespace Service::FileSystem { diff --git a/src/core/hle/service/filesystem/fsp_srv.h b/src/service/filesystem/fsp_srv.h similarity index 98% rename from src/core/hle/service/filesystem/fsp_srv.h rename to src/service/filesystem/fsp_srv.h index 280bc98673..e6eb03d6bc 100644 --- a/src/core/hle/service/filesystem/fsp_srv.h +++ b/src/service/filesystem/fsp_srv.h @@ -4,7 +4,7 @@ #pragma once #include -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class Reporter; diff --git a/src/core/hle/service/friend/friend.cpp b/src/service/friend/friend.cpp similarity index 97% rename from src/core/hle/service/friend/friend.cpp rename to src/service/friend/friend.cpp index 9d05f98013..0d62b2f705 100644 --- a/src/core/hle/service/friend/friend.cpp +++ b/src/service/friend/friend.cpp @@ -5,13 +5,13 @@ #include "common/logging/log.h" #include "common/uuid.h" #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/acc/errors.h" -#include "core/hle/service/friend/friend.h" -#include "core/hle/service/friend/friend_interface.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/server_manager.h" +#include "kernel/k_event.h" +#include "service/acc/errors.h" +#include "service/friend/friend.h" +#include "service/friend/friend_interface.h" +#include "service/ipc_helpers.h" +#include "service/kernel_helpers.h" +#include "service/server_manager.h" namespace Service::Friend { diff --git a/src/core/hle/service/friend/friend.h b/src/service/friend/friend.h similarity index 94% rename from src/core/hle/service/friend/friend.h rename to src/service/friend/friend.h index 2824dc7866..b427ec62bd 100644 --- a/src/core/hle/service/friend/friend.h +++ b/src/service/friend/friend.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/friend/friend_interface.cpp b/src/service/friend/friend_interface.cpp similarity index 92% rename from src/core/hle/service/friend/friend_interface.cpp rename to src/service/friend/friend_interface.cpp index c8b98b1f0c..8c1084d59d 100644 --- a/src/core/hle/service/friend/friend_interface.cpp +++ b/src/service/friend/friend_interface.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/friend/friend_interface.h" +#include "service/friend/friend_interface.h" namespace Service::Friend { diff --git a/src/core/hle/service/friend/friend_interface.h b/src/service/friend/friend_interface.h similarity index 89% rename from src/core/hle/service/friend/friend_interface.h rename to src/service/friend/friend_interface.h index 3a2184c347..ef037f2104 100644 --- a/src/core/hle/service/friend/friend_interface.h +++ b/src/service/friend/friend_interface.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/friend/friend.h" +#include "service/friend/friend.h" namespace Service::Friend { diff --git a/src/core/hle/service/glue/arp.cpp b/src/service/glue/arp.cpp similarity index 97% rename from src/core/hle/service/glue/arp.cpp rename to src/service/glue/arp.cpp index 6f1151b031..a3dd751167 100644 --- a/src/core/hle/service/glue/arp.cpp +++ b/src/service/glue/arp.cpp @@ -5,12 +5,12 @@ #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/service/glue/arp.h" -#include "core/hle/service/glue/errors.h" -#include "core/hle/service/glue/glue_manager.h" -#include "core/hle/service/ipc_helpers.h" +#include "kernel/k_process.h" +#include "kernel/kernel.h" +#include "service/glue/arp.h" +#include "service/glue/errors.h" +#include "service/glue/glue_manager.h" +#include "service/ipc_helpers.h" namespace Service::Glue { diff --git a/src/core/hle/service/glue/arp.h b/src/service/glue/arp.h similarity index 96% rename from src/core/hle/service/glue/arp.h rename to src/service/glue/arp.h index 5bce801755..8e0651f1f7 100644 --- a/src/core/hle/service/glue/arp.h +++ b/src/service/glue/arp.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Service::Glue { diff --git a/src/core/hle/service/glue/bgtc.cpp b/src/service/glue/bgtc.cpp similarity index 96% rename from src/core/hle/service/glue/bgtc.cpp rename to src/service/glue/bgtc.cpp index ae22ac4f79..cf74e95e48 100644 --- a/src/core/hle/service/glue/bgtc.cpp +++ b/src/service/glue/bgtc.cpp @@ -3,8 +3,8 @@ #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/service/glue/bgtc.h" -#include "core/hle/service/ipc_helpers.h" +#include "service/glue/bgtc.h" +#include "service/ipc_helpers.h" namespace Service::Glue { diff --git a/src/core/hle/service/glue/bgtc.h b/src/service/glue/bgtc.h similarity index 94% rename from src/core/hle/service/glue/bgtc.h rename to src/service/glue/bgtc.h index 5a5d9c9a7a..abe6b6dc18 100644 --- a/src/core/hle/service/glue/bgtc.h +++ b/src/service/glue/bgtc.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/glue/ectx.cpp b/src/service/glue/ectx.cpp similarity index 95% rename from src/core/hle/service/glue/ectx.cpp rename to src/service/glue/ectx.cpp index 6f71b62f3a..0f65b4ac4b 100644 --- a/src/core/hle/service/glue/ectx.cpp +++ b/src/service/glue/ectx.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/glue/ectx.h" -#include "core/hle/service/ipc_helpers.h" +#include "service/glue/ectx.h" +#include "service/ipc_helpers.h" namespace Service::Glue { diff --git a/src/core/hle/service/glue/ectx.h b/src/service/glue/ectx.h similarity index 91% rename from src/core/hle/service/glue/ectx.h rename to src/service/glue/ectx.h index ffa74d8d33..5835370270 100644 --- a/src/core/hle/service/glue/ectx.h +++ b/src/service/glue/ectx.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/glue/errors.h b/src/service/glue/errors.h similarity index 92% rename from src/core/hle/service/glue/errors.h rename to src/service/glue/errors.h index 30feaa5c03..d5f561ae35 100644 --- a/src/core/hle/service/glue/errors.h +++ b/src/service/glue/errors.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/result.h" +#include "core/result.h" namespace Service::Glue { diff --git a/src/core/hle/service/glue/glue.cpp b/src/service/glue/glue.cpp similarity index 82% rename from src/core/hle/service/glue/glue.cpp rename to src/service/glue/glue.cpp index 993c3d21da..4cadb2a4eb 100644 --- a/src/core/hle/service/glue/glue.cpp +++ b/src/service/glue/glue.cpp @@ -3,12 +3,12 @@ #include #include "core/core.h" -#include "core/hle/service/glue/arp.h" -#include "core/hle/service/glue/bgtc.h" -#include "core/hle/service/glue/ectx.h" -#include "core/hle/service/glue/glue.h" -#include "core/hle/service/glue/notif.h" -#include "core/hle/service/server_manager.h" +#include "service/glue/arp.h" +#include "service/glue/bgtc.h" +#include "service/glue/ectx.h" +#include "service/glue/glue.h" +#include "service/glue/notif.h" +#include "service/server_manager.h" namespace Service::Glue { diff --git a/src/core/hle/service/glue/glue.h b/src/service/glue/glue.h similarity index 100% rename from src/core/hle/service/glue/glue.h rename to src/service/glue/glue.h diff --git a/src/core/hle/service/glue/glue_manager.cpp b/src/service/glue/glue_manager.cpp similarity index 95% rename from src/core/hle/service/glue/glue_manager.cpp rename to src/service/glue/glue_manager.cpp index 22f0017044..612b7b0619 100644 --- a/src/core/hle/service/glue/glue_manager.cpp +++ b/src/service/glue/glue_manager.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/glue/errors.h" -#include "core/hle/service/glue/glue_manager.h" +#include "service/glue/errors.h" +#include "service/glue/glue_manager.h" namespace Service::Glue { diff --git a/src/core/hle/service/glue/glue_manager.h b/src/service/glue/glue_manager.h similarity index 98% rename from src/core/hle/service/glue/glue_manager.h rename to src/service/glue/glue_manager.h index 216aa34c19..cba5a115d7 100644 --- a/src/core/hle/service/glue/glue_manager.h +++ b/src/service/glue/glue_manager.h @@ -7,7 +7,7 @@ #include #include "common/common_types.h" #include "core/file_sys/romfs_factory.h" -#include "core/hle/result.h" +#include "core/result.h" namespace Service::Glue { diff --git a/src/core/hle/service/glue/notif.cpp b/src/service/glue/notif.cpp similarity index 98% rename from src/core/hle/service/glue/notif.cpp rename to src/service/glue/notif.cpp index fec4ad86cc..0708449774 100644 --- a/src/core/hle/service/glue/notif.cpp +++ b/src/service/glue/notif.cpp @@ -6,8 +6,8 @@ #include "common/assert.h" #include "common/logging/log.h" -#include "core/hle/service/glue/notif.h" -#include "core/hle/service/ipc_helpers.h" +#include "service/glue/notif.h" +#include "service/ipc_helpers.h" namespace Service::Glue { diff --git a/src/core/hle/service/glue/notif.h b/src/service/glue/notif.h similarity index 98% rename from src/core/hle/service/glue/notif.h rename to src/service/glue/notif.h index b1187f3a34..b66bd61511 100644 --- a/src/core/hle/service/glue/notif.h +++ b/src/service/glue/notif.h @@ -7,7 +7,7 @@ #include #include "common/uuid.h" -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/grc/grc.cpp b/src/service/grc/grc.cpp similarity index 89% rename from src/core/hle/service/grc/grc.cpp rename to src/service/grc/grc.cpp index 64275da36d..c776076015 100644 --- a/src/core/hle/service/grc/grc.cpp +++ b/src/service/grc/grc.cpp @@ -3,9 +3,9 @@ #include -#include "core/hle/service/grc/grc.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "service/grc/grc.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::GRC { diff --git a/src/core/hle/service/grc/grc.h b/src/service/grc/grc.h similarity index 100% rename from src/core/hle/service/grc/grc.h rename to src/service/grc/grc.h diff --git a/src/core/hle/service/hid/controllers/console_sixaxis.cpp b/src/service/hid/controllers/console_sixaxis.cpp similarity index 97% rename from src/core/hle/service/hid/controllers/console_sixaxis.cpp rename to src/service/hid/controllers/console_sixaxis.cpp index bcb272eaff..3a4e332f6d 100644 --- a/src/core/hle/service/hid/controllers/console_sixaxis.cpp +++ b/src/service/hid/controllers/console_sixaxis.cpp @@ -5,8 +5,8 @@ #include "core/core_timing.h" #include "core/hid/emulated_console.h" #include "core/hid/hid_core.h" -#include "core/hle/service/hid/controllers/console_sixaxis.h" #include "core/memory.h" +#include "service/hid/controllers/console_sixaxis.h" namespace Service::HID { constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3C200; diff --git a/src/core/hle/service/hid/controllers/console_sixaxis.h b/src/service/hid/controllers/console_sixaxis.h similarity index 95% rename from src/core/hle/service/hid/controllers/console_sixaxis.h rename to src/service/hid/controllers/console_sixaxis.h index 7015d924c1..0d7be1690a 100644 --- a/src/core/hle/service/hid/controllers/console_sixaxis.h +++ b/src/service/hid/controllers/console_sixaxis.h @@ -7,8 +7,8 @@ #include "common/quaternion.h" #include "common/typed_address.h" -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/ring_lifo.h" +#include "service/hid/controllers/controller_base.h" +#include "service/hid/ring_lifo.h" namespace Core { class System; diff --git a/src/core/hle/service/hid/controllers/controller_base.cpp b/src/service/hid/controllers/controller_base.cpp similarity index 91% rename from src/core/hle/service/hid/controllers/controller_base.cpp rename to src/service/hid/controllers/controller_base.cpp index c58d67d7d6..79e44b5451 100644 --- a/src/core/hle/service/hid/controllers/controller_base.cpp +++ b/src/service/hid/controllers/controller_base.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/hid/controllers/controller_base.h" +#include "service/hid/controllers/controller_base.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/controller_base.h b/src/service/hid/controllers/controller_base.h similarity index 100% rename from src/core/hle/service/hid/controllers/controller_base.h rename to src/service/hid/controllers/controller_base.h diff --git a/src/core/hle/service/hid/controllers/debug_pad.cpp b/src/service/hid/controllers/debug_pad.cpp similarity index 97% rename from src/core/hle/service/hid/controllers/debug_pad.cpp rename to src/service/hid/controllers/debug_pad.cpp index 8ec9f4a95f..70568b54ce 100644 --- a/src/core/hle/service/hid/controllers/debug_pad.cpp +++ b/src/service/hid/controllers/debug_pad.cpp @@ -8,7 +8,7 @@ #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" #include "core/hid/hid_types.h" -#include "core/hle/service/hid/controllers/debug_pad.h" +#include "service/hid/controllers/debug_pad.h" namespace Service::HID { constexpr std::size_t SHARED_MEMORY_OFFSET = 0x00000; diff --git a/src/core/hle/service/hid/controllers/debug_pad.h b/src/service/hid/controllers/debug_pad.h similarity index 95% rename from src/core/hle/service/hid/controllers/debug_pad.h rename to src/service/hid/controllers/debug_pad.h index 68ff0ea792..f7e9912e5a 100644 --- a/src/core/hle/service/hid/controllers/debug_pad.h +++ b/src/service/hid/controllers/debug_pad.h @@ -5,8 +5,8 @@ #include "common/bit_field.h" #include "common/common_types.h" -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/ring_lifo.h" +#include "service/hid/controllers/controller_base.h" +#include "service/hid/ring_lifo.h" namespace Core::HID { class EmulatedController; diff --git a/src/core/hle/service/hid/controllers/gesture.cpp b/src/service/hid/controllers/gesture.cpp similarity index 99% rename from src/core/hle/service/hid/controllers/gesture.cpp rename to src/service/hid/controllers/gesture.cpp index 63eecd42b4..d211748e55 100644 --- a/src/core/hle/service/hid/controllers/gesture.cpp +++ b/src/service/hid/controllers/gesture.cpp @@ -7,7 +7,7 @@ #include "core/core_timing.h" #include "core/frontend/emu_window.h" #include "core/hid/hid_core.h" -#include "core/hle/service/hid/controllers/gesture.h" +#include "service/hid/controllers/gesture.h" namespace Service::HID { constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3BA00; diff --git a/src/core/hle/service/hid/controllers/gesture.h b/src/service/hid/controllers/gesture.h similarity index 98% rename from src/core/hle/service/hid/controllers/gesture.h rename to src/service/hid/controllers/gesture.h index 0d6099ea0d..ab07869ece 100644 --- a/src/core/hle/service/hid/controllers/gesture.h +++ b/src/service/hid/controllers/gesture.h @@ -8,8 +8,8 @@ #include "common/common_types.h" #include "common/point.h" #include "core/hid/emulated_console.h" -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/ring_lifo.h" +#include "service/hid/controllers/controller_base.h" +#include "service/hid/ring_lifo.h" namespace Service::HID { class Controller_Gesture final : public ControllerBase { diff --git a/src/core/hle/service/hid/controllers/keyboard.cpp b/src/service/hid/controllers/keyboard.cpp similarity index 97% rename from src/core/hle/service/hid/controllers/keyboard.cpp rename to src/service/hid/controllers/keyboard.cpp index 117d874332..2ed550ca81 100644 --- a/src/core/hle/service/hid/controllers/keyboard.cpp +++ b/src/service/hid/controllers/keyboard.cpp @@ -7,7 +7,7 @@ #include "core/core_timing.h" #include "core/hid/emulated_devices.h" #include "core/hid/hid_core.h" -#include "core/hle/service/hid/controllers/keyboard.h" +#include "service/hid/controllers/keyboard.h" namespace Service::HID { constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3800; diff --git a/src/core/hle/service/hid/controllers/keyboard.h b/src/service/hid/controllers/keyboard.h similarity index 94% rename from src/core/hle/service/hid/controllers/keyboard.h rename to src/service/hid/controllers/keyboard.h index 7532f53c65..83a1a1babd 100644 --- a/src/core/hle/service/hid/controllers/keyboard.h +++ b/src/service/hid/controllers/keyboard.h @@ -4,8 +4,8 @@ #pragma once #include "common/common_types.h" -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/ring_lifo.h" +#include "service/hid/controllers/controller_base.h" +#include "service/hid/ring_lifo.h" namespace Core::HID { class EmulatedDevices; diff --git a/src/core/hle/service/hid/controllers/mouse.cpp b/src/service/hid/controllers/mouse.cpp similarity index 97% rename from src/core/hle/service/hid/controllers/mouse.cpp rename to src/service/hid/controllers/mouse.cpp index 0afc666811..278af8da4e 100644 --- a/src/core/hle/service/hid/controllers/mouse.cpp +++ b/src/service/hid/controllers/mouse.cpp @@ -7,7 +7,7 @@ #include "core/frontend/emu_window.h" #include "core/hid/emulated_devices.h" #include "core/hid/hid_core.h" -#include "core/hle/service/hid/controllers/mouse.h" +#include "service/hid/controllers/mouse.h" namespace Service::HID { constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3400; diff --git a/src/core/hle/service/hid/controllers/mouse.h b/src/service/hid/controllers/mouse.h similarity index 92% rename from src/core/hle/service/hid/controllers/mouse.h rename to src/service/hid/controllers/mouse.h index 733d005776..f961e3c733 100644 --- a/src/core/hle/service/hid/controllers/mouse.h +++ b/src/service/hid/controllers/mouse.h @@ -4,8 +4,8 @@ #pragma once #include "common/common_types.h" -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/ring_lifo.h" +#include "service/hid/controllers/controller_base.h" +#include "service/hid/ring_lifo.h" namespace Core::HID { class EmulatedDevices; diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/service/hid/controllers/npad.cpp similarity index 99% rename from src/core/hle/service/hid/controllers/npad.cpp rename to src/service/hid/controllers/npad.cpp index 21695bda29..ebbe60b36e 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/service/hid/controllers/npad.cpp @@ -14,11 +14,11 @@ #include "core/core_timing.h" #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/service/hid/controllers/npad.h" -#include "core/hle/service/hid/errors.h" -#include "core/hle/service/kernel_helpers.h" +#include "kernel/k_event.h" +#include "kernel/k_readable_event.h" +#include "service/hid/controllers/npad.h" +#include "service/hid/errors.h" +#include "service/kernel_helpers.h" namespace Service::HID { constexpr std::size_t NPAD_OFFSET = 0x9A00; diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/service/hid/controllers/npad.h similarity index 99% rename from src/core/hle/service/hid/controllers/npad.h rename to src/service/hid/controllers/npad.h index 949e58a4c9..13f3eaa134 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/service/hid/controllers/npad.h @@ -13,8 +13,8 @@ #include "common/vector_math.h" #include "core/hid/hid_types.h" -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/ring_lifo.h" +#include "service/hid/controllers/controller_base.h" +#include "service/hid/ring_lifo.h" namespace Core::HID { class EmulatedController; diff --git a/src/core/hle/service/hid/controllers/palma.cpp b/src/service/hid/controllers/palma.cpp similarity index 97% rename from src/core/hle/service/hid/controllers/palma.cpp rename to src/service/hid/controllers/palma.cpp index 73a2a2b917..aae80d06e6 100644 --- a/src/core/hle/service/hid/controllers/palma.cpp +++ b/src/service/hid/controllers/palma.cpp @@ -5,10 +5,10 @@ #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" #include "core/hid/hid_types.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/service/hid/controllers/palma.h" -#include "core/hle/service/kernel_helpers.h" +#include "kernel/k_event.h" +#include "kernel/k_readable_event.h" +#include "service/hid/controllers/palma.h" +#include "service/kernel_helpers.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/palma.h b/src/service/hid/controllers/palma.h similarity index 98% rename from src/core/hle/service/hid/controllers/palma.h rename to src/service/hid/controllers/palma.h index a0491a8194..62378d044e 100644 --- a/src/core/hle/service/hid/controllers/palma.h +++ b/src/service/hid/controllers/palma.h @@ -6,8 +6,8 @@ #include #include "common/common_funcs.h" #include "common/typed_address.h" -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/errors.h" +#include "service/hid/controllers/controller_base.h" +#include "service/hid/errors.h" namespace Kernel { class KEvent; diff --git a/src/core/hle/service/hid/controllers/stubbed.cpp b/src/service/hid/controllers/stubbed.cpp similarity index 95% rename from src/core/hle/service/hid/controllers/stubbed.cpp rename to src/service/hid/controllers/stubbed.cpp index 9e2f3ab212..1d5d72a0c2 100644 --- a/src/core/hle/service/hid/controllers/stubbed.cpp +++ b/src/service/hid/controllers/stubbed.cpp @@ -5,7 +5,7 @@ #include "common/common_types.h" #include "core/core_timing.h" #include "core/hid/hid_core.h" -#include "core/hle/service/hid/controllers/stubbed.h" +#include "service/hid/controllers/stubbed.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/controllers/stubbed.h b/src/service/hid/controllers/stubbed.h similarity index 94% rename from src/core/hle/service/hid/controllers/stubbed.h rename to src/service/hid/controllers/stubbed.h index 1483a968ed..e356230449 100644 --- a/src/core/hle/service/hid/controllers/stubbed.h +++ b/src/service/hid/controllers/stubbed.h @@ -4,7 +4,7 @@ #pragma once #include "common/common_types.h" -#include "core/hle/service/hid/controllers/controller_base.h" +#include "service/hid/controllers/controller_base.h" namespace Service::HID { class Controller_Stubbed final : public ControllerBase { diff --git a/src/core/hle/service/hid/controllers/touchscreen.cpp b/src/service/hid/controllers/touchscreen.cpp similarity index 98% rename from src/core/hle/service/hid/controllers/touchscreen.cpp rename to src/service/hid/controllers/touchscreen.cpp index 3ef91df4bc..260bd28a81 100644 --- a/src/core/hle/service/hid/controllers/touchscreen.cpp +++ b/src/service/hid/controllers/touchscreen.cpp @@ -10,7 +10,7 @@ #include "core/frontend/emu_window.h" #include "core/hid/emulated_console.h" #include "core/hid/hid_core.h" -#include "core/hle/service/hid/controllers/touchscreen.h" +#include "service/hid/controllers/touchscreen.h" namespace Service::HID { constexpr std::size_t SHARED_MEMORY_OFFSET = 0x400; diff --git a/src/core/hle/service/hid/controllers/touchscreen.h b/src/service/hid/controllers/touchscreen.h similarity index 94% rename from src/core/hle/service/hid/controllers/touchscreen.h rename to src/service/hid/controllers/touchscreen.h index dd00921fdb..9a4768c9f0 100644 --- a/src/core/hle/service/hid/controllers/touchscreen.h +++ b/src/service/hid/controllers/touchscreen.h @@ -6,8 +6,8 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "core/hid/hid_types.h" -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/ring_lifo.h" +#include "service/hid/controllers/controller_base.h" +#include "service/hid/ring_lifo.h" namespace Core::HID { class EmulatedConsole; diff --git a/src/core/hle/service/hid/controllers/xpad.cpp b/src/service/hid/controllers/xpad.cpp similarity index 96% rename from src/core/hle/service/hid/controllers/xpad.cpp rename to src/service/hid/controllers/xpad.cpp index 62119e2c55..17da712a0a 100644 --- a/src/core/hle/service/hid/controllers/xpad.cpp +++ b/src/service/hid/controllers/xpad.cpp @@ -5,7 +5,7 @@ #include "common/common_types.h" #include "core/core_timing.h" #include "core/hid/hid_core.h" -#include "core/hle/service/hid/controllers/xpad.h" +#include "service/hid/controllers/xpad.h" namespace Service::HID { constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3C00; diff --git a/src/core/hle/service/hid/controllers/xpad.h b/src/service/hid/controllers/xpad.h similarity index 97% rename from src/core/hle/service/hid/controllers/xpad.h rename to src/service/hid/controllers/xpad.h index d01dee5fc5..4a77681d11 100644 --- a/src/core/hle/service/hid/controllers/xpad.h +++ b/src/service/hid/controllers/xpad.h @@ -6,8 +6,8 @@ #include "common/bit_field.h" #include "common/common_types.h" #include "core/hid/hid_types.h" -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/ring_lifo.h" +#include "service/hid/controllers/controller_base.h" +#include "service/hid/ring_lifo.h" namespace Service::HID { class Controller_XPad final : public ControllerBase { diff --git a/src/core/hle/service/hid/errors.h b/src/service/hid/errors.h similarity index 97% rename from src/core/hle/service/hid/errors.h rename to src/service/hid/errors.h index 9585bdaf01..30f8cba928 100644 --- a/src/core/hle/service/hid/errors.h +++ b/src/service/hid/errors.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/result.h" +#include "core/result.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/hid.cpp b/src/service/hid/hid.cpp similarity index 99% rename from src/core/hle/service/hid/hid.cpp rename to src/service/hid/hid.cpp index 1d4101be9f..93154c29f7 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/service/hid/hid.cpp @@ -8,30 +8,30 @@ #include "core/core.h" #include "core/core_timing.h" #include "core/hid/hid_core.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/kernel/k_shared_memory.h" -#include "core/hle/kernel/k_transfer_memory.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/service/hid/errors.h" -#include "core/hle/service/hid/hid.h" -#include "core/hle/service/hid/hidbus.h" -#include "core/hle/service/hid/irs.h" -#include "core/hle/service/hid/xcd.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/server_manager.h" #include "core/memory.h" +#include "kernel/k_readable_event.h" +#include "kernel/k_shared_memory.h" +#include "kernel/k_transfer_memory.h" +#include "kernel/kernel.h" +#include "service/hid/errors.h" +#include "service/hid/hid.h" +#include "service/hid/hidbus.h" +#include "service/hid/irs.h" +#include "service/hid/xcd.h" +#include "service/ipc_helpers.h" +#include "service/server_manager.h" -#include "core/hle/service/hid/controllers/console_sixaxis.h" -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/controllers/debug_pad.h" -#include "core/hle/service/hid/controllers/gesture.h" -#include "core/hle/service/hid/controllers/keyboard.h" -#include "core/hle/service/hid/controllers/mouse.h" -#include "core/hle/service/hid/controllers/npad.h" -#include "core/hle/service/hid/controllers/palma.h" -#include "core/hle/service/hid/controllers/stubbed.h" -#include "core/hle/service/hid/controllers/touchscreen.h" -#include "core/hle/service/hid/controllers/xpad.h" +#include "service/hid/controllers/console_sixaxis.h" +#include "service/hid/controllers/controller_base.h" +#include "service/hid/controllers/debug_pad.h" +#include "service/hid/controllers/gesture.h" +#include "service/hid/controllers/keyboard.h" +#include "service/hid/controllers/mouse.h" +#include "service/hid/controllers/npad.h" +#include "service/hid/controllers/palma.h" +#include "service/hid/controllers/stubbed.h" +#include "service/hid/controllers/touchscreen.h" +#include "service/hid/controllers/xpad.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/hid.h b/src/service/hid/hid.h similarity index 98% rename from src/core/hle/service/hid/hid.h rename to src/service/hid/hid.h index 0ca43de935..f39a77c810 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/service/hid/hid.h @@ -5,9 +5,9 @@ #include -#include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/service.h" +#include "service/hid/controllers/controller_base.h" +#include "service/kernel_helpers.h" +#include "service/service.h" namespace Core::Timing { struct EventType; diff --git a/src/core/hle/service/hid/hidbus.cpp b/src/service/hid/hidbus.cpp similarity index 97% rename from src/core/hle/service/hid/hidbus.cpp rename to src/service/hid/hidbus.cpp index 80aac221b8..1b62d693b5 100644 --- a/src/core/hle/service/hid/hidbus.cpp +++ b/src/service/hid/hidbus.cpp @@ -6,17 +6,17 @@ #include "core/core.h" #include "core/core_timing.h" #include "core/hid/hid_types.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/kernel/k_shared_memory.h" -#include "core/hle/kernel/k_transfer_memory.h" -#include "core/hle/service/hid/hidbus.h" -#include "core/hle/service/hid/hidbus/ringcon.h" -#include "core/hle/service/hid/hidbus/starlink.h" -#include "core/hle/service/hid/hidbus/stubbed.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/service.h" #include "core/memory.h" +#include "kernel/k_event.h" +#include "kernel/k_readable_event.h" +#include "kernel/k_shared_memory.h" +#include "kernel/k_transfer_memory.h" +#include "service/hid/hidbus.h" +#include "service/hid/hidbus/ringcon.h" +#include "service/hid/hidbus/starlink.h" +#include "service/hid/hidbus/stubbed.h" +#include "service/ipc_helpers.h" +#include "service/service.h" namespace Service::HID { // (15ms, 66Hz) diff --git a/src/core/hle/service/hid/hidbus.h b/src/service/hid/hidbus.h similarity index 96% rename from src/core/hle/service/hid/hidbus.h rename to src/service/hid/hidbus.h index c29b5e8823..ae33126e6d 100644 --- a/src/core/hle/service/hid/hidbus.h +++ b/src/service/hid/hidbus.h @@ -5,9 +5,9 @@ #include -#include "core/hle/service/hid/hidbus/hidbus_base.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/service.h" +#include "service/hid/hidbus/hidbus_base.h" +#include "service/kernel_helpers.h" +#include "service/service.h" namespace Core::Timing { struct EventType; diff --git a/src/core/hle/service/hid/hidbus/hidbus_base.cpp b/src/service/hid/hidbus/hidbus_base.cpp similarity index 89% rename from src/core/hle/service/hid/hidbus/hidbus_base.cpp rename to src/service/hid/hidbus/hidbus_base.cpp index 8c44f93e82..a4659d5ccc 100644 --- a/src/core/hle/service/hid/hidbus/hidbus_base.cpp +++ b/src/service/hid/hidbus/hidbus_base.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/hid/hid_core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/service/hid/hidbus/hidbus_base.h" -#include "core/hle/service/kernel_helpers.h" +#include "kernel/k_event.h" +#include "kernel/k_readable_event.h" +#include "service/hid/hidbus/hidbus_base.h" +#include "service/kernel_helpers.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/hidbus/hidbus_base.h b/src/service/hid/hidbus/hidbus_base.h similarity index 99% rename from src/core/hle/service/hid/hidbus/hidbus_base.h rename to src/service/hid/hidbus/hidbus_base.h index ec41684e1e..e56e6e65f9 100644 --- a/src/core/hle/service/hid/hidbus/hidbus_base.h +++ b/src/service/hid/hidbus/hidbus_base.h @@ -6,7 +6,7 @@ #include #include #include "common/typed_address.h" -#include "core/hle/result.h" +#include "core/result.h" namespace Core { class System; diff --git a/src/core/hle/service/hid/hidbus/ringcon.cpp b/src/service/hid/hidbus/ringcon.cpp similarity index 98% rename from src/core/hle/service/hid/hidbus/ringcon.cpp rename to src/service/hid/hidbus/ringcon.cpp index 3781080120..b36aab72a3 100644 --- a/src/core/hle/service/hid/hidbus/ringcon.cpp +++ b/src/service/hid/hidbus/ringcon.cpp @@ -4,10 +4,10 @@ #include "core/core.h" #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/service/hid/hidbus/ringcon.h" #include "core/memory.h" +#include "kernel/k_event.h" +#include "kernel/k_readable_event.h" +#include "service/hid/hidbus/ringcon.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/hidbus/ringcon.h b/src/service/hid/hidbus/ringcon.h similarity index 99% rename from src/core/hle/service/hid/hidbus/ringcon.h rename to src/service/hid/hidbus/ringcon.h index f42f3ea412..440b3e4901 100644 --- a/src/core/hle/service/hid/hidbus/ringcon.h +++ b/src/service/hid/hidbus/ringcon.h @@ -7,7 +7,7 @@ #include #include "common/common_types.h" -#include "core/hle/service/hid/hidbus/hidbus_base.h" +#include "service/hid/hidbus/hidbus_base.h" namespace Core::HID { class EmulatedController; diff --git a/src/core/hle/service/hid/hidbus/starlink.cpp b/src/service/hid/hidbus/starlink.cpp similarity index 95% rename from src/core/hle/service/hid/hidbus/starlink.cpp rename to src/service/hid/hidbus/starlink.cpp index 36573274e2..c4ee7db9df 100644 --- a/src/core/hle/service/hid/hidbus/starlink.cpp +++ b/src/service/hid/hidbus/starlink.cpp @@ -3,7 +3,7 @@ #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" -#include "core/hle/service/hid/hidbus/starlink.h" +#include "service/hid/hidbus/starlink.h" namespace Service::HID { constexpr u8 DEVICE_ID = 0x28; diff --git a/src/core/hle/service/hid/hidbus/starlink.h b/src/service/hid/hidbus/starlink.h similarity index 94% rename from src/core/hle/service/hid/hidbus/starlink.h rename to src/service/hid/hidbus/starlink.h index a276aa88f7..3a7d1f0e09 100644 --- a/src/core/hle/service/hid/hidbus/starlink.h +++ b/src/service/hid/hidbus/starlink.h @@ -4,7 +4,7 @@ #pragma once #include "common/common_types.h" -#include "core/hle/service/hid/hidbus/hidbus_base.h" +#include "service/hid/hidbus/hidbus_base.h" namespace Core::HID { class EmulatedController; diff --git a/src/core/hle/service/hid/hidbus/stubbed.cpp b/src/service/hid/hidbus/stubbed.cpp similarity index 95% rename from src/core/hle/service/hid/hidbus/stubbed.cpp rename to src/service/hid/hidbus/stubbed.cpp index 8160b7218e..8f6ca91dbf 100644 --- a/src/core/hle/service/hid/hidbus/stubbed.cpp +++ b/src/service/hid/hidbus/stubbed.cpp @@ -3,7 +3,7 @@ #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" -#include "core/hle/service/hid/hidbus/stubbed.h" +#include "service/hid/hidbus/stubbed.h" namespace Service::HID { constexpr u8 DEVICE_ID = 0xFF; diff --git a/src/core/hle/service/hid/hidbus/stubbed.h b/src/service/hid/hidbus/stubbed.h similarity index 94% rename from src/core/hle/service/hid/hidbus/stubbed.h rename to src/service/hid/hidbus/stubbed.h index 2e58d42fcc..4661cbdb11 100644 --- a/src/core/hle/service/hid/hidbus/stubbed.h +++ b/src/service/hid/hidbus/stubbed.h @@ -4,7 +4,7 @@ #pragma once #include "common/common_types.h" -#include "core/hle/service/hid/hidbus/hidbus_base.h" +#include "service/hid/hidbus/hidbus_base.h" namespace Core::HID { class EmulatedController; diff --git a/src/core/hle/service/hid/irs.cpp b/src/service/hid/irs.cpp similarity index 97% rename from src/core/hle/service/hid/irs.cpp rename to src/service/hid/irs.cpp index d383a266d9..980cac3356 100644 --- a/src/core/hle/service/hid/irs.cpp +++ b/src/service/hid/irs.cpp @@ -8,19 +8,19 @@ #include "core/core_timing.h" #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" -#include "core/hle/kernel/k_shared_memory.h" -#include "core/hle/kernel/k_transfer_memory.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/service/hid/errors.h" -#include "core/hle/service/hid/irs.h" -#include "core/hle/service/hid/irsensor/clustering_processor.h" -#include "core/hle/service/hid/irsensor/image_transfer_processor.h" -#include "core/hle/service/hid/irsensor/ir_led_processor.h" -#include "core/hle/service/hid/irsensor/moment_processor.h" -#include "core/hle/service/hid/irsensor/pointing_processor.h" -#include "core/hle/service/hid/irsensor/tera_plugin_processor.h" -#include "core/hle/service/ipc_helpers.h" #include "core/memory.h" +#include "kernel/k_shared_memory.h" +#include "kernel/k_transfer_memory.h" +#include "kernel/kernel.h" +#include "service/hid/errors.h" +#include "service/hid/irs.h" +#include "service/hid/irsensor/clustering_processor.h" +#include "service/hid/irsensor/image_transfer_processor.h" +#include "service/hid/irsensor/ir_led_processor.h" +#include "service/hid/irsensor/moment_processor.h" +#include "service/hid/irsensor/pointing_processor.h" +#include "service/hid/irsensor/tera_plugin_processor.h" +#include "service/ipc_helpers.h" namespace Service::IRS { diff --git a/src/core/hle/service/hid/irs.h b/src/service/hid/irs.h similarity index 97% rename from src/core/hle/service/hid/irs.h rename to src/service/hid/irs.h index a8fa190250..f74982e49c 100644 --- a/src/core/hle/service/hid/irs.h +++ b/src/service/hid/irs.h @@ -5,8 +5,8 @@ #include "core/hid/hid_types.h" #include "core/hid/irs_types.h" -#include "core/hle/service/hid/irsensor/processor_base.h" -#include "core/hle/service/service.h" +#include "service/hid/irsensor/processor_base.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/hid/irs_ring_lifo.h b/src/service/hid/irs_ring_lifo.h similarity index 100% rename from src/core/hle/service/hid/irs_ring_lifo.h rename to src/service/hid/irs_ring_lifo.h diff --git a/src/core/hle/service/hid/irsensor/clustering_processor.cpp b/src/service/hid/irsensor/clustering_processor.cpp similarity index 99% rename from src/core/hle/service/hid/irsensor/clustering_processor.cpp rename to src/service/hid/irsensor/clustering_processor.cpp index c559eb0d5f..d9db7a10c3 100644 --- a/src/core/hle/service/hid/irsensor/clustering_processor.cpp +++ b/src/service/hid/irsensor/clustering_processor.cpp @@ -7,7 +7,7 @@ #include "core/core_timing.h" #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" -#include "core/hle/service/hid/irsensor/clustering_processor.h" +#include "service/hid/irsensor/clustering_processor.h" namespace Service::IRS { ClusteringProcessor::ClusteringProcessor(Core::System& system_, diff --git a/src/core/hle/service/hid/irsensor/clustering_processor.h b/src/service/hid/irsensor/clustering_processor.h similarity index 97% rename from src/core/hle/service/hid/irsensor/clustering_processor.h rename to src/service/hid/irsensor/clustering_processor.h index 83f34734a7..eaa352013a 100644 --- a/src/core/hle/service/hid/irsensor/clustering_processor.h +++ b/src/service/hid/irsensor/clustering_processor.h @@ -5,8 +5,8 @@ #include "common/common_types.h" #include "core/hid/irs_types.h" -#include "core/hle/service/hid/irs_ring_lifo.h" -#include "core/hle/service/hid/irsensor/processor_base.h" +#include "service/hid/irs_ring_lifo.h" +#include "service/hid/irsensor/processor_base.h" namespace Core { class System; diff --git a/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp b/src/service/hid/irsensor/image_transfer_processor.cpp similarity index 99% rename from src/core/hle/service/hid/irsensor/image_transfer_processor.cpp rename to src/service/hid/irsensor/image_transfer_processor.cpp index 22067a591e..cc88b0cd76 100644 --- a/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp +++ b/src/service/hid/irsensor/image_transfer_processor.cpp @@ -4,8 +4,8 @@ #include "core/core.h" #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" -#include "core/hle/service/hid/irsensor/image_transfer_processor.h" #include "core/memory.h" +#include "service/hid/irsensor/image_transfer_processor.h" namespace Service::IRS { ImageTransferProcessor::ImageTransferProcessor(Core::System& system_, diff --git a/src/core/hle/service/hid/irsensor/image_transfer_processor.h b/src/service/hid/irsensor/image_transfer_processor.h similarity index 97% rename from src/core/hle/service/hid/irsensor/image_transfer_processor.h rename to src/service/hid/irsensor/image_transfer_processor.h index 7f42d84538..f26333e089 100644 --- a/src/core/hle/service/hid/irsensor/image_transfer_processor.h +++ b/src/service/hid/irsensor/image_transfer_processor.h @@ -5,7 +5,7 @@ #include "common/typed_address.h" #include "core/hid/irs_types.h" -#include "core/hle/service/hid/irsensor/processor_base.h" +#include "service/hid/irsensor/processor_base.h" namespace Core { class System; diff --git a/src/core/hle/service/hid/irsensor/ir_led_processor.cpp b/src/service/hid/irsensor/ir_led_processor.cpp similarity index 93% rename from src/core/hle/service/hid/irsensor/ir_led_processor.cpp rename to src/service/hid/irsensor/ir_led_processor.cpp index 8e6dd99e49..e3c2cb5a79 100644 --- a/src/core/hle/service/hid/irsensor/ir_led_processor.cpp +++ b/src/service/hid/irsensor/ir_led_processor.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "core/hle/service/hid/irsensor/ir_led_processor.h" +#include "service/hid/irsensor/ir_led_processor.h" namespace Service::IRS { IrLedProcessor::IrLedProcessor(Core::IrSensor::DeviceFormat& device_format) diff --git a/src/core/hle/service/hid/irsensor/ir_led_processor.h b/src/service/hid/irsensor/ir_led_processor.h similarity index 95% rename from src/core/hle/service/hid/irsensor/ir_led_processor.h rename to src/service/hid/irsensor/ir_led_processor.h index c3d8693c9e..38983440b6 100644 --- a/src/core/hle/service/hid/irsensor/ir_led_processor.h +++ b/src/service/hid/irsensor/ir_led_processor.h @@ -6,7 +6,7 @@ #include "common/bit_field.h" #include "common/common_types.h" #include "core/hid/irs_types.h" -#include "core/hle/service/hid/irsensor/processor_base.h" +#include "service/hid/irsensor/processor_base.h" namespace Service::IRS { class IrLedProcessor final : public ProcessorBase { diff --git a/src/core/hle/service/hid/irsensor/moment_processor.cpp b/src/service/hid/irsensor/moment_processor.cpp similarity index 99% rename from src/core/hle/service/hid/irsensor/moment_processor.cpp rename to src/service/hid/irsensor/moment_processor.cpp index cf045bda7c..73fc7a91b8 100644 --- a/src/core/hle/service/hid/irsensor/moment_processor.cpp +++ b/src/service/hid/irsensor/moment_processor.cpp @@ -5,7 +5,7 @@ #include "core/core_timing.h" #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" -#include "core/hle/service/hid/irsensor/moment_processor.h" +#include "service/hid/irsensor/moment_processor.h" namespace Service::IRS { static constexpr auto format = Core::IrSensor::ImageTransferProcessorFormat::Size40x30; diff --git a/src/core/hle/service/hid/irsensor/moment_processor.h b/src/service/hid/irsensor/moment_processor.h similarity index 96% rename from src/core/hle/service/hid/irsensor/moment_processor.h rename to src/service/hid/irsensor/moment_processor.h index 398cfbdc10..c84aebe3ce 100644 --- a/src/core/hle/service/hid/irsensor/moment_processor.h +++ b/src/service/hid/irsensor/moment_processor.h @@ -6,8 +6,8 @@ #include "common/bit_field.h" #include "common/common_types.h" #include "core/hid/irs_types.h" -#include "core/hle/service/hid/irs_ring_lifo.h" -#include "core/hle/service/hid/irsensor/processor_base.h" +#include "service/hid/irs_ring_lifo.h" +#include "service/hid/irsensor/processor_base.h" namespace Core { class System; diff --git a/src/core/hle/service/hid/irsensor/pointing_processor.cpp b/src/service/hid/irsensor/pointing_processor.cpp similarity index 93% rename from src/core/hle/service/hid/irsensor/pointing_processor.cpp rename to src/service/hid/irsensor/pointing_processor.cpp index 929f177fc6..256df73891 100644 --- a/src/core/hle/service/hid/irsensor/pointing_processor.cpp +++ b/src/service/hid/irsensor/pointing_processor.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "core/hle/service/hid/irsensor/pointing_processor.h" +#include "service/hid/irsensor/pointing_processor.h" namespace Service::IRS { PointingProcessor::PointingProcessor(Core::IrSensor::DeviceFormat& device_format) diff --git a/src/core/hle/service/hid/irsensor/pointing_processor.h b/src/service/hid/irsensor/pointing_processor.h similarity index 97% rename from src/core/hle/service/hid/irsensor/pointing_processor.h rename to src/service/hid/irsensor/pointing_processor.h index d63423aff2..eb43447ff3 100644 --- a/src/core/hle/service/hid/irsensor/pointing_processor.h +++ b/src/service/hid/irsensor/pointing_processor.h @@ -5,7 +5,7 @@ #include "common/common_types.h" #include "core/hid/irs_types.h" -#include "core/hle/service/hid/irsensor/processor_base.h" +#include "service/hid/irsensor/processor_base.h" namespace Service::IRS { class PointingProcessor final : public ProcessorBase { diff --git a/src/core/hle/service/hid/irsensor/processor_base.cpp b/src/service/hid/irsensor/processor_base.cpp similarity index 97% rename from src/core/hle/service/hid/irsensor/processor_base.cpp rename to src/service/hid/irsensor/processor_base.cpp index 4d43ca17ac..bdd5f62240 100644 --- a/src/core/hle/service/hid/irsensor/processor_base.cpp +++ b/src/service/hid/irsensor/processor_base.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "core/hle/service/hid/irsensor/processor_base.h" +#include "service/hid/irsensor/processor_base.h" namespace Service::IRS { diff --git a/src/core/hle/service/hid/irsensor/processor_base.h b/src/service/hid/irsensor/processor_base.h similarity index 100% rename from src/core/hle/service/hid/irsensor/processor_base.h rename to src/service/hid/irsensor/processor_base.h diff --git a/src/core/hle/service/hid/irsensor/tera_plugin_processor.cpp b/src/service/hid/irsensor/tera_plugin_processor.cpp similarity index 93% rename from src/core/hle/service/hid/irsensor/tera_plugin_processor.cpp rename to src/service/hid/irsensor/tera_plugin_processor.cpp index e691c840a4..798d991e82 100644 --- a/src/core/hle/service/hid/irsensor/tera_plugin_processor.cpp +++ b/src/service/hid/irsensor/tera_plugin_processor.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "core/hle/service/hid/irsensor/tera_plugin_processor.h" +#include "service/hid/irsensor/tera_plugin_processor.h" namespace Service::IRS { TeraPluginProcessor::TeraPluginProcessor(Core::IrSensor::DeviceFormat& device_format) diff --git a/src/core/hle/service/hid/irsensor/tera_plugin_processor.h b/src/service/hid/irsensor/tera_plugin_processor.h similarity index 96% rename from src/core/hle/service/hid/irsensor/tera_plugin_processor.h rename to src/service/hid/irsensor/tera_plugin_processor.h index bbea7ed0b5..cc76fc0ce4 100644 --- a/src/core/hle/service/hid/irsensor/tera_plugin_processor.h +++ b/src/service/hid/irsensor/tera_plugin_processor.h @@ -6,7 +6,7 @@ #include "common/bit_field.h" #include "common/common_types.h" #include "core/hid/irs_types.h" -#include "core/hle/service/hid/irsensor/processor_base.h" +#include "service/hid/irsensor/processor_base.h" namespace Service::IRS { class TeraPluginProcessor final : public ProcessorBase { diff --git a/src/core/hle/service/hid/ring_lifo.h b/src/service/hid/ring_lifo.h similarity index 100% rename from src/core/hle/service/hid/ring_lifo.h rename to src/service/hid/ring_lifo.h diff --git a/src/core/hle/service/hid/xcd.cpp b/src/service/hid/xcd.cpp similarity index 97% rename from src/core/hle/service/hid/xcd.cpp rename to src/service/hid/xcd.cpp index 75cc266ea9..cb1387b029 100644 --- a/src/core/hle/service/hid/xcd.cpp +++ b/src/service/hid/xcd.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/hid/xcd.h" +#include "service/hid/xcd.h" namespace Service::HID { diff --git a/src/core/hle/service/hid/xcd.h b/src/service/hid/xcd.h similarity index 90% rename from src/core/hle/service/hid/xcd.h rename to src/service/hid/xcd.h index fe0b91b919..3cb81ff644 100644 --- a/src/core/hle/service/hid/xcd.h +++ b/src/service/hid/xcd.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/hle_ipc.cpp b/src/service/hle_ipc.cpp similarity index 98% rename from src/core/hle/service/hle_ipc.cpp rename to src/service/hle_ipc.cpp index ff374ae395..149e5de1c8 100644 --- a/src/core/hle/service/hle_ipc.cpp +++ b/src/service/hle_ipc.cpp @@ -12,16 +12,16 @@ #include "common/common_types.h" #include "common/logging/log.h" #include "common/scratch_buffer.h" -#include "core/hle/kernel/k_auto_object.h" -#include "core/hle/kernel/k_handle_table.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_server_port.h" -#include "core/hle/kernel/k_server_session.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/service/hle_ipc.h" -#include "core/hle/service/ipc_helpers.h" #include "core/memory.h" +#include "kernel/k_auto_object.h" +#include "kernel/k_handle_table.h" +#include "kernel/k_process.h" +#include "kernel/k_server_port.h" +#include "kernel/k_server_session.h" +#include "kernel/k_thread.h" +#include "kernel/kernel.h" +#include "service/hle_ipc.h" +#include "service/ipc_helpers.h" namespace { static thread_local std::array read_buffer_data_a{ diff --git a/src/core/hle/service/hle_ipc.h b/src/service/hle_ipc.h similarity index 99% rename from src/core/hle/service/hle_ipc.h rename to src/service/hle_ipc.h index ad5259a5cf..c15a6d6a67 100644 --- a/src/core/hle/service/hle_ipc.h +++ b/src/service/hle_ipc.h @@ -16,8 +16,8 @@ #include "common/common_types.h" #include "common/concepts.h" #include "common/swap.h" -#include "core/hle/ipc.h" -#include "core/hle/kernel/svc_common.h" +#include "core/ipc.h" +#include "kernel/svc_common.h" union Result; diff --git a/src/core/hle/service/ipc_helpers.h b/src/service/ipc_helpers.h similarity index 98% rename from src/core/hle/service/ipc_helpers.h rename to src/service/ipc_helpers.h index 0e222362e5..76508b6d3c 100644 --- a/src/core/hle/service/ipc_helpers.h +++ b/src/service/ipc_helpers.h @@ -9,13 +9,13 @@ #include #include "common/assert.h" #include "common/common_types.h" -#include "core/hle/ipc.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_resource_limit.h" -#include "core/hle/kernel/k_session.h" -#include "core/hle/result.h" -#include "core/hle/service/hle_ipc.h" -#include "core/hle/service/server_manager.h" +#include "core/ipc.h" +#include "core/result.h" +#include "kernel/k_process.h" +#include "kernel/k_resource_limit.h" +#include "kernel/k_session.h" +#include "service/hle_ipc.h" +#include "service/server_manager.h" namespace IPC { diff --git a/src/core/hle/service/jit/jit.cpp b/src/service/jit/jit.cpp similarity index 97% rename from src/core/hle/service/jit/jit.cpp rename to src/service/jit/jit.cpp index be996870f3..5a9fcc6717 100644 --- a/src/core/hle/service/jit/jit.cpp +++ b/src/service/jit/jit.cpp @@ -3,15 +3,15 @@ #include "core/arm/symbols.h" #include "core/core.h" -#include "core/hle/kernel/k_code_memory.h" -#include "core/hle/kernel/k_transfer_memory.h" -#include "core/hle/result.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/jit/jit.h" -#include "core/hle/service/jit/jit_context.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" #include "core/memory.h" +#include "core/result.h" +#include "kernel/k_code_memory.h" +#include "kernel/k_transfer_memory.h" +#include "service/ipc_helpers.h" +#include "service/jit/jit.h" +#include "service/jit/jit_context.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::JIT { diff --git a/src/core/hle/service/jit/jit.h b/src/service/jit/jit.h similarity index 100% rename from src/core/hle/service/jit/jit.h rename to src/service/jit/jit.h diff --git a/src/core/hle/service/jit/jit_context.cpp b/src/service/jit/jit_context.cpp similarity index 99% rename from src/core/hle/service/jit/jit_context.cpp rename to src/service/jit/jit_context.cpp index 0090e8568d..c1d75df12b 100644 --- a/src/core/hle/service/jit/jit_context.cpp +++ b/src/service/jit/jit_context.cpp @@ -13,8 +13,8 @@ #include "common/div_ceil.h" #include "common/elf.h" #include "common/logging/log.h" -#include "core/hle/service/jit/jit_context.h" #include "core/memory.h" +#include "service/jit/jit_context.h" using namespace Common::ELF; diff --git a/src/core/hle/service/jit/jit_context.h b/src/service/jit/jit_context.h similarity index 100% rename from src/core/hle/service/jit/jit_context.h rename to src/service/jit/jit_context.h diff --git a/src/core/hle/service/kernel_helpers.cpp b/src/service/kernel_helpers.cpp similarity index 85% rename from src/core/hle/service/kernel_helpers.cpp rename to src/service/kernel_helpers.cpp index f51e635647..708d887b51 100644 --- a/src/core/hle/service/kernel_helpers.cpp +++ b/src/service/kernel_helpers.cpp @@ -3,13 +3,13 @@ #include "core/core.h" #include "core/core_timing.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_memory_manager.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/kernel/k_resource_limit.h" -#include "core/hle/kernel/k_scoped_resource_reservation.h" -#include "core/hle/service/kernel_helpers.h" +#include "kernel/k_event.h" +#include "kernel/k_memory_manager.h" +#include "kernel/k_process.h" +#include "kernel/k_readable_event.h" +#include "kernel/k_resource_limit.h" +#include "kernel/k_scoped_resource_reservation.h" +#include "service/kernel_helpers.h" namespace Service::KernelHelpers { diff --git a/src/core/hle/service/kernel_helpers.h b/src/service/kernel_helpers.h similarity index 87% rename from src/core/hle/service/kernel_helpers.h rename to src/service/kernel_helpers.h index eca9aefb52..3362defaa7 100644 --- a/src/core/hle/service/kernel_helpers.h +++ b/src/service/kernel_helpers.h @@ -16,6 +16,8 @@ class KProcess; } // namespace Kernel namespace Service::KernelHelpers { +// This is defined by synchapi.h and conflicts with ServiceContext::CreateEvent +#undef CreateEvent class ServiceContext { public: diff --git a/src/core/hle/service/lbl/lbl.cpp b/src/service/lbl/lbl.cpp similarity index 98% rename from src/core/hle/service/lbl/lbl.cpp rename to src/service/lbl/lbl.cpp index 98a79365d4..5240ed6d0a 100644 --- a/src/core/hle/service/lbl/lbl.cpp +++ b/src/service/lbl/lbl.cpp @@ -5,11 +5,11 @@ #include #include "common/logging/log.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/lbl/lbl.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" +#include "service/ipc_helpers.h" +#include "service/lbl/lbl.h" +#include "service/server_manager.h" +#include "service/service.h" +#include "service/sm/sm.h" namespace Service::LBL { diff --git a/src/core/hle/service/lbl/lbl.h b/src/service/lbl/lbl.h similarity index 100% rename from src/core/hle/service/lbl/lbl.h rename to src/service/lbl/lbl.h diff --git a/src/core/hle/service/ldn/lan_discovery.cpp b/src/service/ldn/lan_discovery.cpp similarity index 99% rename from src/core/hle/service/ldn/lan_discovery.cpp rename to src/service/ldn/lan_discovery.cpp index 8f3c045501..fab73a96e0 100644 --- a/src/core/hle/service/ldn/lan_discovery.cpp +++ b/src/service/ldn/lan_discovery.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/ldn/lan_discovery.h" #include "core/internal_network/network.h" #include "core/internal_network/network_interface.h" +#include "service/ldn/lan_discovery.h" namespace Service::LDN { diff --git a/src/core/hle/service/ldn/lan_discovery.h b/src/service/ldn/lan_discovery.h similarity index 97% rename from src/core/hle/service/ldn/lan_discovery.h rename to src/service/ldn/lan_discovery.h index 3833cd764a..110b06248b 100644 --- a/src/core/hle/service/ldn/lan_discovery.h +++ b/src/service/ldn/lan_discovery.h @@ -16,10 +16,10 @@ #include "common/logging/log.h" #include "common/socket_types.h" -#include "core/hle/result.h" -#include "core/hle/service/ldn/ldn_results.h" -#include "core/hle/service/ldn/ldn_types.h" +#include "core/result.h" #include "network/network.h" +#include "service/ldn/ldn_results.h" +#include "service/ldn/ldn_types.h" namespace Service::LDN { diff --git a/src/core/hle/service/ldn/ldn.cpp b/src/service/ldn/ldn.cpp similarity index 98% rename from src/core/hle/service/ldn/ldn.cpp rename to src/service/ldn/ldn.cpp index 7927f82640..9369d88e7a 100644 --- a/src/core/hle/service/ldn/ldn.cpp +++ b/src/service/ldn/ldn.cpp @@ -4,17 +4,15 @@ #include #include "core/core.h" -#include "core/hle/service/ldn/lan_discovery.h" -#include "core/hle/service/ldn/ldn.h" -#include "core/hle/service/ldn/ldn_results.h" -#include "core/hle/service/ldn/ldn_types.h" -#include "core/hle/service/server_manager.h" #include "core/internal_network/network.h" #include "core/internal_network/network_interface.h" #include "network/network.h" - -// This is defined by synchapi.h and conflicts with ServiceContext::CreateEvent -#undef CreateEvent +#include "service/kernel_helpers.h" +#include "service/ldn/lan_discovery.h" +#include "service/ldn/ldn.h" +#include "service/ldn/ldn_results.h" +#include "service/ldn/ldn_types.h" +#include "service/server_manager.h" namespace Service::LDN { @@ -559,7 +557,7 @@ public: return ResultSuccess; } - KernelHelpers::ServiceContext service_context; + Service::KernelHelpers::ServiceContext service_context; Kernel::KEvent* state_change_event; Network::RoomNetwork& room_network; LANDiscovery lan_discovery; diff --git a/src/core/hle/service/ldn/ldn.h b/src/service/ldn/ldn.h similarity index 57% rename from src/core/hle/service/ldn/ldn.h rename to src/service/ldn/ldn.h index f4a319168d..b9def4adb3 100644 --- a/src/core/hle/service/ldn/ldn.h +++ b/src/service/ldn/ldn.h @@ -3,11 +3,11 @@ #pragma once -#include "core/hle/kernel/k_event.h" -#include "core/hle/result.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/sm/sm.h" +#include "core/result.h" +#include "kernel/k_event.h" +#include "service/ipc_helpers.h" +#include "service/kernel_helpers.h" +#include "service/sm/sm.h" namespace Core { class System; diff --git a/src/core/hle/service/ldn/ldn_results.h b/src/service/ldn/ldn_results.h similarity index 97% rename from src/core/hle/service/ldn/ldn_results.h rename to src/service/ldn/ldn_results.h index f340bda422..cad23523fa 100644 --- a/src/core/hle/service/ldn/ldn_results.h +++ b/src/service/ldn/ldn_results.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/result.h" +#include "core/result.h" namespace Service::LDN { diff --git a/src/core/hle/service/ldn/ldn_types.h b/src/service/ldn/ldn_types.h similarity index 100% rename from src/core/hle/service/ldn/ldn_types.h rename to src/service/ldn/ldn_types.h diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/service/ldr/ldr.cpp similarity index 98% rename from src/core/hle/service/ldr/ldr.cpp rename to src/service/ldr/ldr.cpp index 97b6a9385d..73e79cc4db 100644 --- a/src/core/hle/service/ldr/ldr.cpp +++ b/src/service/ldr/ldr.cpp @@ -9,15 +9,15 @@ #include "common/hex_util.h" #include "common/scope_exit.h" #include "core/core.h" -#include "core/hle/kernel/k_page_table.h" -#include "core/hle/kernel/svc_results.h" -#include "core/hle/kernel/svc_types.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/ldr/ldr.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" #include "core/loader/nro.h" #include "core/memory.h" +#include "kernel/k_page_table.h" +#include "kernel/svc_results.h" +#include "kernel/svc_types.h" +#include "service/ipc_helpers.h" +#include "service/ldr/ldr.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::LDR { diff --git a/src/core/hle/service/ldr/ldr.h b/src/service/ldr/ldr.h similarity index 100% rename from src/core/hle/service/ldr/ldr.h rename to src/service/ldr/ldr.h diff --git a/src/core/hle/service/lm/lm.cpp b/src/service/lm/lm.cpp similarity index 98% rename from src/core/hle/service/lm/lm.cpp rename to src/service/lm/lm.cpp index 20df002330..8d073e5578 100644 --- a/src/core/hle/service/lm/lm.cpp +++ b/src/service/lm/lm.cpp @@ -8,10 +8,10 @@ #include #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/lm/lm.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "service/ipc_helpers.h" +#include "service/lm/lm.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::LM { enum class LogSeverity : u8 { diff --git a/src/core/hle/service/lm/lm.h b/src/service/lm/lm.h similarity index 100% rename from src/core/hle/service/lm/lm.h rename to src/service/lm/lm.h diff --git a/src/core/hle/service/mig/mig.cpp b/src/service/mig/mig.cpp similarity index 91% rename from src/core/hle/service/mig/mig.cpp rename to src/service/mig/mig.cpp index 082e470aba..cf1dca3772 100644 --- a/src/core/hle/service/mig/mig.cpp +++ b/src/service/mig/mig.cpp @@ -3,9 +3,9 @@ #include -#include "core/hle/service/mig/mig.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "service/mig/mig.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::Migration { diff --git a/src/core/hle/service/mig/mig.h b/src/service/mig/mig.h similarity index 100% rename from src/core/hle/service/mig/mig.h rename to src/service/mig/mig.h diff --git a/src/core/hle/service/mii/mii.cpp b/src/service/mii/mii.cpp similarity index 97% rename from src/core/hle/service/mii/mii.cpp rename to src/service/mii/mii.cpp index c28eed9267..934b9edeae 100644 --- a/src/core/hle/service/mii/mii.cpp +++ b/src/service/mii/mii.cpp @@ -4,15 +4,15 @@ #include #include "common/logging/log.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/mii/mii.h" -#include "core/hle/service/mii/mii_manager.h" -#include "core/hle/service/mii/mii_result.h" -#include "core/hle/service/mii/types/char_info.h" -#include "core/hle/service/mii/types/store_data.h" -#include "core/hle/service/mii/types/ver3_store_data.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "service/ipc_helpers.h" +#include "service/mii/mii.h" +#include "service/mii/mii_manager.h" +#include "service/mii/mii_result.h" +#include "service/mii/types/char_info.h" +#include "service/mii/types/store_data.h" +#include "service/mii/types/ver3_store_data.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::Mii { diff --git a/src/core/hle/service/mii/mii.h b/src/service/mii/mii.h similarity index 94% rename from src/core/hle/service/mii/mii.h rename to src/service/mii/mii.h index 9aa4426f60..ededb2621d 100644 --- a/src/core/hle/service/mii/mii.h +++ b/src/service/mii/mii.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/mii/mii_database.cpp b/src/service/mii/mii_database.cpp similarity index 96% rename from src/core/hle/service/mii/mii_database.cpp rename to src/service/mii/mii_database.cpp index 3803e58e28..33c86e5fd2 100644 --- a/src/core/hle/service/mii/mii_database.cpp +++ b/src/service/mii/mii_database.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/mii/mii_database.h" -#include "core/hle/service/mii/mii_result.h" -#include "core/hle/service/mii/mii_util.h" +#include "service/mii/mii_database.h" +#include "service/mii/mii_result.h" +#include "service/mii/mii_util.h" namespace Service::Mii { diff --git a/src/core/hle/service/mii/mii_database.h b/src/service/mii/mii_database.h similarity index 95% rename from src/core/hle/service/mii/mii_database.h rename to src/service/mii/mii_database.h index 3bd240f93b..4c1c7cc081 100644 --- a/src/core/hle/service/mii/mii_database.h +++ b/src/service/mii/mii_database.h @@ -3,8 +3,8 @@ #pragma once -#include "core/hle/result.h" -#include "core/hle/service/mii/types/store_data.h" +#include "core/result.h" +#include "service/mii/types/store_data.h" namespace Service::Mii { diff --git a/src/core/hle/service/mii/mii_database_manager.cpp b/src/service/mii/mii_database_manager.cpp similarity index 97% rename from src/core/hle/service/mii/mii_database_manager.cpp rename to src/service/mii/mii_database_manager.cpp index 0080b67051..38f8ee986d 100644 --- a/src/core/hle/service/mii/mii_database_manager.cpp +++ b/src/service/mii/mii_database_manager.cpp @@ -8,11 +8,11 @@ #include "common/logging/log.h" #include "common/string_util.h" -#include "core/hle/service/mii/mii_database_manager.h" -#include "core/hle/service/mii/mii_result.h" -#include "core/hle/service/mii/mii_util.h" -#include "core/hle/service/mii/types/char_info.h" -#include "core/hle/service/mii/types/store_data.h" +#include "service/mii/mii_database_manager.h" +#include "service/mii/mii_result.h" +#include "service/mii/mii_util.h" +#include "service/mii/types/char_info.h" +#include "service/mii/types/store_data.h" namespace Service::Mii { const char* DbFileName = "MiiDatabase.dat"; diff --git a/src/core/hle/service/mii/mii_database_manager.h b/src/service/mii/mii_database_manager.h similarity index 96% rename from src/core/hle/service/mii/mii_database_manager.h rename to src/service/mii/mii_database_manager.h index 52c32be82c..7af62050ad 100644 --- a/src/core/hle/service/mii/mii_database_manager.h +++ b/src/service/mii/mii_database_manager.h @@ -4,8 +4,8 @@ #pragma once #include "common/fs/fs.h" -#include "core/hle/result.h" -#include "core/hle/service/mii/mii_database.h" +#include "core/result.h" +#include "service/mii/mii_database.h" namespace Service::Mii { class CharInfo; diff --git a/src/core/hle/service/mii/mii_manager.cpp b/src/service/mii/mii_manager.cpp similarity index 97% rename from src/core/hle/service/mii/mii_manager.cpp rename to src/service/mii/mii_manager.cpp index dcfd6b2e2a..9734edacc1 100644 --- a/src/core/hle/service/mii/mii_manager.cpp +++ b/src/service/mii/mii_manager.cpp @@ -2,15 +2,15 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/service/mii/mii_database_manager.h" -#include "core/hle/service/mii/mii_manager.h" -#include "core/hle/service/mii/mii_result.h" -#include "core/hle/service/mii/mii_util.h" -#include "core/hle/service/mii/types/char_info.h" -#include "core/hle/service/mii/types/core_data.h" -#include "core/hle/service/mii/types/raw_data.h" -#include "core/hle/service/mii/types/store_data.h" -#include "core/hle/service/mii/types/ver3_store_data.h" +#include "service/mii/mii_database_manager.h" +#include "service/mii/mii_manager.h" +#include "service/mii/mii_result.h" +#include "service/mii/mii_util.h" +#include "service/mii/types/char_info.h" +#include "service/mii/types/core_data.h" +#include "service/mii/types/raw_data.h" +#include "service/mii/types/store_data.h" +#include "service/mii/types/ver3_store_data.h" namespace Service::Mii { constexpr std::size_t DefaultMiiCount{RawData::DefaultMii.size()}; diff --git a/src/core/hle/service/mii/mii_manager.h b/src/service/mii/mii_manager.h similarity index 96% rename from src/core/hle/service/mii/mii_manager.h rename to src/service/mii/mii_manager.h index 48d8e8bb7d..dcc65a9531 100644 --- a/src/core/hle/service/mii/mii_manager.h +++ b/src/service/mii/mii_manager.h @@ -5,9 +5,9 @@ #include -#include "core/hle/result.h" -#include "core/hle/service/mii/mii_database_manager.h" -#include "core/hle/service/mii/mii_types.h" +#include "core/result.h" +#include "service/mii/mii_database_manager.h" +#include "service/mii/mii_types.h" namespace Service::Mii { class CharInfo; diff --git a/src/core/hle/service/mii/mii_result.h b/src/service/mii/mii_result.h similarity index 97% rename from src/core/hle/service/mii/mii_result.h rename to src/service/mii/mii_result.h index e2c36e556d..b8e3e96232 100644 --- a/src/core/hle/service/mii/mii_result.h +++ b/src/service/mii/mii_result.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/result.h" +#include "core/result.h" namespace Service::Mii { diff --git a/src/core/hle/service/mii/mii_types.h b/src/service/mii/mii_types.h similarity index 100% rename from src/core/hle/service/mii/mii_types.h rename to src/service/mii/mii_types.h diff --git a/src/core/hle/service/mii/mii_util.h b/src/service/mii/mii_util.h similarity index 98% rename from src/core/hle/service/mii/mii_util.h rename to src/service/mii/mii_util.h index 3534fa31d5..9d998ce12d 100644 --- a/src/core/hle/service/mii/mii_util.h +++ b/src/service/mii/mii_util.h @@ -9,7 +9,7 @@ #include "common/common_types.h" #include "common/swap.h" #include "common/uuid.h" -#include "core/hle/service/mii/mii_types.h" +#include "service/mii/mii_types.h" namespace Service::Mii { class MiiUtil { diff --git a/src/core/hle/service/mii/types/char_info.cpp b/src/service/mii/types/char_info.cpp similarity index 99% rename from src/core/hle/service/mii/types/char_info.cpp rename to src/service/mii/types/char_info.cpp index e90124af4c..428e589b5c 100644 --- a/src/core/hle/service/mii/types/char_info.cpp +++ b/src/service/mii/types/char_info.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/mii/types/char_info.h" -#include "core/hle/service/mii/types/store_data.h" +#include "service/mii/types/char_info.h" +#include "service/mii/types/store_data.h" namespace Service::Mii { diff --git a/src/core/hle/service/mii/types/char_info.h b/src/service/mii/types/char_info.h similarity index 98% rename from src/core/hle/service/mii/types/char_info.h rename to src/service/mii/types/char_info.h index d0c457fd56..7fbe31fc99 100644 --- a/src/core/hle/service/mii/types/char_info.h +++ b/src/service/mii/types/char_info.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/mii/mii_types.h" +#include "service/mii/mii_types.h" namespace Service::Mii { class StoreData; diff --git a/src/core/hle/service/mii/types/core_data.cpp b/src/service/mii/types/core_data.cpp similarity index 99% rename from src/core/hle/service/mii/types/core_data.cpp rename to src/service/mii/types/core_data.cpp index ba1da76bae..e95daf35da 100644 --- a/src/core/hle/service/mii/types/core_data.cpp +++ b/src/service/mii/types/core_data.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/assert.h" -#include "core/hle/service/mii/mii_util.h" -#include "core/hle/service/mii/types/char_info.h" -#include "core/hle/service/mii/types/core_data.h" -#include "core/hle/service/mii/types/raw_data.h" +#include "service/mii/mii_util.h" +#include "service/mii/types/char_info.h" +#include "service/mii/types/core_data.h" +#include "service/mii/types/raw_data.h" namespace Service::Mii { diff --git a/src/core/hle/service/mii/types/core_data.h b/src/service/mii/types/core_data.h similarity index 99% rename from src/core/hle/service/mii/types/core_data.h rename to src/service/mii/types/core_data.h index 8897e4f3b3..d34fe4f933 100644 --- a/src/core/hle/service/mii/types/core_data.h +++ b/src/service/mii/types/core_data.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/mii/mii_types.h" +#include "service/mii/mii_types.h" namespace Service::Mii { class CharInfo; diff --git a/src/core/hle/service/mii/types/raw_data.cpp b/src/service/mii/types/raw_data.cpp similarity index 99% rename from src/core/hle/service/mii/types/raw_data.cpp rename to src/service/mii/types/raw_data.cpp index 0e1a07fd76..12b17174bb 100644 --- a/src/core/hle/service/mii/types/raw_data.cpp +++ b/src/service/mii/types/raw_data.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Ryujinx Team and Contributors // SPDX-License-Identifier: MIT -#include "core/hle/service/mii/types/raw_data.h" +#include "service/mii/types/raw_data.h" namespace Service::Mii::RawData { diff --git a/src/core/hle/service/mii/types/raw_data.h b/src/service/mii/types/raw_data.h similarity index 98% rename from src/core/hle/service/mii/types/raw_data.h rename to src/service/mii/types/raw_data.h index 9a4cfa738e..65cde2e60c 100644 --- a/src/core/hle/service/mii/types/raw_data.h +++ b/src/service/mii/types/raw_data.h @@ -5,7 +5,7 @@ #include -#include "core/hle/service/mii/mii_types.h" +#include "service/mii/mii_types.h" namespace Service::Mii::RawData { diff --git a/src/core/hle/service/mii/types/store_data.cpp b/src/service/mii/types/store_data.cpp similarity index 99% rename from src/core/hle/service/mii/types/store_data.cpp rename to src/service/mii/types/store_data.cpp index 127221fdb6..6fe8489d49 100644 --- a/src/core/hle/service/mii/types/store_data.cpp +++ b/src/service/mii/types/store_data.cpp @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/mii/mii_result.h" -#include "core/hle/service/mii/mii_util.h" -#include "core/hle/service/mii/types/raw_data.h" -#include "core/hle/service/mii/types/store_data.h" +#include "service/mii/mii_result.h" +#include "service/mii/mii_util.h" +#include "service/mii/types/raw_data.h" +#include "service/mii/types/store_data.h" namespace Service::Mii { diff --git a/src/core/hle/service/mii/types/store_data.h b/src/service/mii/types/store_data.h similarity index 97% rename from src/core/hle/service/mii/types/store_data.h rename to src/service/mii/types/store_data.h index ed5dfb9494..e42fcd7adf 100644 --- a/src/core/hle/service/mii/types/store_data.h +++ b/src/service/mii/types/store_data.h @@ -3,9 +3,9 @@ #pragma once -#include "core/hle/result.h" -#include "core/hle/service/mii/mii_types.h" -#include "core/hle/service/mii/types/core_data.h" +#include "core/result.h" +#include "service/mii/mii_types.h" +#include "service/mii/types/core_data.h" namespace Service::Mii { diff --git a/src/core/hle/service/mii/types/ver3_store_data.cpp b/src/service/mii/types/ver3_store_data.cpp similarity index 98% rename from src/core/hle/service/mii/types/ver3_store_data.cpp rename to src/service/mii/types/ver3_store_data.cpp index a019cc9f71..62d08a7846 100644 --- a/src/core/hle/service/mii/types/ver3_store_data.cpp +++ b/src/service/mii/types/ver3_store_data.cpp @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/mii/mii_util.h" -#include "core/hle/service/mii/types/raw_data.h" -#include "core/hle/service/mii/types/store_data.h" -#include "core/hle/service/mii/types/ver3_store_data.h" +#include "service/mii/mii_util.h" +#include "service/mii/types/raw_data.h" +#include "service/mii/types/store_data.h" +#include "service/mii/types/ver3_store_data.h" namespace Service::Mii { diff --git a/src/core/hle/service/mii/types/ver3_store_data.h b/src/service/mii/types/ver3_store_data.h similarity index 98% rename from src/core/hle/service/mii/types/ver3_store_data.h rename to src/service/mii/types/ver3_store_data.h index 47907bf7d7..974c10a75f 100644 --- a/src/core/hle/service/mii/types/ver3_store_data.h +++ b/src/service/mii/types/ver3_store_data.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/mii/mii_types.h" +#include "service/mii/mii_types.h" namespace Service::Mii { class StoreData; diff --git a/src/core/hle/service/mm/mm_u.cpp b/src/service/mm/mm_u.cpp similarity index 95% rename from src/core/hle/service/mm/mm_u.cpp rename to src/service/mm/mm_u.cpp index 6f43b19684..4d55111518 100644 --- a/src/core/hle/service/mm/mm_u.cpp +++ b/src/service/mm/mm_u.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/mm/mm_u.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/sm/sm.h" +#include "service/ipc_helpers.h" +#include "service/mm/mm_u.h" +#include "service/server_manager.h" +#include "service/sm/sm.h" namespace Service::MM { diff --git a/src/core/hle/service/mm/mm_u.h b/src/service/mm/mm_u.h similarity index 100% rename from src/core/hle/service/mm/mm_u.h rename to src/service/mm/mm_u.h diff --git a/src/core/hle/service/mnpp/mnpp_app.cpp b/src/service/mnpp/mnpp_app.cpp similarity index 88% rename from src/core/hle/service/mnpp/mnpp_app.cpp rename to src/service/mnpp/mnpp_app.cpp index b11a920560..e2745c9d9e 100644 --- a/src/core/hle/service/mnpp/mnpp_app.cpp +++ b/src/service/mnpp/mnpp_app.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/mnpp/mnpp_app.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "service/ipc_helpers.h" +#include "service/mnpp/mnpp_app.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::MNPP { diff --git a/src/core/hle/service/mnpp/mnpp_app.h b/src/service/mnpp/mnpp_app.h similarity index 100% rename from src/core/hle/service/mnpp/mnpp_app.h rename to src/service/mnpp/mnpp_app.h diff --git a/src/core/hle/service/mutex.cpp b/src/service/mutex.cpp similarity index 90% rename from src/core/hle/service/mutex.cpp rename to src/service/mutex.cpp index b0ff71d1ba..63e7734156 100644 --- a/src/core/hle/service/mutex.cpp +++ b/src/service/mutex.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_synchronization_object.h" -#include "core/hle/service/mutex.h" +#include "kernel/k_event.h" +#include "kernel/k_synchronization_object.h" +#include "service/mutex.h" namespace Service { diff --git a/src/core/hle/service/mutex.h b/src/service/mutex.h similarity index 100% rename from src/core/hle/service/mutex.h rename to src/service/mutex.h diff --git a/src/core/hle/service/ncm/ncm.cpp b/src/service/ncm/ncm.cpp similarity index 97% rename from src/core/hle/service/ncm/ncm.cpp rename to src/service/ncm/ncm.cpp index 650666d6b7..d1aea16df3 100644 --- a/src/core/hle/service/ncm/ncm.cpp +++ b/src/service/ncm/ncm.cpp @@ -4,10 +4,10 @@ #include #include "core/file_sys/romfs_factory.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/ncm/ncm.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "service/ipc_helpers.h" +#include "service/ncm/ncm.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::NCM { diff --git a/src/core/hle/service/ncm/ncm.h b/src/service/ncm/ncm.h similarity index 100% rename from src/core/hle/service/ncm/ncm.h rename to src/service/ncm/ncm.h diff --git a/src/core/hle/service/nfc/common/amiibo_crypto.cpp b/src/service/nfc/common/amiibo_crypto.cpp similarity index 99% rename from src/core/hle/service/nfc/common/amiibo_crypto.cpp rename to src/service/nfc/common/amiibo_crypto.cpp index 9556e91936..6395e3b318 100644 --- a/src/core/hle/service/nfc/common/amiibo_crypto.cpp +++ b/src/service/nfc/common/amiibo_crypto.cpp @@ -12,7 +12,7 @@ #include "common/fs/fs.h" #include "common/fs/path_util.h" #include "common/logging/log.h" -#include "core/hle/service/nfc/common/amiibo_crypto.h" +#include "service/nfc/common/amiibo_crypto.h" namespace Service::NFP::AmiiboCrypto { diff --git a/src/core/hle/service/nfc/common/amiibo_crypto.h b/src/service/nfc/common/amiibo_crypto.h similarity index 98% rename from src/core/hle/service/nfc/common/amiibo_crypto.h rename to src/service/nfc/common/amiibo_crypto.h index 2cc0e4d519..1c9a42ef23 100644 --- a/src/core/hle/service/nfc/common/amiibo_crypto.h +++ b/src/service/nfc/common/amiibo_crypto.h @@ -5,7 +5,7 @@ #include -#include "core/hle/service/nfp/nfp_types.h" +#include "service/nfp/nfp_types.h" struct mbedtls_md_context_t; diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/service/nfc/common/device.cpp similarity index 99% rename from src/core/hle/service/nfc/common/device.cpp rename to src/service/nfc/common/device.cpp index e7a00deb38..f33398cb24 100644 --- a/src/core/hle/service/nfc/common/device.cpp +++ b/src/service/nfc/common/device.cpp @@ -25,14 +25,14 @@ #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" #include "core/hid/hid_types.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/mii/mii_manager.h" -#include "core/hle/service/nfc/common/amiibo_crypto.h" -#include "core/hle/service/nfc/common/device.h" -#include "core/hle/service/nfc/mifare_result.h" -#include "core/hle/service/nfc/nfc_result.h" -#include "core/hle/service/time/time_manager.h" +#include "kernel/k_event.h" +#include "service/ipc_helpers.h" +#include "service/mii/mii_manager.h" +#include "service/nfc/common/amiibo_crypto.h" +#include "service/nfc/common/device.h" +#include "service/nfc/mifare_result.h" +#include "service/nfc/nfc_result.h" +#include "service/time/time_manager.h" namespace Service::NFC { NfcDevice::NfcDevice(Core::HID::NpadIdType npad_id_, Core::System& system_, diff --git a/src/core/hle/service/nfc/common/device.h b/src/service/nfc/common/device.h similarity index 95% rename from src/core/hle/service/nfc/common/device.h rename to src/service/nfc/common/device.h index 0ed1ff34ca..c3f4ed1bbb 100644 --- a/src/core/hle/service/nfc/common/device.h +++ b/src/service/nfc/common/device.h @@ -6,12 +6,12 @@ #include #include "common/common_types.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/nfc/mifare_types.h" -#include "core/hle/service/nfc/nfc_types.h" -#include "core/hle/service/nfp/nfp_types.h" -#include "core/hle/service/service.h" -#include "core/hle/service/time/clock_types.h" +#include "service/kernel_helpers.h" +#include "service/nfc/mifare_types.h" +#include "service/nfc/nfc_types.h" +#include "service/nfp/nfp_types.h" +#include "service/service.h" +#include "service/time/clock_types.h" namespace Kernel { class KEvent; diff --git a/src/core/hle/service/nfc/common/device_manager.cpp b/src/service/nfc/common/device_manager.cpp similarity index 98% rename from src/core/hle/service/nfc/common/device_manager.cpp rename to src/service/nfc/common/device_manager.cpp index a71d26157f..f1279df941 100644 --- a/src/core/hle/service/nfc/common/device_manager.cpp +++ b/src/service/nfc/common/device_manager.cpp @@ -6,13 +6,13 @@ #include "common/logging/log.h" #include "core/core.h" #include "core/hid/hid_types.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nfc/common/device.h" -#include "core/hle/service/nfc/common/device_manager.h" -#include "core/hle/service/nfc/nfc_result.h" -#include "core/hle/service/time/clock_types.h" -#include "core/hle/service/time/time_manager.h" +#include "kernel/k_event.h" +#include "service/ipc_helpers.h" +#include "service/nfc/common/device.h" +#include "service/nfc/common/device_manager.h" +#include "service/nfc/nfc_result.h" +#include "service/time/clock_types.h" +#include "service/time/time_manager.h" namespace Service::NFC { diff --git a/src/core/hle/service/nfc/common/device_manager.h b/src/service/nfc/common/device_manager.h similarity index 94% rename from src/core/hle/service/nfc/common/device_manager.h rename to src/service/nfc/common/device_manager.h index c9f038e329..968028e861 100644 --- a/src/core/hle/service/nfc/common/device_manager.h +++ b/src/service/nfc/common/device_manager.h @@ -9,12 +9,12 @@ #include #include "core/hid/hid_types.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/nfc/mifare_types.h" -#include "core/hle/service/nfc/nfc_types.h" -#include "core/hle/service/nfp/nfp_types.h" -#include "core/hle/service/service.h" -#include "core/hle/service/time/clock_types.h" +#include "service/kernel_helpers.h" +#include "service/nfc/mifare_types.h" +#include "service/nfc/nfc_types.h" +#include "service/nfp/nfp_types.h" +#include "service/service.h" +#include "service/time/clock_types.h" namespace Service::NFC { class NfcDevice; diff --git a/src/core/hle/service/nfc/mifare_result.h b/src/service/nfc/mifare_result.h similarity index 95% rename from src/core/hle/service/nfc/mifare_result.h rename to src/service/nfc/mifare_result.h index 16a9171e60..811743e1c7 100644 --- a/src/core/hle/service/nfc/mifare_result.h +++ b/src/service/nfc/mifare_result.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/result.h" +#include "core/result.h" namespace Service::NFC::Mifare { diff --git a/src/core/hle/service/nfc/mifare_types.h b/src/service/nfc/mifare_types.h similarity index 100% rename from src/core/hle/service/nfc/mifare_types.h rename to src/service/nfc/mifare_types.h diff --git a/src/core/hle/service/nfc/nfc.cpp b/src/service/nfc/nfc.cpp similarity index 97% rename from src/core/hle/service/nfc/nfc.cpp rename to src/service/nfc/nfc.cpp index 30ae989b9b..65c89dab83 100644 --- a/src/core/hle/service/nfc/nfc.cpp +++ b/src/service/nfc/nfc.cpp @@ -5,11 +5,11 @@ #include "common/logging/log.h" #include "common/settings.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nfc/nfc.h" -#include "core/hle/service/nfc/nfc_interface.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "service/ipc_helpers.h" +#include "service/nfc/nfc.h" +#include "service/nfc/nfc_interface.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::NFC { diff --git a/src/core/hle/service/nfc/nfc.h b/src/service/nfc/nfc.h similarity index 100% rename from src/core/hle/service/nfc/nfc.h rename to src/service/nfc/nfc.h diff --git a/src/core/hle/service/nfc/nfc_interface.cpp b/src/service/nfc/nfc_interface.cpp similarity index 95% rename from src/core/hle/service/nfc/nfc_interface.cpp rename to src/service/nfc/nfc_interface.cpp index 179c7ba2c4..f3834f6b2c 100644 --- a/src/core/hle/service/nfc/nfc_interface.cpp +++ b/src/service/nfc/nfc_interface.cpp @@ -4,17 +4,17 @@ #include "common/logging/log.h" #include "core/core.h" #include "core/hid/hid_types.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nfc/common/device.h" -#include "core/hle/service/nfc/common/device_manager.h" -#include "core/hle/service/nfc/mifare_result.h" -#include "core/hle/service/nfc/mifare_types.h" -#include "core/hle/service/nfc/nfc_interface.h" -#include "core/hle/service/nfc/nfc_result.h" -#include "core/hle/service/nfc/nfc_types.h" -#include "core/hle/service/nfp/nfp_result.h" -#include "core/hle/service/time/clock_types.h" +#include "kernel/k_event.h" +#include "service/ipc_helpers.h" +#include "service/nfc/common/device.h" +#include "service/nfc/common/device_manager.h" +#include "service/nfc/mifare_result.h" +#include "service/nfc/mifare_types.h" +#include "service/nfc/nfc_interface.h" +#include "service/nfc/nfc_result.h" +#include "service/nfc/nfc_types.h" +#include "service/nfp/nfp_result.h" +#include "service/time/clock_types.h" namespace Service::NFC { diff --git a/src/core/hle/service/nfc/nfc_interface.h b/src/service/nfc/nfc_interface.h similarity index 92% rename from src/core/hle/service/nfc/nfc_interface.h rename to src/service/nfc/nfc_interface.h index 08be174d83..b25e447460 100644 --- a/src/core/hle/service/nfc/nfc_interface.h +++ b/src/service/nfc/nfc_interface.h @@ -3,9 +3,9 @@ #pragma once -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/nfc/nfc_types.h" -#include "core/hle/service/service.h" +#include "service/kernel_helpers.h" +#include "service/nfc/nfc_types.h" +#include "service/service.h" namespace Service::NFC { class DeviceManager; diff --git a/src/core/hle/service/nfc/nfc_result.h b/src/service/nfc/nfc_result.h similarity index 98% rename from src/core/hle/service/nfc/nfc_result.h rename to src/service/nfc/nfc_result.h index 464b5fd69a..e3620237b7 100644 --- a/src/core/hle/service/nfc/nfc_result.h +++ b/src/service/nfc/nfc_result.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/result.h" +#include "core/result.h" namespace Service::NFC { diff --git a/src/core/hle/service/nfc/nfc_types.h b/src/service/nfc/nfc_types.h similarity index 100% rename from src/core/hle/service/nfc/nfc_types.h rename to src/service/nfc/nfc_types.h diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/service/nfp/nfp.cpp similarity index 98% rename from src/core/hle/service/nfp/nfp.cpp rename to src/service/nfp/nfp.cpp index 2eeabc1387..16332f0c27 100644 --- a/src/core/hle/service/nfp/nfp.cpp +++ b/src/service/nfp/nfp.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nfp/nfp.h" -#include "core/hle/service/nfp/nfp_interface.h" -#include "core/hle/service/server_manager.h" +#include "service/ipc_helpers.h" +#include "service/nfp/nfp.h" +#include "service/nfp/nfp_interface.h" +#include "service/server_manager.h" namespace Service::NFP { diff --git a/src/core/hle/service/nfp/nfp.h b/src/service/nfp/nfp.h similarity index 85% rename from src/core/hle/service/nfp/nfp.h rename to src/service/nfp/nfp.h index a5aac710b5..9b467d3e28 100644 --- a/src/core/hle/service/nfp/nfp.h +++ b/src/service/nfp/nfp.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Service::NFP { diff --git a/src/core/hle/service/nfp/nfp_interface.cpp b/src/service/nfp/nfp_interface.cpp similarity index 97% rename from src/core/hle/service/nfp/nfp_interface.cpp rename to src/service/nfp/nfp_interface.cpp index 34ef9d82dc..065bccb56b 100644 --- a/src/core/hle/service/nfp/nfp_interface.cpp +++ b/src/service/nfp/nfp_interface.cpp @@ -4,14 +4,14 @@ #include "common/logging/log.h" #include "core/core.h" #include "core/hid/hid_types.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nfc/common/device.h" -#include "core/hle/service/nfc/common/device_manager.h" -#include "core/hle/service/nfc/nfc_types.h" -#include "core/hle/service/nfp/nfp_interface.h" -#include "core/hle/service/nfp/nfp_result.h" -#include "core/hle/service/nfp/nfp_types.h" +#include "kernel/k_event.h" +#include "service/ipc_helpers.h" +#include "service/nfc/common/device.h" +#include "service/nfc/common/device_manager.h" +#include "service/nfc/nfc_types.h" +#include "service/nfp/nfp_interface.h" +#include "service/nfp/nfp_result.h" +#include "service/nfp/nfp_types.h" namespace Service::NFP { diff --git a/src/core/hle/service/nfp/nfp_interface.h b/src/service/nfp/nfp_interface.h similarity index 93% rename from src/core/hle/service/nfp/nfp_interface.h rename to src/service/nfp/nfp_interface.h index fa985b068e..1bcc94807b 100644 --- a/src/core/hle/service/nfp/nfp_interface.h +++ b/src/service/nfp/nfp_interface.h @@ -3,9 +3,9 @@ #pragma once -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/nfc/nfc_interface.h" -#include "core/hle/service/service.h" +#include "service/kernel_helpers.h" +#include "service/nfc/nfc_interface.h" +#include "service/service.h" namespace Service::NFP { diff --git a/src/core/hle/service/nfp/nfp_result.h b/src/service/nfp/nfp_result.h similarity index 97% rename from src/core/hle/service/nfp/nfp_result.h rename to src/service/nfp/nfp_result.h index 6185338438..8d14c4357b 100644 --- a/src/core/hle/service/nfp/nfp_result.h +++ b/src/service/nfp/nfp_result.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/result.h" +#include "core/result.h" namespace Service::NFP { diff --git a/src/core/hle/service/nfp/nfp_types.h b/src/service/nfp/nfp_types.h similarity index 98% rename from src/core/hle/service/nfp/nfp_types.h rename to src/service/nfp/nfp_types.h index f96d212205..172b15ba5a 100644 --- a/src/core/hle/service/nfp/nfp_types.h +++ b/src/service/nfp/nfp_types.h @@ -6,10 +6,10 @@ #include #include "common/swap.h" -#include "core/hle/service/mii/types/char_info.h" -#include "core/hle/service/mii/types/store_data.h" -#include "core/hle/service/mii/types/ver3_store_data.h" -#include "core/hle/service/nfc/nfc_types.h" +#include "service/mii/types/char_info.h" +#include "service/mii/types/store_data.h" +#include "service/mii/types/ver3_store_data.h" +#include "service/nfc/nfc_types.h" namespace Service::NFP { static constexpr std::size_t amiibo_name_length = 0xA; diff --git a/src/core/hle/service/ngc/ngc.cpp b/src/service/ngc/ngc.cpp similarity index 96% rename from src/core/hle/service/ngc/ngc.cpp rename to src/service/ngc/ngc.cpp index c26019ec09..4556fae145 100644 --- a/src/core/hle/service/ngc/ngc.cpp +++ b/src/service/ngc/ngc.cpp @@ -3,10 +3,10 @@ #include "common/string_util.h" #include "core/core.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/ngc/ngc.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "service/ipc_helpers.h" +#include "service/ngc/ngc.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::NGC { diff --git a/src/core/hle/service/ngc/ngc.h b/src/service/ngc/ngc.h similarity index 100% rename from src/core/hle/service/ngc/ngc.h rename to src/service/ngc/ngc.h diff --git a/src/core/hle/service/nifm/nifm.cpp b/src/service/nifm/nifm.cpp similarity index 99% rename from src/core/hle/service/nifm/nifm.cpp rename to src/service/nifm/nifm.cpp index 22dc55a6dc..a5d14f58ca 100644 --- a/src/core/hle/service/nifm/nifm.cpp +++ b/src/service/nifm/nifm.cpp @@ -2,12 +2,12 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/nifm/nifm.h" -#include "core/hle/service/server_manager.h" +#include "kernel/k_event.h" #include "network/network.h" +#include "service/ipc_helpers.h" +#include "service/kernel_helpers.h" +#include "service/nifm/nifm.h" +#include "service/server_manager.h" namespace { diff --git a/src/core/hle/service/nifm/nifm.h b/src/service/nifm/nifm.h similarity index 97% rename from src/core/hle/service/nifm/nifm.h rename to src/service/nifm/nifm.h index b74b664381..e750852e72 100644 --- a/src/core/hle/service/nifm/nifm.h +++ b/src/service/nifm/nifm.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/nim/nim.cpp b/src/service/nim/nim.cpp similarity index 98% rename from src/core/hle/service/nim/nim.cpp rename to src/service/nim/nim.cpp index 42de87f9ae..134a665e35 100644 --- a/src/core/hle/service/nim/nim.cpp +++ b/src/service/nim/nim.cpp @@ -4,12 +4,12 @@ #include #include #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/nim/nim.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "kernel/k_event.h" +#include "service/ipc_helpers.h" +#include "service/kernel_helpers.h" +#include "service/nim/nim.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::NIM { diff --git a/src/core/hle/service/nim/nim.h b/src/service/nim/nim.h similarity index 100% rename from src/core/hle/service/nim/nim.h rename to src/service/nim/nim.h diff --git a/src/core/hle/service/npns/npns.cpp b/src/service/npns/npns.cpp similarity index 97% rename from src/core/hle/service/npns/npns.cpp rename to src/service/npns/npns.cpp index a162e5c548..5a60b3b6c3 100644 --- a/src/core/hle/service/npns/npns.cpp +++ b/src/service/npns/npns.cpp @@ -3,9 +3,9 @@ #include -#include "core/hle/service/npns/npns.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "service/npns/npns.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::NPNS { diff --git a/src/core/hle/service/npns/npns.h b/src/service/npns/npns.h similarity index 100% rename from src/core/hle/service/npns/npns.h rename to src/service/npns/npns.h diff --git a/src/core/hle/service/ns/errors.h b/src/service/ns/errors.h similarity index 88% rename from src/core/hle/service/ns/errors.h rename to src/service/ns/errors.h index 16d2ea6f7b..b5d31188f1 100644 --- a/src/core/hle/service/ns/errors.h +++ b/src/service/ns/errors.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/result.h" +#include "core/result.h" namespace Service::NS { diff --git a/src/core/hle/service/ns/iplatform_service_manager.cpp b/src/service/ns/iplatform_service_manager.cpp similarity index 97% rename from src/core/hle/service/ns/iplatform_service_manager.cpp rename to src/service/ns/iplatform_service_manager.cpp index 46268be952..04680bb792 100644 --- a/src/core/hle/service/ns/iplatform_service_manager.cpp +++ b/src/service/ns/iplatform_service_manager.cpp @@ -15,12 +15,12 @@ #include "core/file_sys/registered_cache.h" #include "core/file_sys/romfs.h" #include "core/file_sys/system_archive/system_archive.h" -#include "core/hle/kernel/k_shared_memory.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/kernel/physical_memory.h" -#include "core/hle/service/filesystem/filesystem.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/ns/iplatform_service_manager.h" +#include "kernel/k_shared_memory.h" +#include "kernel/kernel.h" +#include "kernel/physical_memory.h" +#include "service/filesystem/filesystem.h" +#include "service/ipc_helpers.h" +#include "service/ns/iplatform_service_manager.h" namespace Service::NS { diff --git a/src/core/hle/service/ns/iplatform_service_manager.h b/src/service/ns/iplatform_service_manager.h similarity index 98% rename from src/core/hle/service/ns/iplatform_service_manager.h rename to src/service/ns/iplatform_service_manager.h index 03071e02b8..dc38b2dbc3 100644 --- a/src/core/hle/service/ns/iplatform_service_manager.h +++ b/src/service/ns/iplatform_service_manager.h @@ -5,7 +5,7 @@ #include #include -#include "core/hle/service/service.h" +#include "service/service.h" namespace Service { diff --git a/src/core/hle/service/ns/language.cpp b/src/service/ns/language.cpp similarity index 99% rename from src/core/hle/service/ns/language.cpp rename to src/service/ns/language.cpp index 036a1e9b7b..6ac21c8e20 100644 --- a/src/core/hle/service/ns/language.cpp +++ b/src/service/ns/language.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/ns/language.h" -#include "core/hle/service/set/set.h" +#include "service/ns/language.h" +#include "service/set/set.h" namespace Service::NS { diff --git a/src/core/hle/service/ns/language.h b/src/service/ns/language.h similarity index 100% rename from src/core/hle/service/ns/language.h rename to src/service/ns/language.h diff --git a/src/core/hle/service/ns/ns.cpp b/src/service/ns/ns.cpp similarity index 98% rename from src/core/hle/service/ns/ns.cpp rename to src/service/ns/ns.cpp index f9e0e272df..08a058ba85 100644 --- a/src/core/hle/service/ns/ns.cpp +++ b/src/service/ns/ns.cpp @@ -7,16 +7,16 @@ #include "core/file_sys/control_metadata.h" #include "core/file_sys/patch_manager.h" #include "core/file_sys/vfs.h" -#include "core/hle/service/filesystem/filesystem.h" -#include "core/hle/service/glue/glue_manager.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/ns/errors.h" -#include "core/hle/service/ns/iplatform_service_manager.h" -#include "core/hle/service/ns/language.h" -#include "core/hle/service/ns/ns.h" -#include "core/hle/service/ns/pdm_qry.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/set/set.h" +#include "service/filesystem/filesystem.h" +#include "service/glue/glue_manager.h" +#include "service/ipc_helpers.h" +#include "service/ns/errors.h" +#include "service/ns/iplatform_service_manager.h" +#include "service/ns/language.h" +#include "service/ns/ns.h" +#include "service/ns/pdm_qry.h" +#include "service/server_manager.h" +#include "service/set/set.h" namespace Service::NS { diff --git a/src/core/hle/service/ns/ns.h b/src/service/ns/ns.h similarity index 99% rename from src/core/hle/service/ns/ns.h rename to src/service/ns/ns.h index 34d2a45dcb..16115a307c 100644 --- a/src/core/hle/service/ns/ns.h +++ b/src/service/ns/ns.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/ns/pdm_qry.cpp b/src/service/ns/pdm_qry.cpp similarity index 95% rename from src/core/hle/service/ns/pdm_qry.cpp rename to src/service/ns/pdm_qry.cpp index ce0ee30e01..eb20caa31f 100644 --- a/src/core/hle/service/ns/pdm_qry.cpp +++ b/src/service/ns/pdm_qry.cpp @@ -5,9 +5,9 @@ #include "common/logging/log.h" #include "common/uuid.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/ns/pdm_qry.h" -#include "core/hle/service/service.h" +#include "service/ipc_helpers.h" +#include "service/ns/pdm_qry.h" +#include "service/service.h" namespace Service::NS { diff --git a/src/core/hle/service/ns/pdm_qry.h b/src/service/ns/pdm_qry.h similarity index 95% rename from src/core/hle/service/ns/pdm_qry.h rename to src/service/ns/pdm_qry.h index c98e016609..86fe0cfc23 100644 --- a/src/core/hle/service/ns/pdm_qry.h +++ b/src/service/ns/pdm_qry.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Service::NS { diff --git a/src/core/hle/service/nvdrv/core/container.cpp b/src/service/nvdrv/core/container.cpp similarity index 88% rename from src/core/hle/service/nvdrv/core/container.cpp rename to src/service/nvdrv/core/container.cpp index 37ca24f5db..ad270ac341 100644 --- a/src/core/hle/service/nvdrv/core/container.cpp +++ b/src/service/nvdrv/core/container.cpp @@ -2,9 +2,9 @@ // SPDX-FileCopyrightText: 2022 Skyline Team and Contributors // SPDX-License-Identifier: GPL-3.0-or-later -#include "core/hle/service/nvdrv/core/container.h" -#include "core/hle/service/nvdrv/core/nvmap.h" -#include "core/hle/service/nvdrv/core/syncpoint_manager.h" +#include "service/nvdrv/core/container.h" +#include "service/nvdrv/core/nvmap.h" +#include "service/nvdrv/core/syncpoint_manager.h" #include "video_core/host1x/host1x.h" namespace Service::Nvidia::NvCore { diff --git a/src/core/hle/service/nvdrv/core/container.h b/src/service/nvdrv/core/container.h similarity index 96% rename from src/core/hle/service/nvdrv/core/container.h rename to src/service/nvdrv/core/container.h index b4b63ac90c..bffd299c30 100644 --- a/src/core/hle/service/nvdrv/core/container.h +++ b/src/service/nvdrv/core/container.h @@ -8,7 +8,7 @@ #include #include -#include "core/hle/service/nvdrv/nvdata.h" +#include "service/nvdrv/nvdata.h" namespace Tegra::Host1x { class Host1x; diff --git a/src/core/hle/service/nvdrv/core/nvmap.cpp b/src/service/nvdrv/core/nvmap.cpp similarity index 99% rename from src/core/hle/service/nvdrv/core/nvmap.cpp rename to src/service/nvdrv/core/nvmap.cpp index 0ca05257e7..c38874e499 100644 --- a/src/core/hle/service/nvdrv/core/nvmap.cpp +++ b/src/service/nvdrv/core/nvmap.cpp @@ -5,8 +5,8 @@ #include "common/alignment.h" #include "common/assert.h" #include "common/logging/log.h" -#include "core/hle/service/nvdrv/core/nvmap.h" #include "core/memory.h" +#include "service/nvdrv/core/nvmap.h" #include "video_core/host1x/host1x.h" using Core::Memory::YUZU_PAGESIZE; diff --git a/src/core/hle/service/nvdrv/core/nvmap.h b/src/service/nvdrv/core/nvmap.h similarity index 99% rename from src/core/hle/service/nvdrv/core/nvmap.h rename to src/service/nvdrv/core/nvmap.h index a8e5738909..ef73af9032 100644 --- a/src/core/hle/service/nvdrv/core/nvmap.h +++ b/src/service/nvdrv/core/nvmap.h @@ -14,7 +14,7 @@ #include "common/bit_field.h" #include "common/common_types.h" -#include "core/hle/service/nvdrv/nvdata.h" +#include "service/nvdrv/nvdata.h" namespace Tegra { diff --git a/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp b/src/service/nvdrv/core/syncpoint_manager.cpp similarity index 98% rename from src/core/hle/service/nvdrv/core/syncpoint_manager.cpp rename to src/service/nvdrv/core/syncpoint_manager.cpp index c4c4c25932..1edd208855 100644 --- a/src/core/hle/service/nvdrv/core/syncpoint_manager.cpp +++ b/src/service/nvdrv/core/syncpoint_manager.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include "common/assert.h" -#include "core/hle/service/nvdrv/core/syncpoint_manager.h" +#include "service/nvdrv/core/syncpoint_manager.h" #include "video_core/host1x/host1x.h" namespace Service::Nvidia::NvCore { diff --git a/src/core/hle/service/nvdrv/core/syncpoint_manager.h b/src/service/nvdrv/core/syncpoint_manager.h similarity index 99% rename from src/core/hle/service/nvdrv/core/syncpoint_manager.h rename to src/service/nvdrv/core/syncpoint_manager.h index 7728ff5967..9c74766453 100644 --- a/src/core/hle/service/nvdrv/core/syncpoint_manager.h +++ b/src/service/nvdrv/core/syncpoint_manager.h @@ -9,7 +9,7 @@ #include #include "common/common_types.h" -#include "core/hle/service/nvdrv/nvdata.h" +#include "service/nvdrv/nvdata.h" namespace Tegra::Host1x { class Host1x; diff --git a/src/core/hle/service/nvdrv/devices/ioctl_serialization.h b/src/service/nvdrv/devices/ioctl_serialization.h similarity index 99% rename from src/core/hle/service/nvdrv/devices/ioctl_serialization.h rename to src/service/nvdrv/devices/ioctl_serialization.h index b12bcd1384..a287c81d99 100644 --- a/src/core/hle/service/nvdrv/devices/ioctl_serialization.h +++ b/src/service/nvdrv/devices/ioctl_serialization.h @@ -7,7 +7,7 @@ #include #include "common/concepts.h" -#include "core/hle/service/nvdrv/devices/nvdevice.h" +#include "service/nvdrv/devices/nvdevice.h" namespace Service::Nvidia::Devices { diff --git a/src/core/hle/service/nvdrv/devices/nvdevice.h b/src/service/nvdrv/devices/nvdevice.h similarity index 98% rename from src/core/hle/service/nvdrv/devices/nvdevice.h rename to src/service/nvdrv/devices/nvdevice.h index a04538d5d0..9375a8349f 100644 --- a/src/core/hle/service/nvdrv/devices/nvdevice.h +++ b/src/service/nvdrv/devices/nvdevice.h @@ -7,7 +7,7 @@ #include #include "common/common_types.h" -#include "core/hle/service/nvdrv/nvdata.h" +#include "service/nvdrv/nvdata.h" namespace Core { class System; diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp b/src/service/nvdrv/devices/nvdisp_disp0.cpp similarity index 94% rename from src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp rename to src/service/nvdrv/devices/nvdisp_disp0.cpp index 05a43d8dc4..81818dc252 100644 --- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp +++ b/src/service/nvdrv/devices/nvdisp_disp0.cpp @@ -5,10 +5,10 @@ #include "common/logging/log.h" #include "core/core.h" #include "core/core_timing.h" -#include "core/hle/service/nvdrv/core/container.h" -#include "core/hle/service/nvdrv/core/nvmap.h" -#include "core/hle/service/nvdrv/devices/nvdisp_disp0.h" #include "core/perf_stats.h" +#include "service/nvdrv/core/container.h" +#include "service/nvdrv/core/nvmap.h" +#include "service/nvdrv/devices/nvdisp_disp0.h" #include "video_core/gpu.h" namespace Service::Nvidia::Devices { diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h b/src/service/nvdrv/devices/nvdisp_disp0.h similarity index 90% rename from src/core/hle/service/nvdrv/devices/nvdisp_disp0.h rename to src/service/nvdrv/devices/nvdisp_disp0.h index daee05fe81..3fe0d537a6 100644 --- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h +++ b/src/service/nvdrv/devices/nvdisp_disp0.h @@ -7,9 +7,9 @@ #include #include "common/common_types.h" #include "common/math_util.h" -#include "core/hle/service/nvdrv/devices/nvdevice.h" -#include "core/hle/service/nvnflinger/buffer_transform_flags.h" -#include "core/hle/service/nvnflinger/pixel_format.h" +#include "service/nvdrv/devices/nvdevice.h" +#include "service/nvnflinger/buffer_transform_flags.h" +#include "service/nvnflinger/pixel_format.h" namespace Service::Nvidia::NvCore { class Container; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp b/src/service/nvdrv/devices/nvhost_as_gpu.cpp similarity index 98% rename from src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp rename to src/service/nvdrv/devices/nvhost_as_gpu.cpp index 6b36390087..1334300857 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp +++ b/src/service/nvdrv/devices/nvhost_as_gpu.cpp @@ -9,12 +9,12 @@ #include "common/assert.h" #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/service/nvdrv/core/container.h" -#include "core/hle/service/nvdrv/core/nvmap.h" -#include "core/hle/service/nvdrv/devices/ioctl_serialization.h" -#include "core/hle/service/nvdrv/devices/nvhost_as_gpu.h" -#include "core/hle/service/nvdrv/devices/nvhost_gpu.h" -#include "core/hle/service/nvdrv/nvdrv.h" +#include "service/nvdrv/core/container.h" +#include "service/nvdrv/core/nvmap.h" +#include "service/nvdrv/devices/ioctl_serialization.h" +#include "service/nvdrv/devices/nvhost_as_gpu.h" +#include "service/nvdrv/devices/nvhost_gpu.h" +#include "service/nvdrv/nvdrv.h" #include "video_core/control/channel_state.h" #include "video_core/gpu.h" #include "video_core/memory_manager.h" diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h b/src/service/nvdrv/devices/nvhost_as_gpu.h similarity index 98% rename from src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h rename to src/service/nvdrv/devices/nvhost_as_gpu.h index 932997e75f..e318749785 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h +++ b/src/service/nvdrv/devices/nvhost_as_gpu.h @@ -17,8 +17,8 @@ #include "common/common_types.h" #include "common/scratch_buffer.h" #include "common/swap.h" -#include "core/hle/service/nvdrv/core/nvmap.h" -#include "core/hle/service/nvdrv/devices/nvdevice.h" +#include "service/nvdrv/core/nvmap.h" +#include "service/nvdrv/devices/nvdevice.h" namespace Tegra { class MemoryManager; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/service/nvdrv/devices/nvhost_ctrl.cpp similarity index 97% rename from src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp rename to src/service/nvdrv/devices/nvhost_ctrl.cpp index b8dd34e24f..f5e4728d75 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp +++ b/src/service/nvdrv/devices/nvhost_ctrl.cpp @@ -11,11 +11,11 @@ #include "common/logging/log.h" #include "common/scope_exit.h" #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/nvdrv/core/container.h" -#include "core/hle/service/nvdrv/core/syncpoint_manager.h" -#include "core/hle/service/nvdrv/devices/ioctl_serialization.h" -#include "core/hle/service/nvdrv/devices/nvhost_ctrl.h" +#include "kernel/k_event.h" +#include "service/nvdrv/core/container.h" +#include "service/nvdrv/core/syncpoint_manager.h" +#include "service/nvdrv/devices/ioctl_serialization.h" +#include "service/nvdrv/devices/nvhost_ctrl.h" #include "video_core/gpu.h" #include "video_core/host1x/host1x.h" diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h b/src/service/nvdrv/devices/nvhost_ctrl.h similarity index 98% rename from src/core/hle/service/nvdrv/devices/nvhost_ctrl.h rename to src/service/nvdrv/devices/nvhost_ctrl.h index 992124b600..72da2e002e 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h +++ b/src/service/nvdrv/devices/nvhost_ctrl.h @@ -8,8 +8,8 @@ #include #include "common/bit_field.h" #include "common/common_types.h" -#include "core/hle/service/nvdrv/devices/nvdevice.h" -#include "core/hle/service/nvdrv/nvdrv.h" +#include "service/nvdrv/devices/nvdevice.h" +#include "service/nvdrv/nvdrv.h" #include "video_core/host1x/syncpoint_manager.h" namespace Service::Nvidia::NvCore { diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp b/src/service/nvdrv/devices/nvhost_ctrl_gpu.cpp similarity index 98% rename from src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp rename to src/service/nvdrv/devices/nvhost_ctrl_gpu.cpp index 61a2df1216..aed10a0c87 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp +++ b/src/service/nvdrv/devices/nvhost_ctrl_gpu.cpp @@ -6,9 +6,9 @@ #include "common/logging/log.h" #include "core/core.h" #include "core/core_timing.h" -#include "core/hle/service/nvdrv/devices/ioctl_serialization.h" -#include "core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h" -#include "core/hle/service/nvdrv/nvdrv.h" +#include "service/nvdrv/devices/ioctl_serialization.h" +#include "service/nvdrv/devices/nvhost_ctrl_gpu.h" +#include "service/nvdrv/nvdrv.h" namespace Service::Nvidia::Devices { diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h b/src/service/nvdrv/devices/nvhost_ctrl_gpu.h similarity index 99% rename from src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h rename to src/service/nvdrv/devices/nvhost_ctrl_gpu.h index d170299bdc..80ddd26a9b 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h +++ b/src/service/nvdrv/devices/nvhost_ctrl_gpu.h @@ -8,7 +8,7 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "common/swap.h" -#include "core/hle/service/nvdrv/devices/nvdevice.h" +#include "service/nvdrv/devices/nvdevice.h" namespace Service::Nvidia { class EventInterface; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp b/src/service/nvdrv/devices/nvhost_gpu.cpp similarity index 97% rename from src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp rename to src/service/nvdrv/devices/nvhost_gpu.cpp index b0395c2f02..32d7b5b1a3 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp +++ b/src/service/nvdrv/devices/nvhost_gpu.cpp @@ -5,13 +5,13 @@ #include "common/assert.h" #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/service/nvdrv/core/container.h" -#include "core/hle/service/nvdrv/core/nvmap.h" -#include "core/hle/service/nvdrv/core/syncpoint_manager.h" -#include "core/hle/service/nvdrv/devices/ioctl_serialization.h" -#include "core/hle/service/nvdrv/devices/nvhost_gpu.h" -#include "core/hle/service/nvdrv/nvdrv.h" #include "core/memory.h" +#include "service/nvdrv/core/container.h" +#include "service/nvdrv/core/nvmap.h" +#include "service/nvdrv/core/syncpoint_manager.h" +#include "service/nvdrv/devices/ioctl_serialization.h" +#include "service/nvdrv/devices/nvhost_gpu.h" +#include "service/nvdrv/nvdrv.h" #include "video_core/control/channel_state.h" #include "video_core/engines/puller.h" #include "video_core/gpu.h" diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h b/src/service/nvdrv/devices/nvhost_gpu.h similarity index 98% rename from src/core/hle/service/nvdrv/devices/nvhost_gpu.h rename to src/service/nvdrv/devices/nvhost_gpu.h index 88fd228ffe..08f8e452b9 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h +++ b/src/service/nvdrv/devices/nvhost_gpu.h @@ -9,8 +9,8 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "common/swap.h" -#include "core/hle/service/nvdrv/devices/nvdevice.h" -#include "core/hle/service/nvdrv/nvdata.h" +#include "service/nvdrv/devices/nvdevice.h" +#include "service/nvdrv/nvdata.h" #include "video_core/dma_pusher.h" namespace Tegra { diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp b/src/service/nvdrv/devices/nvhost_nvdec.cpp similarity index 94% rename from src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp rename to src/service/nvdrv/devices/nvhost_nvdec.cpp index f43914e1b6..03ff5bc973 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp +++ b/src/service/nvdrv/devices/nvhost_nvdec.cpp @@ -5,9 +5,9 @@ #include "common/assert.h" #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/service/nvdrv/core/container.h" -#include "core/hle/service/nvdrv/devices/ioctl_serialization.h" -#include "core/hle/service/nvdrv/devices/nvhost_nvdec.h" +#include "service/nvdrv/core/container.h" +#include "service/nvdrv/devices/ioctl_serialization.h" +#include "service/nvdrv/devices/nvhost_nvdec.h" #include "video_core/renderer_base.h" namespace Service::Nvidia::Devices { diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h b/src/service/nvdrv/devices/nvhost_nvdec.h similarity index 93% rename from src/core/hle/service/nvdrv/devices/nvhost_nvdec.h rename to src/service/nvdrv/devices/nvhost_nvdec.h index ad2233c493..19fbb9eb26 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h +++ b/src/service/nvdrv/devices/nvhost_nvdec.h @@ -4,7 +4,7 @@ #pragma once #include -#include "core/hle/service/nvdrv/devices/nvhost_nvdec_common.h" +#include "service/nvdrv/devices/nvhost_nvdec_common.h" namespace Service::Nvidia::Devices { diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp b/src/service/nvdrv/devices/nvhost_nvdec_common.cpp similarity index 96% rename from src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp rename to src/service/nvdrv/devices/nvhost_nvdec_common.cpp index 74c701b957..5efeeb6d59 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp +++ b/src/service/nvdrv/devices/nvhost_nvdec_common.cpp @@ -8,11 +8,11 @@ #include "common/common_types.h" #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/service/nvdrv/core/container.h" -#include "core/hle/service/nvdrv/core/nvmap.h" -#include "core/hle/service/nvdrv/core/syncpoint_manager.h" -#include "core/hle/service/nvdrv/devices/nvhost_nvdec_common.h" #include "core/memory.h" +#include "service/nvdrv/core/container.h" +#include "service/nvdrv/core/nvmap.h" +#include "service/nvdrv/core/syncpoint_manager.h" +#include "service/nvdrv/devices/nvhost_nvdec_common.h" #include "video_core/host1x/host1x.h" #include "video_core/memory_manager.h" #include "video_core/renderer_base.h" diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h b/src/service/nvdrv/devices/nvhost_nvdec_common.h similarity index 97% rename from src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h rename to src/service/nvdrv/devices/nvhost_nvdec_common.h index 7ce748e18b..e6e4604d3d 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h +++ b/src/service/nvdrv/devices/nvhost_nvdec_common.h @@ -7,8 +7,8 @@ #include #include "common/common_types.h" #include "common/swap.h" -#include "core/hle/service/nvdrv/core/syncpoint_manager.h" -#include "core/hle/service/nvdrv/devices/nvdevice.h" +#include "service/nvdrv/core/syncpoint_manager.h" +#include "service/nvdrv/devices/nvdevice.h" namespace Service::Nvidia { diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp b/src/service/nvdrv/devices/nvhost_nvjpg.cpp similarity index 93% rename from src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp rename to src/service/nvdrv/devices/nvhost_nvjpg.cpp index 9e6b864580..8e06c4f0fc 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp +++ b/src/service/nvdrv/devices/nvhost_nvjpg.cpp @@ -5,8 +5,8 @@ #include "common/assert.h" #include "common/logging/log.h" -#include "core/hle/service/nvdrv/devices/ioctl_serialization.h" -#include "core/hle/service/nvdrv/devices/nvhost_nvjpg.h" +#include "service/nvdrv/devices/ioctl_serialization.h" +#include "service/nvdrv/devices/nvhost_nvjpg.h" namespace Service::Nvidia::Devices { diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h b/src/service/nvdrv/devices/nvhost_nvjpg.h similarity index 95% rename from src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h rename to src/service/nvdrv/devices/nvhost_nvjpg.h index 790c97f6aa..f9b78d6949 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h +++ b/src/service/nvdrv/devices/nvhost_nvjpg.h @@ -6,7 +6,7 @@ #include #include "common/common_types.h" #include "common/swap.h" -#include "core/hle/service/nvdrv/devices/nvdevice.h" +#include "service/nvdrv/devices/nvdevice.h" namespace Service::Nvidia::Devices { diff --git a/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp b/src/service/nvdrv/devices/nvhost_vic.cpp similarity index 93% rename from src/core/hle/service/nvdrv/devices/nvhost_vic.cpp rename to src/service/nvdrv/devices/nvhost_vic.cpp index 87f8d7c221..d8a89e343f 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp +++ b/src/service/nvdrv/devices/nvhost_vic.cpp @@ -4,9 +4,9 @@ #include "common/assert.h" #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/service/nvdrv/core/container.h" -#include "core/hle/service/nvdrv/devices/ioctl_serialization.h" -#include "core/hle/service/nvdrv/devices/nvhost_vic.h" +#include "service/nvdrv/core/container.h" +#include "service/nvdrv/devices/ioctl_serialization.h" +#include "service/nvdrv/devices/nvhost_vic.h" #include "video_core/renderer_base.h" namespace Service::Nvidia::Devices { diff --git a/src/core/hle/service/nvdrv/devices/nvhost_vic.h b/src/service/nvdrv/devices/nvhost_vic.h similarity index 93% rename from src/core/hle/service/nvdrv/devices/nvhost_vic.h rename to src/service/nvdrv/devices/nvhost_vic.h index cadbcb0a5c..0cd11049f7 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_vic.h +++ b/src/service/nvdrv/devices/nvhost_vic.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/nvdrv/devices/nvhost_nvdec_common.h" +#include "service/nvdrv/devices/nvhost_nvdec_common.h" namespace Service::Nvidia::Devices { diff --git a/src/core/hle/service/nvdrv/devices/nvmap.cpp b/src/service/nvdrv/devices/nvmap.cpp similarity index 96% rename from src/core/hle/service/nvdrv/devices/nvmap.cpp rename to src/service/nvdrv/devices/nvmap.cpp index 71b2e62ecb..77915a4ace 100644 --- a/src/core/hle/service/nvdrv/devices/nvmap.cpp +++ b/src/service/nvdrv/devices/nvmap.cpp @@ -9,13 +9,13 @@ #include "common/assert.h" #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/kernel/k_page_table.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/service/nvdrv/core/container.h" -#include "core/hle/service/nvdrv/core/nvmap.h" -#include "core/hle/service/nvdrv/devices/ioctl_serialization.h" -#include "core/hle/service/nvdrv/devices/nvmap.h" #include "core/memory.h" +#include "kernel/k_page_table.h" +#include "kernel/k_process.h" +#include "service/nvdrv/core/container.h" +#include "service/nvdrv/core/nvmap.h" +#include "service/nvdrv/devices/ioctl_serialization.h" +#include "service/nvdrv/devices/nvmap.h" using Core::Memory::YUZU_PAGESIZE; diff --git a/src/core/hle/service/nvdrv/devices/nvmap.h b/src/service/nvdrv/devices/nvmap.h similarity index 97% rename from src/core/hle/service/nvdrv/devices/nvmap.h rename to src/service/nvdrv/devices/nvmap.h index 049c110284..8eec2d8a07 100644 --- a/src/core/hle/service/nvdrv/devices/nvmap.h +++ b/src/service/nvdrv/devices/nvmap.h @@ -9,8 +9,8 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "common/swap.h" -#include "core/hle/service/nvdrv/core/nvmap.h" -#include "core/hle/service/nvdrv/devices/nvdevice.h" +#include "service/nvdrv/core/nvmap.h" +#include "service/nvdrv/devices/nvdevice.h" namespace Service::Nvidia::NvCore { class Container; diff --git a/src/core/hle/service/nvdrv/nvdata.h b/src/service/nvdrv/nvdata.h similarity index 100% rename from src/core/hle/service/nvdrv/nvdata.h rename to src/service/nvdrv/nvdata.h diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/service/nvdrv/nvdrv.cpp similarity index 87% rename from src/core/hle/service/nvdrv/nvdrv.cpp rename to src/service/nvdrv/nvdrv.cpp index 9e46ee8dd2..82c06bd497 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/service/nvdrv/nvdrv.cpp @@ -6,25 +6,25 @@ #include #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nvdrv/core/container.h" -#include "core/hle/service/nvdrv/devices/nvdevice.h" -#include "core/hle/service/nvdrv/devices/nvdisp_disp0.h" -#include "core/hle/service/nvdrv/devices/nvhost_as_gpu.h" -#include "core/hle/service/nvdrv/devices/nvhost_ctrl.h" -#include "core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h" -#include "core/hle/service/nvdrv/devices/nvhost_gpu.h" -#include "core/hle/service/nvdrv/devices/nvhost_nvdec.h" -#include "core/hle/service/nvdrv/devices/nvhost_nvdec_common.h" -#include "core/hle/service/nvdrv/devices/nvhost_nvjpg.h" -#include "core/hle/service/nvdrv/devices/nvhost_vic.h" -#include "core/hle/service/nvdrv/devices/nvmap.h" -#include "core/hle/service/nvdrv/nvdrv.h" -#include "core/hle/service/nvdrv/nvdrv_interface.h" -#include "core/hle/service/nvdrv/nvmemp.h" -#include "core/hle/service/nvnflinger/nvnflinger.h" -#include "core/hle/service/server_manager.h" +#include "kernel/k_event.h" +#include "service/ipc_helpers.h" +#include "service/nvdrv/core/container.h" +#include "service/nvdrv/devices/nvdevice.h" +#include "service/nvdrv/devices/nvdisp_disp0.h" +#include "service/nvdrv/devices/nvhost_as_gpu.h" +#include "service/nvdrv/devices/nvhost_ctrl.h" +#include "service/nvdrv/devices/nvhost_ctrl_gpu.h" +#include "service/nvdrv/devices/nvhost_gpu.h" +#include "service/nvdrv/devices/nvhost_nvdec.h" +#include "service/nvdrv/devices/nvhost_nvdec_common.h" +#include "service/nvdrv/devices/nvhost_nvjpg.h" +#include "service/nvdrv/devices/nvhost_vic.h" +#include "service/nvdrv/devices/nvmap.h" +#include "service/nvdrv/nvdrv.h" +#include "service/nvdrv/nvdrv_interface.h" +#include "service/nvdrv/nvmemp.h" +#include "service/nvnflinger/nvnflinger.h" +#include "service/server_manager.h" #include "video_core/gpu.h" namespace Service::Nvidia { diff --git a/src/core/hle/service/nvdrv/nvdrv.h b/src/service/nvdrv/nvdrv.h similarity index 92% rename from src/core/hle/service/nvdrv/nvdrv.h rename to src/service/nvdrv/nvdrv.h index d8622b3ca4..b0237571cb 100644 --- a/src/core/hle/service/nvdrv/nvdrv.h +++ b/src/service/nvdrv/nvdrv.h @@ -13,11 +13,11 @@ #include #include "common/common_types.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/nvdrv/core/container.h" -#include "core/hle/service/nvdrv/nvdata.h" -#include "core/hle/service/nvnflinger/ui/fence.h" -#include "core/hle/service/service.h" +#include "service/kernel_helpers.h" +#include "service/nvdrv/core/container.h" +#include "service/nvdrv/nvdata.h" +#include "service/nvnflinger/ui/fence.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/nvdrv/nvdrv_interface.cpp b/src/service/nvdrv/nvdrv_interface.cpp similarity index 96% rename from src/core/hle/service/nvdrv/nvdrv_interface.cpp rename to src/service/nvdrv/nvdrv_interface.cpp index c8a880e841..8f90c7123f 100644 --- a/src/core/hle/service/nvdrv/nvdrv_interface.cpp +++ b/src/service/nvdrv/nvdrv_interface.cpp @@ -4,12 +4,12 @@ #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nvdrv/nvdata.h" -#include "core/hle/service/nvdrv/nvdrv.h" -#include "core/hle/service/nvdrv/nvdrv_interface.h" +#include "kernel/k_event.h" +#include "kernel/k_readable_event.h" +#include "service/ipc_helpers.h" +#include "service/nvdrv/nvdata.h" +#include "service/nvdrv/nvdrv.h" +#include "service/nvdrv/nvdrv_interface.h" namespace Service::Nvidia { diff --git a/src/core/hle/service/nvdrv/nvdrv_interface.h b/src/service/nvdrv/nvdrv_interface.h similarity index 93% rename from src/core/hle/service/nvdrv/nvdrv_interface.h rename to src/service/nvdrv/nvdrv_interface.h index 6e98115dcd..3f1fd789c7 100644 --- a/src/core/hle/service/nvdrv/nvdrv_interface.h +++ b/src/service/nvdrv/nvdrv_interface.h @@ -6,8 +6,8 @@ #include #include "common/scratch_buffer.h" -#include "core/hle/service/nvdrv/nvdrv.h" -#include "core/hle/service/service.h" +#include "service/nvdrv/nvdrv.h" +#include "service/service.h" namespace Service::Nvidia { diff --git a/src/core/hle/service/nvdrv/nvmemp.cpp b/src/service/nvdrv/nvmemp.cpp similarity index 93% rename from src/core/hle/service/nvdrv/nvmemp.cpp rename to src/service/nvdrv/nvmemp.cpp index fc10f6406f..ae45f64dbc 100644 --- a/src/core/hle/service/nvdrv/nvmemp.cpp +++ b/src/service/nvdrv/nvmemp.cpp @@ -3,7 +3,7 @@ #include "common/assert.h" #include "common/logging/log.h" -#include "core/hle/service/nvdrv/nvmemp.h" +#include "service/nvdrv/nvmemp.h" namespace Service::Nvidia { diff --git a/src/core/hle/service/nvdrv/nvmemp.h b/src/service/nvdrv/nvmemp.h similarity index 92% rename from src/core/hle/service/nvdrv/nvmemp.h rename to src/service/nvdrv/nvmemp.h index 85e3053a8d..d31ecbffd1 100644 --- a/src/core/hle/service/nvdrv/nvmemp.h +++ b/src/service/nvdrv/nvmemp.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/nvnflinger/binder.h b/src/service/nvnflinger/binder.h similarity index 100% rename from src/core/hle/service/nvnflinger/binder.h rename to src/service/nvnflinger/binder.h diff --git a/src/core/hle/service/nvnflinger/buffer_item.h b/src/service/nvnflinger/buffer_item.h similarity index 92% rename from src/core/hle/service/nvnflinger/buffer_item.h rename to src/service/nvnflinger/buffer_item.h index 3da8cc3aa1..36629c6364 100644 --- a/src/core/hle/service/nvnflinger/buffer_item.h +++ b/src/service/nvnflinger/buffer_item.h @@ -10,8 +10,8 @@ #include "common/common_types.h" #include "common/math_util.h" -#include "core/hle/service/nvnflinger/ui/fence.h" -#include "core/hle/service/nvnflinger/window.h" +#include "service/nvnflinger/ui/fence.h" +#include "service/nvnflinger/window.h" namespace Service::android { diff --git a/src/core/hle/service/nvnflinger/buffer_item_consumer.cpp b/src/service/nvnflinger/buffer_item_consumer.cpp similarity index 91% rename from src/core/hle/service/nvnflinger/buffer_item_consumer.cpp rename to src/service/nvnflinger/buffer_item_consumer.cpp index cf151ea3a8..078d4782ea 100644 --- a/src/core/hle/service/nvnflinger/buffer_item_consumer.cpp +++ b/src/service/nvnflinger/buffer_item_consumer.cpp @@ -6,9 +6,9 @@ #include "common/assert.h" #include "common/logging/log.h" -#include "core/hle/service/nvnflinger/buffer_item.h" -#include "core/hle/service/nvnflinger/buffer_item_consumer.h" -#include "core/hle/service/nvnflinger/buffer_queue_consumer.h" +#include "service/nvnflinger/buffer_item.h" +#include "service/nvnflinger/buffer_item_consumer.h" +#include "service/nvnflinger/buffer_queue_consumer.h" namespace Service::android { diff --git a/src/core/hle/service/nvnflinger/buffer_item_consumer.h b/src/service/nvnflinger/buffer_item_consumer.h similarity index 89% rename from src/core/hle/service/nvnflinger/buffer_item_consumer.h rename to src/service/nvnflinger/buffer_item_consumer.h index e0c6b3604c..6c14dd00b9 100644 --- a/src/core/hle/service/nvnflinger/buffer_item_consumer.h +++ b/src/service/nvnflinger/buffer_item_consumer.h @@ -10,8 +10,8 @@ #include #include "common/common_types.h" -#include "core/hle/service/nvnflinger/consumer_base.h" -#include "core/hle/service/nvnflinger/status.h" +#include "service/nvnflinger/consumer_base.h" +#include "service/nvnflinger/status.h" namespace Service::android { diff --git a/src/core/hle/service/nvnflinger/buffer_queue_consumer.cpp b/src/service/nvnflinger/buffer_queue_consumer.cpp similarity index 95% rename from src/core/hle/service/nvnflinger/buffer_queue_consumer.cpp rename to src/service/nvnflinger/buffer_queue_consumer.cpp index 51291539d9..9f7a47a289 100644 --- a/src/core/hle/service/nvnflinger/buffer_queue_consumer.cpp +++ b/src/service/nvnflinger/buffer_queue_consumer.cpp @@ -5,12 +5,12 @@ // https://cs.android.com/android/platform/superproject/+/android-5.1.1_r38:frameworks/native/libs/gui/BufferQueueConsumer.cpp #include "common/logging/log.h" -#include "core/hle/service/nvdrv/core/nvmap.h" -#include "core/hle/service/nvnflinger/buffer_item.h" -#include "core/hle/service/nvnflinger/buffer_queue_consumer.h" -#include "core/hle/service/nvnflinger/buffer_queue_core.h" -#include "core/hle/service/nvnflinger/producer_listener.h" -#include "core/hle/service/nvnflinger/ui/graphic_buffer.h" +#include "service/nvdrv/core/nvmap.h" +#include "service/nvnflinger/buffer_item.h" +#include "service/nvnflinger/buffer_queue_consumer.h" +#include "service/nvnflinger/buffer_queue_core.h" +#include "service/nvnflinger/producer_listener.h" +#include "service/nvnflinger/ui/graphic_buffer.h" namespace Service::android { diff --git a/src/core/hle/service/nvnflinger/buffer_queue_consumer.h b/src/service/nvnflinger/buffer_queue_consumer.h similarity index 92% rename from src/core/hle/service/nvnflinger/buffer_queue_consumer.h rename to src/service/nvnflinger/buffer_queue_consumer.h index 50ed0bb5fb..a003ebf900 100644 --- a/src/core/hle/service/nvnflinger/buffer_queue_consumer.h +++ b/src/service/nvnflinger/buffer_queue_consumer.h @@ -10,8 +10,8 @@ #include #include "common/common_types.h" -#include "core/hle/service/nvnflinger/buffer_queue_defs.h" -#include "core/hle/service/nvnflinger/status.h" +#include "service/nvnflinger/buffer_queue_defs.h" +#include "service/nvnflinger/status.h" namespace Service::Nvidia::NvCore { class NvMap; diff --git a/src/core/hle/service/nvnflinger/buffer_queue_core.cpp b/src/service/nvnflinger/buffer_queue_core.cpp similarity index 98% rename from src/core/hle/service/nvnflinger/buffer_queue_core.cpp rename to src/service/nvnflinger/buffer_queue_core.cpp index ed66f6f5b1..84953ef1d8 100644 --- a/src/core/hle/service/nvnflinger/buffer_queue_core.cpp +++ b/src/service/nvnflinger/buffer_queue_core.cpp @@ -6,7 +6,7 @@ #include "common/assert.h" -#include "core/hle/service/nvnflinger/buffer_queue_core.h" +#include "service/nvnflinger/buffer_queue_core.h" namespace Service::android { diff --git a/src/core/hle/service/nvnflinger/buffer_queue_core.h b/src/service/nvnflinger/buffer_queue_core.h similarity index 90% rename from src/core/hle/service/nvnflinger/buffer_queue_core.h rename to src/service/nvnflinger/buffer_queue_core.h index 9164f08a0a..8cff1b25d1 100644 --- a/src/core/hle/service/nvnflinger/buffer_queue_core.h +++ b/src/service/nvnflinger/buffer_queue_core.h @@ -13,11 +13,11 @@ #include #include -#include "core/hle/service/nvnflinger/buffer_item.h" -#include "core/hle/service/nvnflinger/buffer_queue_defs.h" -#include "core/hle/service/nvnflinger/pixel_format.h" -#include "core/hle/service/nvnflinger/status.h" -#include "core/hle/service/nvnflinger/window.h" +#include "service/nvnflinger/buffer_item.h" +#include "service/nvnflinger/buffer_queue_defs.h" +#include "service/nvnflinger/pixel_format.h" +#include "service/nvnflinger/status.h" +#include "service/nvnflinger/window.h" namespace Service::android { diff --git a/src/core/hle/service/nvnflinger/buffer_queue_defs.h b/src/service/nvnflinger/buffer_queue_defs.h similarity index 92% rename from src/core/hle/service/nvnflinger/buffer_queue_defs.h rename to src/service/nvnflinger/buffer_queue_defs.h index 6fd3156f4a..c15c9118e3 100644 --- a/src/core/hle/service/nvnflinger/buffer_queue_defs.h +++ b/src/service/nvnflinger/buffer_queue_defs.h @@ -9,7 +9,7 @@ #include #include "common/common_types.h" -#include "core/hle/service/nvnflinger/buffer_slot.h" +#include "service/nvnflinger/buffer_slot.h" namespace Service::android::BufferQueueDefs { diff --git a/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp b/src/service/nvnflinger/buffer_queue_producer.cpp similarity index 98% rename from src/core/hle/service/nvnflinger/buffer_queue_producer.cpp rename to src/service/nvnflinger/buffer_queue_producer.cpp index 6e7a496589..acc9158897 100644 --- a/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp +++ b/src/service/nvnflinger/buffer_queue_producer.cpp @@ -8,19 +8,19 @@ #include "common/logging/log.h" #include "common/settings.h" #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/service/hle_ipc.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/nvdrv/core/nvmap.h" -#include "core/hle/service/nvnflinger/buffer_queue_core.h" -#include "core/hle/service/nvnflinger/buffer_queue_producer.h" -#include "core/hle/service/nvnflinger/consumer_listener.h" -#include "core/hle/service/nvnflinger/parcel.h" -#include "core/hle/service/nvnflinger/ui/graphic_buffer.h" -#include "core/hle/service/nvnflinger/window.h" -#include "core/hle/service/vi/vi.h" +#include "kernel/k_event.h" +#include "kernel/k_readable_event.h" +#include "kernel/kernel.h" +#include "service/hle_ipc.h" +#include "service/kernel_helpers.h" +#include "service/nvdrv/core/nvmap.h" +#include "service/nvnflinger/buffer_queue_core.h" +#include "service/nvnflinger/buffer_queue_producer.h" +#include "service/nvnflinger/consumer_listener.h" +#include "service/nvnflinger/parcel.h" +#include "service/nvnflinger/ui/graphic_buffer.h" +#include "service/nvnflinger/window.h" +#include "service/vi/vi.h" namespace Service::android { diff --git a/src/core/hle/service/nvnflinger/buffer_queue_producer.h b/src/service/nvnflinger/buffer_queue_producer.h similarity index 87% rename from src/core/hle/service/nvnflinger/buffer_queue_producer.h rename to src/service/nvnflinger/buffer_queue_producer.h index d4201c1046..f93ed87262 100644 --- a/src/core/hle/service/nvnflinger/buffer_queue_producer.h +++ b/src/service/nvnflinger/buffer_queue_producer.h @@ -11,14 +11,14 @@ #include #include "common/common_funcs.h" -#include "core/hle/service/nvdrv/nvdata.h" -#include "core/hle/service/nvnflinger/binder.h" -#include "core/hle/service/nvnflinger/buffer_queue_defs.h" -#include "core/hle/service/nvnflinger/buffer_slot.h" -#include "core/hle/service/nvnflinger/graphic_buffer_producer.h" -#include "core/hle/service/nvnflinger/pixel_format.h" -#include "core/hle/service/nvnflinger/status.h" -#include "core/hle/service/nvnflinger/window.h" +#include "service/nvdrv/nvdata.h" +#include "service/nvnflinger/binder.h" +#include "service/nvnflinger/buffer_queue_defs.h" +#include "service/nvnflinger/buffer_slot.h" +#include "service/nvnflinger/graphic_buffer_producer.h" +#include "service/nvnflinger/pixel_format.h" +#include "service/nvnflinger/status.h" +#include "service/nvnflinger/window.h" namespace Kernel { class KernelCore; diff --git a/src/core/hle/service/nvnflinger/buffer_slot.h b/src/service/nvnflinger/buffer_slot.h similarity index 94% rename from src/core/hle/service/nvnflinger/buffer_slot.h rename to src/service/nvnflinger/buffer_slot.h index d8c9dec3b2..d76d8588b8 100644 --- a/src/core/hle/service/nvnflinger/buffer_slot.h +++ b/src/service/nvnflinger/buffer_slot.h @@ -9,7 +9,7 @@ #include #include "common/common_types.h" -#include "core/hle/service/nvnflinger/ui/fence.h" +#include "service/nvnflinger/ui/fence.h" namespace Service::android { diff --git a/src/core/hle/service/nvnflinger/buffer_transform_flags.h b/src/service/nvnflinger/buffer_transform_flags.h similarity index 100% rename from src/core/hle/service/nvnflinger/buffer_transform_flags.h rename to src/service/nvnflinger/buffer_transform_flags.h diff --git a/src/core/hle/service/nvnflinger/consumer_base.cpp b/src/service/nvnflinger/consumer_base.cpp similarity index 93% rename from src/core/hle/service/nvnflinger/consumer_base.cpp rename to src/service/nvnflinger/consumer_base.cpp index 4dcda8dacd..a62f412db8 100644 --- a/src/core/hle/service/nvnflinger/consumer_base.cpp +++ b/src/service/nvnflinger/consumer_base.cpp @@ -6,11 +6,11 @@ #include "common/assert.h" #include "common/logging/log.h" -#include "core/hle/service/nvnflinger/buffer_item.h" -#include "core/hle/service/nvnflinger/buffer_queue_consumer.h" -#include "core/hle/service/nvnflinger/buffer_queue_core.h" -#include "core/hle/service/nvnflinger/consumer_base.h" -#include "core/hle/service/nvnflinger/ui/graphic_buffer.h" +#include "service/nvnflinger/buffer_item.h" +#include "service/nvnflinger/buffer_queue_consumer.h" +#include "service/nvnflinger/buffer_queue_core.h" +#include "service/nvnflinger/consumer_base.h" +#include "service/nvnflinger/ui/graphic_buffer.h" namespace Service::android { diff --git a/src/core/hle/service/nvnflinger/consumer_base.h b/src/service/nvnflinger/consumer_base.h similarity index 91% rename from src/core/hle/service/nvnflinger/consumer_base.h rename to src/service/nvnflinger/consumer_base.h index 264829414b..ae33f3a738 100644 --- a/src/core/hle/service/nvnflinger/consumer_base.h +++ b/src/service/nvnflinger/consumer_base.h @@ -12,9 +12,9 @@ #include #include "common/common_types.h" -#include "core/hle/service/nvnflinger/buffer_queue_defs.h" -#include "core/hle/service/nvnflinger/consumer_listener.h" -#include "core/hle/service/nvnflinger/status.h" +#include "service/nvnflinger/buffer_queue_defs.h" +#include "service/nvnflinger/consumer_listener.h" +#include "service/nvnflinger/status.h" namespace Service::android { diff --git a/src/core/hle/service/nvnflinger/consumer_listener.h b/src/service/nvnflinger/consumer_listener.h similarity index 100% rename from src/core/hle/service/nvnflinger/consumer_listener.h rename to src/service/nvnflinger/consumer_listener.h diff --git a/src/core/hle/service/nvnflinger/fb_share_buffer_manager.cpp b/src/service/nvnflinger/fb_share_buffer_manager.cpp similarity index 95% rename from src/core/hle/service/nvnflinger/fb_share_buffer_manager.cpp rename to src/service/nvnflinger/fb_share_buffer_manager.cpp index 6dc327b8be..2869c488d9 100644 --- a/src/core/hle/service/nvnflinger/fb_share_buffer_manager.cpp +++ b/src/service/nvnflinger/fb_share_buffer_manager.cpp @@ -4,16 +4,16 @@ #include #include "core/core.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_system_resource.h" -#include "core/hle/service/nvdrv/devices/nvmap.h" -#include "core/hle/service/nvdrv/nvdrv.h" -#include "core/hle/service/nvnflinger/buffer_queue_producer.h" -#include "core/hle/service/nvnflinger/fb_share_buffer_manager.h" -#include "core/hle/service/nvnflinger/pixel_format.h" -#include "core/hle/service/nvnflinger/ui/graphic_buffer.h" -#include "core/hle/service/vi/layer/vi_layer.h" -#include "core/hle/service/vi/vi_results.h" +#include "kernel/k_process.h" +#include "kernel/k_system_resource.h" +#include "service/nvdrv/devices/nvmap.h" +#include "service/nvdrv/nvdrv.h" +#include "service/nvnflinger/buffer_queue_producer.h" +#include "service/nvnflinger/fb_share_buffer_manager.h" +#include "service/nvnflinger/pixel_format.h" +#include "service/nvnflinger/ui/graphic_buffer.h" +#include "service/vi/layer/vi_layer.h" +#include "service/vi/vi_results.h" namespace Service::Nvnflinger { diff --git a/src/core/hle/service/nvnflinger/fb_share_buffer_manager.h b/src/service/nvnflinger/fb_share_buffer_manager.h similarity index 95% rename from src/core/hle/service/nvnflinger/fb_share_buffer_manager.h rename to src/service/nvnflinger/fb_share_buffer_manager.h index c809c01b41..751bbb1f79 100644 --- a/src/core/hle/service/nvnflinger/fb_share_buffer_manager.h +++ b/src/service/nvnflinger/fb_share_buffer_manager.h @@ -4,8 +4,8 @@ #pragma once #include "common/math_util.h" -#include "core/hle/service/nvnflinger/nvnflinger.h" -#include "core/hle/service/nvnflinger/ui/fence.h" +#include "service/nvnflinger/nvnflinger.h" +#include "service/nvnflinger/ui/fence.h" namespace Kernel { class KPageGroup; diff --git a/src/core/hle/service/nvnflinger/graphic_buffer_producer.cpp b/src/service/nvnflinger/graphic_buffer_producer.cpp similarity index 83% rename from src/core/hle/service/nvnflinger/graphic_buffer_producer.cpp rename to src/service/nvnflinger/graphic_buffer_producer.cpp index d72b49a8e7..4668bcdd5c 100644 --- a/src/core/hle/service/nvnflinger/graphic_buffer_producer.cpp +++ b/src/service/nvnflinger/graphic_buffer_producer.cpp @@ -4,8 +4,8 @@ // Parts of this implementation were based on: // https://cs.android.com/android/platform/superproject/+/android-5.1.1_r38:frameworks/native/libs/gui/IGraphicBufferProducer.cpp -#include "core/hle/service/nvnflinger/graphic_buffer_producer.h" -#include "core/hle/service/nvnflinger/parcel.h" +#include "service/nvnflinger/graphic_buffer_producer.h" +#include "service/nvnflinger/parcel.h" namespace Service::android { diff --git a/src/core/hle/service/nvnflinger/graphic_buffer_producer.h b/src/service/nvnflinger/graphic_buffer_producer.h similarity index 96% rename from src/core/hle/service/nvnflinger/graphic_buffer_producer.h rename to src/service/nvnflinger/graphic_buffer_producer.h index 5d7cff7d38..f1c3d0d46c 100644 --- a/src/core/hle/service/nvnflinger/graphic_buffer_producer.h +++ b/src/service/nvnflinger/graphic_buffer_producer.h @@ -9,8 +9,8 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "common/math_util.h" -#include "core/hle/service/nvnflinger/ui/fence.h" -#include "core/hle/service/nvnflinger/window.h" +#include "service/nvnflinger/ui/fence.h" +#include "service/nvnflinger/window.h" namespace Service::android { diff --git a/src/core/hle/service/nvnflinger/hos_binder_driver_server.cpp b/src/service/nvnflinger/hos_binder_driver_server.cpp similarity index 92% rename from src/core/hle/service/nvnflinger/hos_binder_driver_server.cpp rename to src/service/nvnflinger/hos_binder_driver_server.cpp index b86a79ec93..c29173ec0a 100644 --- a/src/core/hle/service/nvnflinger/hos_binder_driver_server.cpp +++ b/src/service/nvnflinger/hos_binder_driver_server.cpp @@ -4,7 +4,7 @@ #include #include "common/common_types.h" -#include "core/hle/service/nvnflinger/hos_binder_driver_server.h" +#include "service/nvnflinger/hos_binder_driver_server.h" namespace Service::Nvnflinger { diff --git a/src/core/hle/service/nvnflinger/hos_binder_driver_server.h b/src/service/nvnflinger/hos_binder_driver_server.h similarity index 88% rename from src/core/hle/service/nvnflinger/hos_binder_driver_server.h rename to src/service/nvnflinger/hos_binder_driver_server.h index 58bb9469ad..784881f424 100644 --- a/src/core/hle/service/nvnflinger/hos_binder_driver_server.h +++ b/src/service/nvnflinger/hos_binder_driver_server.h @@ -8,8 +8,8 @@ #include #include "common/common_types.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/nvnflinger/binder.h" +#include "service/kernel_helpers.h" +#include "service/nvnflinger/binder.h" namespace Core { class System; diff --git a/src/core/hle/service/nvnflinger/nvnflinger.cpp b/src/service/nvnflinger/nvnflinger.cpp similarity index 93% rename from src/core/hle/service/nvnflinger/nvnflinger.cpp rename to src/service/nvnflinger/nvnflinger.cpp index bebb45eae3..a8c1ae46e0 100644 --- a/src/core/hle/service/nvnflinger/nvnflinger.cpp +++ b/src/service/nvnflinger/nvnflinger.cpp @@ -12,18 +12,18 @@ #include "common/thread.h" #include "core/core.h" #include "core/core_timing.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/service/nvdrv/devices/nvdisp_disp0.h" -#include "core/hle/service/nvdrv/nvdrv.h" -#include "core/hle/service/nvnflinger/buffer_item_consumer.h" -#include "core/hle/service/nvnflinger/buffer_queue_core.h" -#include "core/hle/service/nvnflinger/fb_share_buffer_manager.h" -#include "core/hle/service/nvnflinger/hos_binder_driver_server.h" -#include "core/hle/service/nvnflinger/nvnflinger.h" -#include "core/hle/service/nvnflinger/ui/graphic_buffer.h" -#include "core/hle/service/vi/display/vi_display.h" -#include "core/hle/service/vi/layer/vi_layer.h" -#include "core/hle/service/vi/vi_results.h" +#include "kernel/k_readable_event.h" +#include "service/nvdrv/devices/nvdisp_disp0.h" +#include "service/nvdrv/nvdrv.h" +#include "service/nvnflinger/buffer_item_consumer.h" +#include "service/nvnflinger/buffer_queue_core.h" +#include "service/nvnflinger/fb_share_buffer_manager.h" +#include "service/nvnflinger/hos_binder_driver_server.h" +#include "service/nvnflinger/nvnflinger.h" +#include "service/nvnflinger/ui/graphic_buffer.h" +#include "service/vi/display/vi_display.h" +#include "service/vi/layer/vi_layer.h" +#include "service/vi/vi_results.h" #include "video_core/gpu.h" #include "video_core/host1x/host1x.h" #include "video_core/host1x/syncpoint_manager.h" diff --git a/src/core/hle/service/nvnflinger/nvnflinger.h b/src/service/nvnflinger/nvnflinger.h similarity index 98% rename from src/core/hle/service/nvnflinger/nvnflinger.h rename to src/service/nvnflinger/nvnflinger.h index 959d8b46bf..3ca9fb05f2 100644 --- a/src/core/hle/service/nvnflinger/nvnflinger.h +++ b/src/service/nvnflinger/nvnflinger.h @@ -13,8 +13,8 @@ #include "common/common_types.h" #include "common/polyfill_thread.h" #include "common/thread.h" -#include "core/hle/result.h" -#include "core/hle/service/kernel_helpers.h" +#include "core/result.h" +#include "service/kernel_helpers.h" namespace Common { class Event; diff --git a/src/core/hle/service/nvnflinger/parcel.h b/src/service/nvnflinger/parcel.h similarity index 100% rename from src/core/hle/service/nvnflinger/parcel.h rename to src/service/nvnflinger/parcel.h diff --git a/src/core/hle/service/nvnflinger/pixel_format.h b/src/service/nvnflinger/pixel_format.h similarity index 100% rename from src/core/hle/service/nvnflinger/pixel_format.h rename to src/service/nvnflinger/pixel_format.h diff --git a/src/core/hle/service/nvnflinger/producer_listener.h b/src/service/nvnflinger/producer_listener.h similarity index 100% rename from src/core/hle/service/nvnflinger/producer_listener.h rename to src/service/nvnflinger/producer_listener.h diff --git a/src/core/hle/service/nvnflinger/status.h b/src/service/nvnflinger/status.h similarity index 100% rename from src/core/hle/service/nvnflinger/status.h rename to src/service/nvnflinger/status.h diff --git a/src/core/hle/service/nvnflinger/ui/fence.h b/src/service/nvnflinger/ui/fence.h similarity index 95% rename from src/core/hle/service/nvnflinger/ui/fence.h rename to src/service/nvnflinger/ui/fence.h index 177aed7580..cf57c0f6a6 100644 --- a/src/core/hle/service/nvnflinger/ui/fence.h +++ b/src/service/nvnflinger/ui/fence.h @@ -9,7 +9,7 @@ #include #include "common/common_types.h" -#include "core/hle/service/nvdrv/nvdata.h" +#include "service/nvdrv/nvdata.h" namespace Service::android { diff --git a/src/core/hle/service/nvnflinger/ui/graphic_buffer.h b/src/service/nvnflinger/ui/graphic_buffer.h similarity index 97% rename from src/core/hle/service/nvnflinger/ui/graphic_buffer.h rename to src/service/nvnflinger/ui/graphic_buffer.h index 3eac5cedd6..ec0fbab5a5 100644 --- a/src/core/hle/service/nvnflinger/ui/graphic_buffer.h +++ b/src/service/nvnflinger/ui/graphic_buffer.h @@ -8,7 +8,7 @@ #include "common/common_funcs.h" #include "common/common_types.h" -#include "core/hle/service/nvnflinger/pixel_format.h" +#include "service/nvnflinger/pixel_format.h" namespace Service::android { diff --git a/src/core/hle/service/nvnflinger/window.h b/src/service/nvnflinger/window.h similarity index 100% rename from src/core/hle/service/nvnflinger/window.h rename to src/service/nvnflinger/window.h diff --git a/src/core/hle/service/olsc/olsc.cpp b/src/service/olsc/olsc.cpp similarity index 98% rename from src/core/hle/service/olsc/olsc.cpp rename to src/service/olsc/olsc.cpp index 889f27c31b..d187a5670d 100644 --- a/src/core/hle/service/olsc/olsc.cpp +++ b/src/service/olsc/olsc.cpp @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/olsc/olsc.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "service/ipc_helpers.h" +#include "service/olsc/olsc.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::OLSC { diff --git a/src/core/hle/service/olsc/olsc.h b/src/service/olsc/olsc.h similarity index 100% rename from src/core/hle/service/olsc/olsc.h rename to src/service/olsc/olsc.h diff --git a/src/core/hle/service/pcie/pcie.cpp b/src/service/pcie/pcie.cpp similarity index 94% rename from src/core/hle/service/pcie/pcie.cpp rename to src/service/pcie/pcie.cpp index c6da6eb517..e7a91ed3fc 100644 --- a/src/core/hle/service/pcie/pcie.cpp +++ b/src/service/pcie/pcie.cpp @@ -3,9 +3,9 @@ #include -#include "core/hle/service/pcie/pcie.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "service/pcie/pcie.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::PCIe { diff --git a/src/core/hle/service/pcie/pcie.h b/src/service/pcie/pcie.h similarity index 100% rename from src/core/hle/service/pcie/pcie.h rename to src/service/pcie/pcie.h diff --git a/src/core/hle/service/pctl/pctl.cpp b/src/service/pctl/pctl.cpp similarity index 93% rename from src/core/hle/service/pctl/pctl.cpp rename to src/service/pctl/pctl.cpp index 3f47bf094f..19c1883333 100644 --- a/src/core/hle/service/pctl/pctl.cpp +++ b/src/service/pctl/pctl.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/pctl/pctl.h" +#include "service/pctl/pctl.h" namespace Service::PCTL { diff --git a/src/core/hle/service/pctl/pctl.h b/src/service/pctl/pctl.h similarity index 90% rename from src/core/hle/service/pctl/pctl.h rename to src/service/pctl/pctl.h index 87f93161e7..48457ad864 100644 --- a/src/core/hle/service/pctl/pctl.h +++ b/src/service/pctl/pctl.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/pctl/pctl_module.h" +#include "service/pctl/pctl_module.h" namespace Core { class System; diff --git a/src/core/hle/service/pctl/pctl_module.cpp b/src/service/pctl/pctl_module.cpp similarity index 98% rename from src/core/hle/service/pctl/pctl_module.cpp rename to src/service/pctl/pctl_module.cpp index 6a7fd72bcd..544f90c695 100644 --- a/src/core/hle/service/pctl/pctl_module.cpp +++ b/src/service/pctl/pctl_module.cpp @@ -5,11 +5,11 @@ #include "core/core.h" #include "core/file_sys/control_metadata.h" #include "core/file_sys/patch_manager.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/pctl/pctl.h" -#include "core/hle/service/pctl/pctl_module.h" -#include "core/hle/service/server_manager.h" +#include "service/ipc_helpers.h" +#include "service/kernel_helpers.h" +#include "service/pctl/pctl.h" +#include "service/pctl/pctl_module.h" +#include "service/server_manager.h" namespace Service::PCTL { diff --git a/src/core/hle/service/pctl/pctl_module.h b/src/service/pctl/pctl_module.h similarity index 96% rename from src/core/hle/service/pctl/pctl_module.h rename to src/service/pctl/pctl_module.h index dff0d3f087..c9aa8458b4 100644 --- a/src/core/hle/service/pctl/pctl_module.h +++ b/src/service/pctl/pctl_module.h @@ -4,7 +4,7 @@ #pragma once #include "common/common_funcs.h" -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/pcv/pcv.cpp b/src/service/pcv/pcv.cpp similarity index 97% rename from src/core/hle/service/pcv/pcv.cpp rename to src/service/pcv/pcv.cpp index c13ffa6f6e..da88a08dd7 100644 --- a/src/core/hle/service/pcv/pcv.cpp +++ b/src/service/pcv/pcv.cpp @@ -3,10 +3,10 @@ #include -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/pcv/pcv.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "service/ipc_helpers.h" +#include "service/pcv/pcv.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::PCV { diff --git a/src/core/hle/service/pcv/pcv.h b/src/service/pcv/pcv.h similarity index 100% rename from src/core/hle/service/pcv/pcv.h rename to src/service/pcv/pcv.h diff --git a/src/core/hle/service/pm/pm.cpp b/src/service/pm/pm.cpp similarity index 97% rename from src/core/hle/service/pm/pm.cpp rename to src/service/pm/pm.cpp index d92499f05b..5e52d18068 100644 --- a/src/core/hle/service/pm/pm.cpp +++ b/src/service/pm/pm.cpp @@ -2,12 +2,12 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/pm/pm.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "kernel/k_process.h" +#include "kernel/kernel.h" +#include "service/ipc_helpers.h" +#include "service/pm/pm.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::PM { diff --git a/src/core/hle/service/pm/pm.h b/src/service/pm/pm.h similarity index 100% rename from src/core/hle/service/pm/pm.h rename to src/service/pm/pm.h diff --git a/src/service/precompiled_headers.h b/src/service/precompiled_headers.h new file mode 100644 index 0000000000..aabae730bf --- /dev/null +++ b/src/service/precompiled_headers.h @@ -0,0 +1,6 @@ +// SPDX-FileCopyrightText: 2022 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "common/common_precompiled_headers.h" diff --git a/src/core/hle/service/prepo/prepo.cpp b/src/service/prepo/prepo.cpp similarity index 97% rename from src/core/hle/service/prepo/prepo.cpp rename to src/service/prepo/prepo.cpp index 14e8df63a0..551ec50365 100644 --- a/src/core/hle/service/prepo/prepo.cpp +++ b/src/service/prepo/prepo.cpp @@ -4,12 +4,12 @@ #include "common/hex_util.h" #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/service/acc/profile_manager.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/prepo/prepo.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" #include "core/reporter.h" +#include "service/acc/profile_manager.h" +#include "service/ipc_helpers.h" +#include "service/prepo/prepo.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::PlayReport { diff --git a/src/core/hle/service/prepo/prepo.h b/src/service/prepo/prepo.h similarity index 100% rename from src/core/hle/service/prepo/prepo.h rename to src/service/prepo/prepo.h diff --git a/src/core/hle/service/psc/psc.cpp b/src/service/psc/psc.cpp similarity index 93% rename from src/core/hle/service/psc/psc.cpp rename to src/service/psc/psc.cpp index cd0cc9287e..c18f72b9ce 100644 --- a/src/core/hle/service/psc/psc.cpp +++ b/src/service/psc/psc.cpp @@ -4,10 +4,10 @@ #include #include "common/logging/log.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/psc/psc.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" +#include "service/ipc_helpers.h" +#include "service/psc/psc.h" +#include "service/server_manager.h" +#include "service/service.h" namespace Service::PSC { diff --git a/src/core/hle/service/psc/psc.h b/src/service/psc/psc.h similarity index 100% rename from src/core/hle/service/psc/psc.h rename to src/service/psc/psc.h diff --git a/src/core/hle/service/ptm/psm.cpp b/src/service/ptm/psm.cpp similarity index 97% rename from src/core/hle/service/ptm/psm.cpp rename to src/service/ptm/psm.cpp index 136313d7b1..baf5045830 100644 --- a/src/core/hle/service/ptm/psm.cpp +++ b/src/service/ptm/psm.cpp @@ -5,10 +5,10 @@ #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/ptm/psm.h" +#include "kernel/k_event.h" +#include "service/ipc_helpers.h" +#include "service/kernel_helpers.h" +#include "service/ptm/psm.h" namespace Service::PTM { diff --git a/src/core/hle/service/ptm/psm.h b/src/service/ptm/psm.h similarity index 94% rename from src/core/hle/service/ptm/psm.h rename to src/service/ptm/psm.h index fa47919e55..8a23b777cd 100644 --- a/src/core/hle/service/ptm/psm.h +++ b/src/service/ptm/psm.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Service::PTM { diff --git a/src/core/hle/service/ptm/ptm.cpp b/src/service/ptm/ptm.cpp similarity index 77% rename from src/core/hle/service/ptm/ptm.cpp rename to src/service/ptm/ptm.cpp index 6f0cfe04b8..95575138a0 100644 --- a/src/core/hle/service/ptm/ptm.cpp +++ b/src/service/ptm/ptm.cpp @@ -4,10 +4,10 @@ #include #include "core/core.h" -#include "core/hle/service/ptm/psm.h" -#include "core/hle/service/ptm/ptm.h" -#include "core/hle/service/ptm/ts.h" -#include "core/hle/service/server_manager.h" +#include "service/ptm/psm.h" +#include "service/ptm/ptm.h" +#include "service/ptm/ts.h" +#include "service/server_manager.h" namespace Service::PTM { diff --git a/src/core/hle/service/ptm/ptm.h b/src/service/ptm/ptm.h similarity index 100% rename from src/core/hle/service/ptm/ptm.h rename to src/service/ptm/ptm.h diff --git a/src/core/hle/service/ptm/ts.cpp b/src/service/ptm/ts.cpp similarity index 96% rename from src/core/hle/service/ptm/ts.cpp rename to src/service/ptm/ts.cpp index 652f38b97e..6bc9f90109 100644 --- a/src/core/hle/service/ptm/ts.cpp +++ b/src/service/ptm/ts.cpp @@ -4,8 +4,8 @@ #include #include "core/core.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/ptm/ts.h" +#include "service/ipc_helpers.h" +#include "service/ptm/ts.h" namespace Service::PTM { diff --git a/src/core/hle/service/ptm/ts.h b/src/service/ptm/ts.h similarity index 92% rename from src/core/hle/service/ptm/ts.h rename to src/service/ptm/ts.h index a10a91a64b..35f6792d28 100644 --- a/src/core/hle/service/ptm/ts.h +++ b/src/service/ptm/ts.h @@ -4,7 +4,7 @@ #pragma once #include "common/common_types.h" -#include "core/hle/service/service.h" +#include "service/service.h" namespace Service::PTM { diff --git a/src/core/hle/service/server_manager.cpp b/src/service/server_manager.cpp similarity index 95% rename from src/core/hle/service/server_manager.cpp rename to src/service/server_manager.cpp index e2e399534e..02a23c86ab 100644 --- a/src/core/hle/service/server_manager.cpp +++ b/src/service/server_manager.cpp @@ -4,19 +4,19 @@ #include "common/scope_exit.h" #include "core/core.h" -#include "core/hle/kernel/k_client_port.h" -#include "core/hle/kernel/k_client_session.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_object_name.h" -#include "core/hle/kernel/k_port.h" -#include "core/hle/kernel/k_server_port.h" -#include "core/hle/kernel/k_server_session.h" -#include "core/hle/kernel/k_synchronization_object.h" -#include "core/hle/kernel/svc_results.h" -#include "core/hle/service/hle_ipc.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/sm/sm.h" +#include "kernel/k_client_port.h" +#include "kernel/k_client_session.h" +#include "kernel/k_event.h" +#include "kernel/k_object_name.h" +#include "kernel/k_port.h" +#include "kernel/k_server_port.h" +#include "kernel/k_server_session.h" +#include "kernel/k_synchronization_object.h" +#include "kernel/svc_results.h" +#include "service/hle_ipc.h" +#include "service/ipc_helpers.h" +#include "service/server_manager.h" +#include "service/sm/sm.h" namespace Service { diff --git a/src/core/hle/service/server_manager.h b/src/service/server_manager.h similarity index 97% rename from src/core/hle/service/server_manager.h rename to src/service/server_manager.h index 58b0a08320..ed6d07e64d 100644 --- a/src/core/hle/service/server_manager.h +++ b/src/service/server_manager.h @@ -12,8 +12,8 @@ #include "common/polyfill_thread.h" #include "common/thread.h" -#include "core/hle/result.h" -#include "core/hle/service/mutex.h" +#include "core/result.h" +#include "service/mutex.h" namespace Core { class System; diff --git a/src/core/hle/service/service.cpp b/src/service/service.cpp similarity index 81% rename from src/core/hle/service/service.cpp rename to src/service/service.cpp index 0ad6073912..2f801d8ae9 100644 --- a/src/core/hle/service/service.cpp +++ b/src/service/service.cpp @@ -6,69 +6,69 @@ #include "common/logging/log.h" #include "common/settings.h" #include "core/core.h" -#include "core/hle/ipc.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_server_port.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/service/acc/acc.h" -#include "core/hle/service/am/am.h" -#include "core/hle/service/aoc/aoc_u.h" -#include "core/hle/service/apm/apm.h" -#include "core/hle/service/audio/audio.h" -#include "core/hle/service/bcat/bcat_module.h" -#include "core/hle/service/bpc/bpc.h" -#include "core/hle/service/btdrv/btdrv.h" -#include "core/hle/service/btm/btm.h" -#include "core/hle/service/caps/caps.h" -#include "core/hle/service/erpt/erpt.h" -#include "core/hle/service/es/es.h" -#include "core/hle/service/eupld/eupld.h" -#include "core/hle/service/fatal/fatal.h" -#include "core/hle/service/fgm/fgm.h" -#include "core/hle/service/filesystem/filesystem.h" -#include "core/hle/service/friend/friend.h" -#include "core/hle/service/glue/glue.h" -#include "core/hle/service/grc/grc.h" -#include "core/hle/service/hid/hid.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/jit/jit.h" -#include "core/hle/service/lbl/lbl.h" -#include "core/hle/service/ldn/ldn.h" -#include "core/hle/service/ldr/ldr.h" -#include "core/hle/service/lm/lm.h" -#include "core/hle/service/mig/mig.h" -#include "core/hle/service/mii/mii.h" -#include "core/hle/service/mm/mm_u.h" -#include "core/hle/service/mnpp/mnpp_app.h" -#include "core/hle/service/ncm/ncm.h" -#include "core/hle/service/nfc/nfc.h" -#include "core/hle/service/nfp/nfp.h" -#include "core/hle/service/ngc/ngc.h" -#include "core/hle/service/nifm/nifm.h" -#include "core/hle/service/nim/nim.h" -#include "core/hle/service/npns/npns.h" -#include "core/hle/service/ns/ns.h" -#include "core/hle/service/nvdrv/nvdrv.h" -#include "core/hle/service/nvnflinger/hos_binder_driver_server.h" -#include "core/hle/service/nvnflinger/nvnflinger.h" -#include "core/hle/service/olsc/olsc.h" -#include "core/hle/service/pcie/pcie.h" -#include "core/hle/service/pctl/pctl_module.h" -#include "core/hle/service/pcv/pcv.h" -#include "core/hle/service/pm/pm.h" -#include "core/hle/service/prepo/prepo.h" -#include "core/hle/service/psc/psc.h" -#include "core/hle/service/ptm/ptm.h" -#include "core/hle/service/service.h" -#include "core/hle/service/set/settings.h" -#include "core/hle/service/sm/sm.h" -#include "core/hle/service/sockets/sockets.h" -#include "core/hle/service/spl/spl_module.h" -#include "core/hle/service/ssl/ssl.h" -#include "core/hle/service/time/time.h" -#include "core/hle/service/usb/usb.h" -#include "core/hle/service/vi/vi.h" +#include "core/ipc.h" #include "core/reporter.h" +#include "kernel/k_process.h" +#include "kernel/k_server_port.h" +#include "kernel/kernel.h" +#include "service/acc/acc.h" +#include "service/am/am.h" +#include "service/aoc/aoc_u.h" +#include "service/apm/apm.h" +#include "service/audio/audio.h" +#include "service/bcat/bcat_module.h" +#include "service/bpc/bpc.h" +#include "service/btdrv/btdrv.h" +#include "service/btm/btm.h" +#include "service/caps/caps.h" +#include "service/erpt/erpt.h" +#include "service/es/es.h" +#include "service/eupld/eupld.h" +#include "service/fatal/fatal.h" +#include "service/fgm/fgm.h" +#include "service/filesystem/filesystem.h" +#include "service/friend/friend.h" +#include "service/glue/glue.h" +#include "service/grc/grc.h" +#include "service/hid/hid.h" +#include "service/ipc_helpers.h" +#include "service/jit/jit.h" +#include "service/lbl/lbl.h" +#include "service/ldn/ldn.h" +#include "service/ldr/ldr.h" +#include "service/lm/lm.h" +#include "service/mig/mig.h" +#include "service/mii/mii.h" +#include "service/mm/mm_u.h" +#include "service/mnpp/mnpp_app.h" +#include "service/ncm/ncm.h" +#include "service/nfc/nfc.h" +#include "service/nfp/nfp.h" +#include "service/ngc/ngc.h" +#include "service/nifm/nifm.h" +#include "service/nim/nim.h" +#include "service/npns/npns.h" +#include "service/ns/ns.h" +#include "service/nvdrv/nvdrv.h" +#include "service/nvnflinger/hos_binder_driver_server.h" +#include "service/nvnflinger/nvnflinger.h" +#include "service/olsc/olsc.h" +#include "service/pcie/pcie.h" +#include "service/pctl/pctl_module.h" +#include "service/pcv/pcv.h" +#include "service/pm/pm.h" +#include "service/prepo/prepo.h" +#include "service/psc/psc.h" +#include "service/ptm/ptm.h" +#include "service/service.h" +#include "service/set/settings.h" +#include "service/sm/sm.h" +#include "service/sockets/sockets.h" +#include "service/spl/spl_module.h" +#include "service/ssl/ssl.h" +#include "service/time/time.h" +#include "service/usb/usb.h" +#include "service/vi/vi.h" namespace Service { diff --git a/src/core/hle/service/service.h b/src/service/service.h similarity index 99% rename from src/core/hle/service/service.h rename to src/service/service.h index d539ed0f49..4ff3f7c6c2 100644 --- a/src/core/hle/service/service.h +++ b/src/service/service.h @@ -8,7 +8,7 @@ #include #include #include "common/common_types.h" -#include "core/hle/service/hle_ipc.h" +#include "service/hle_ipc.h" //////////////////////////////////////////////////////////////////////////////////////////////////// // Namespace Service diff --git a/src/core/hle/service/set/set.cpp b/src/service/set/set.cpp similarity index 98% rename from src/core/hle/service/set/set.cpp rename to src/service/set/set.cpp index 2082b8ef78..0038447421 100644 --- a/src/core/hle/service/set/set.cpp +++ b/src/service/set/set.cpp @@ -6,8 +6,8 @@ #include #include "common/logging/log.h" #include "common/settings.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/set/set.h" +#include "service/ipc_helpers.h" +#include "service/set/set.h" namespace Service::Set { namespace { diff --git a/src/core/hle/service/set/set.h b/src/service/set/set.h similarity index 98% rename from src/core/hle/service/set/set.h rename to src/service/set/set.h index b61a3560d4..118ed401ca 100644 --- a/src/core/hle/service/set/set.h +++ b/src/service/set/set.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/set/set_cal.cpp b/src/service/set/set_cal.cpp similarity index 98% rename from src/core/hle/service/set/set_cal.cpp rename to src/service/set/set_cal.cpp index d2c0d536f3..cd16c02591 100644 --- a/src/core/hle/service/set/set_cal.cpp +++ b/src/service/set/set_cal.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/set/set_cal.h" +#include "service/set/set_cal.h" namespace Service::Set { diff --git a/src/core/hle/service/set/set_cal.h b/src/service/set/set_cal.h similarity index 90% rename from src/core/hle/service/set/set_cal.h rename to src/service/set/set_cal.h index 8f50278edd..22f92e3c3d 100644 --- a/src/core/hle/service/set/set_cal.h +++ b/src/service/set/set_cal.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/set/set_fd.cpp b/src/service/set/set_fd.cpp similarity index 95% rename from src/core/hle/service/set/set_fd.cpp rename to src/service/set/set_fd.cpp index 278ef32e14..2f1420edb6 100644 --- a/src/core/hle/service/set/set_fd.cpp +++ b/src/service/set/set_fd.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/set/set_fd.h" +#include "service/set/set_fd.h" namespace Service::Set { diff --git a/src/core/hle/service/set/set_fd.h b/src/service/set/set_fd.h similarity index 90% rename from src/core/hle/service/set/set_fd.h rename to src/service/set/set_fd.h index 150a7cbced..c4fed86a5f 100644 --- a/src/core/hle/service/set/set_fd.h +++ b/src/service/set/set_fd.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/set/set_sys.cpp b/src/service/set/set_sys.cpp similarity index 99% rename from src/core/hle/service/set/set_sys.cpp rename to src/service/set/set_sys.cpp index ec3af80af8..ed164a0330 100644 --- a/src/core/hle/service/set/set_sys.cpp +++ b/src/service/set/set_sys.cpp @@ -12,10 +12,10 @@ #include "core/file_sys/registered_cache.h" #include "core/file_sys/romfs.h" #include "core/file_sys/system_archive/system_archive.h" -#include "core/hle/service/filesystem/filesystem.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/set/set.h" -#include "core/hle/service/set/set_sys.h" +#include "service/filesystem/filesystem.h" +#include "service/ipc_helpers.h" +#include "service/set/set.h" +#include "service/set/set_sys.h" namespace Service::Set { diff --git a/src/core/hle/service/set/set_sys.h b/src/service/set/set_sys.h similarity index 99% rename from src/core/hle/service/set/set_sys.h rename to src/service/set/set_sys.h index c7dba2a9ee..c4192c34fe 100644 --- a/src/core/hle/service/set/set_sys.h +++ b/src/service/set/set_sys.h @@ -4,8 +4,8 @@ #pragma once #include "common/uuid.h" -#include "core/hle/service/service.h" -#include "core/hle/service/time/clock_types.h" +#include "service/service.h" +#include "service/time/clock_types.h" namespace Core { class System; diff --git a/src/core/hle/service/set/settings.cpp b/src/service/set/settings.cpp similarity index 72% rename from src/core/hle/service/set/settings.cpp rename to src/service/set/settings.cpp index c48844f775..489f6365f0 100644 --- a/src/core/hle/service/set/settings.cpp +++ b/src/service/set/settings.cpp @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/server_manager.h" -#include "core/hle/service/set/set.h" -#include "core/hle/service/set/set_cal.h" -#include "core/hle/service/set/set_fd.h" -#include "core/hle/service/set/set_sys.h" -#include "core/hle/service/set/settings.h" +#include "service/server_manager.h" +#include "service/set/set.h" +#include "service/set/set_cal.h" +#include "service/set/set_fd.h" +#include "service/set/set_sys.h" +#include "service/set/settings.h" namespace Service::Set { diff --git a/src/core/hle/service/set/settings.h b/src/service/set/settings.h similarity index 100% rename from src/core/hle/service/set/settings.h rename to src/service/set/settings.h diff --git a/src/core/hle/service/sm/sm.cpp b/src/service/sm/sm.cpp similarity index 95% rename from src/core/hle/service/sm/sm.cpp rename to src/service/sm/sm.cpp index 9ab718e0a5..5277d9fa60 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/service/sm/sm.cpp @@ -5,16 +5,16 @@ #include "common/assert.h" #include "common/scope_exit.h" #include "core/core.h" -#include "core/hle/kernel/k_client_port.h" -#include "core/hle/kernel/k_client_session.h" -#include "core/hle/kernel/k_port.h" -#include "core/hle/kernel/k_scoped_resource_reservation.h" -#include "core/hle/kernel/k_server_port.h" -#include "core/hle/result.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/sm/sm.h" -#include "core/hle/service/sm/sm_controller.h" +#include "core/result.h" +#include "kernel/k_client_port.h" +#include "kernel/k_client_session.h" +#include "kernel/k_port.h" +#include "kernel/k_scoped_resource_reservation.h" +#include "kernel/k_server_port.h" +#include "service/ipc_helpers.h" +#include "service/server_manager.h" +#include "service/sm/sm.h" +#include "service/sm/sm_controller.h" namespace Service::SM { diff --git a/src/core/hle/service/sm/sm.h b/src/service/sm/sm.h similarity index 96% rename from src/core/hle/service/sm/sm.h rename to src/service/sm/sm.h index 14bfaf8c29..60a0559cdb 100644 --- a/src/core/hle/service/sm/sm.h +++ b/src/service/sm/sm.h @@ -9,9 +9,9 @@ #include #include "common/concepts.h" -#include "core/hle/kernel/k_port.h" -#include "core/hle/result.h" -#include "core/hle/service/service.h" +#include "core/result.h" +#include "kernel/k_port.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/sm/sm_controller.cpp b/src/service/sm/sm_controller.cpp similarity index 89% rename from src/core/hle/service/sm/sm_controller.cpp rename to src/service/sm/sm_controller.cpp index 7dce28fe01..331c9d1010 100644 --- a/src/core/hle/service/sm/sm_controller.cpp +++ b/src/service/sm/sm_controller.cpp @@ -4,14 +4,14 @@ #include "common/assert.h" #include "common/logging/log.h" #include "core/core.h" -#include "core/hle/kernel/k_client_port.h" -#include "core/hle/kernel/k_port.h" -#include "core/hle/kernel/k_scoped_resource_reservation.h" -#include "core/hle/kernel/k_server_session.h" -#include "core/hle/kernel/k_session.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/sm/sm_controller.h" +#include "kernel/k_client_port.h" +#include "kernel/k_port.h" +#include "kernel/k_scoped_resource_reservation.h" +#include "kernel/k_server_session.h" +#include "kernel/k_session.h" +#include "service/ipc_helpers.h" +#include "service/server_manager.h" +#include "service/sm/sm_controller.h" namespace Service::SM { diff --git a/src/core/hle/service/sm/sm_controller.h b/src/service/sm/sm_controller.h similarity index 94% rename from src/core/hle/service/sm/sm_controller.h rename to src/service/sm/sm_controller.h index 4e748b36d9..437edc9bf1 100644 --- a/src/core/hle/service/sm/sm_controller.h +++ b/src/service/sm/sm_controller.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/service/sockets/bsd.cpp similarity index 99% rename from src/core/hle/service/sockets/bsd.cpp rename to src/service/sockets/bsd.cpp index dd652ca421..d3740293e6 100644 --- a/src/core/hle/service/sockets/bsd.cpp +++ b/src/service/sockets/bsd.cpp @@ -11,14 +11,14 @@ #include "common/microprofile.h" #include "common/socket_types.h" #include "core/core.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/sockets/bsd.h" -#include "core/hle/service/sockets/sockets_translate.h" #include "core/internal_network/network.h" #include "core/internal_network/socket_proxy.h" #include "core/internal_network/sockets.h" +#include "kernel/k_thread.h" #include "network/network.h" +#include "service/ipc_helpers.h" +#include "service/sockets/bsd.h" +#include "service/sockets/sockets_translate.h" using Common::Expected; using Common::Unexpected; diff --git a/src/core/hle/service/sockets/bsd.h b/src/service/sockets/bsd.h similarity index 98% rename from src/core/hle/service/sockets/bsd.h rename to src/service/sockets/bsd.h index 4f69d382c9..c27fa65e3a 100644 --- a/src/core/hle/service/sockets/bsd.h +++ b/src/service/sockets/bsd.h @@ -10,9 +10,9 @@ #include "common/common_types.h" #include "common/expected.h" #include "common/socket_types.h" -#include "core/hle/service/service.h" -#include "core/hle/service/sockets/sockets.h" #include "network/network.h" +#include "service/service.h" +#include "service/sockets/sockets.h" namespace Core { class System; diff --git a/src/core/hle/service/sockets/nsd.cpp b/src/service/sockets/nsd.cpp similarity index 97% rename from src/core/hle/service/sockets/nsd.cpp rename to src/service/sockets/nsd.cpp index 491b76d481..59cf9dcf3c 100644 --- a/src/core/hle/service/sockets/nsd.cpp +++ b/src/service/sockets/nsd.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/sockets/nsd.h" +#include "service/ipc_helpers.h" +#include "service/sockets/nsd.h" #include "common/string_util.h" diff --git a/src/core/hle/service/sockets/nsd.h b/src/service/sockets/nsd.h similarity index 93% rename from src/core/hle/service/sockets/nsd.h rename to src/service/sockets/nsd.h index b0cfec507f..b036d60a17 100644 --- a/src/core/hle/service/sockets/nsd.h +++ b/src/service/sockets/nsd.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/sockets/sfdnsres.cpp b/src/service/sockets/sfdnsres.cpp similarity index 98% rename from src/core/hle/service/sockets/sfdnsres.cpp rename to src/service/sockets/sfdnsres.cpp index c657c4efd8..66779d48f6 100644 --- a/src/core/hle/service/sockets/sfdnsres.cpp +++ b/src/service/sockets/sfdnsres.cpp @@ -8,12 +8,12 @@ #include "common/string_util.h" #include "common/swap.h" #include "core/core.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/sockets/sfdnsres.h" -#include "core/hle/service/sockets/sockets.h" -#include "core/hle/service/sockets/sockets_translate.h" #include "core/internal_network/network.h" #include "core/memory.h" +#include "service/ipc_helpers.h" +#include "service/sockets/sfdnsres.h" +#include "service/sockets/sockets.h" +#include "service/sockets/sockets_translate.h" namespace Service::Sockets { diff --git a/src/core/hle/service/sockets/sfdnsres.h b/src/service/sockets/sfdnsres.h similarity index 95% rename from src/core/hle/service/sockets/sfdnsres.h rename to src/service/sockets/sfdnsres.h index 282ef9071f..7a9e853252 100644 --- a/src/core/hle/service/sockets/sfdnsres.h +++ b/src/service/sockets/sfdnsres.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/sockets/sockets.cpp b/src/service/sockets/sockets.cpp similarity index 80% rename from src/core/hle/service/sockets/sockets.cpp rename to src/service/sockets/sockets.cpp index 676d24e036..7d9e0e1554 100644 --- a/src/core/hle/service/sockets/sockets.cpp +++ b/src/service/sockets/sockets.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/server_manager.h" -#include "core/hle/service/sockets/bsd.h" -#include "core/hle/service/sockets/nsd.h" -#include "core/hle/service/sockets/sfdnsres.h" -#include "core/hle/service/sockets/sockets.h" +#include "service/server_manager.h" +#include "service/sockets/bsd.h" +#include "service/sockets/nsd.h" +#include "service/sockets/sfdnsres.h" +#include "service/sockets/sockets.h" namespace Service::Sockets { diff --git a/src/core/hle/service/sockets/sockets.h b/src/service/sockets/sockets.h similarity index 100% rename from src/core/hle/service/sockets/sockets.h rename to src/service/sockets/sockets.h diff --git a/src/core/hle/service/sockets/sockets_translate.cpp b/src/service/sockets/sockets_translate.cpp similarity index 98% rename from src/core/hle/service/sockets/sockets_translate.cpp rename to src/service/sockets/sockets_translate.cpp index aed05250c7..29e1918be3 100644 --- a/src/core/hle/service/sockets/sockets_translate.cpp +++ b/src/service/sockets/sockets_translate.cpp @@ -5,9 +5,9 @@ #include "common/assert.h" #include "common/common_types.h" -#include "core/hle/service/sockets/sockets.h" -#include "core/hle/service/sockets/sockets_translate.h" #include "core/internal_network/network.h" +#include "service/sockets/sockets.h" +#include "service/sockets/sockets_translate.h" namespace Service::Sockets { diff --git a/src/core/hle/service/sockets/sockets_translate.h b/src/service/sockets/sockets_translate.h similarity index 97% rename from src/core/hle/service/sockets/sockets_translate.h rename to src/service/sockets/sockets_translate.h index bd6721fd3e..fda0a721ff 100644 --- a/src/core/hle/service/sockets/sockets_translate.h +++ b/src/service/sockets/sockets_translate.h @@ -6,8 +6,8 @@ #include #include "common/common_types.h" -#include "core/hle/service/sockets/sockets.h" #include "core/internal_network/network.h" +#include "service/sockets/sockets.h" namespace Service::Sockets { diff --git a/src/core/hle/service/spl/csrng.cpp b/src/service/spl/csrng.cpp similarity index 92% rename from src/core/hle/service/spl/csrng.cpp rename to src/service/spl/csrng.cpp index ca121fb054..19a913ebcd 100644 --- a/src/core/hle/service/spl/csrng.cpp +++ b/src/service/spl/csrng.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/spl/csrng.h" +#include "service/spl/csrng.h" namespace Service::SPL { diff --git a/src/core/hle/service/spl/csrng.h b/src/service/spl/csrng.h similarity index 89% rename from src/core/hle/service/spl/csrng.h rename to src/service/spl/csrng.h index b337a82816..0692151be6 100644 --- a/src/core/hle/service/spl/csrng.h +++ b/src/service/spl/csrng.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/spl/spl_module.h" +#include "service/spl/spl_module.h" namespace Core { class System; diff --git a/src/core/hle/service/spl/spl.cpp b/src/service/spl/spl.cpp similarity index 99% rename from src/core/hle/service/spl/spl.cpp rename to src/service/spl/spl.cpp index fde212186f..edeb11d5dd 100644 --- a/src/core/hle/service/spl/spl.cpp +++ b/src/service/spl/spl.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/spl/spl.h" +#include "service/spl/spl.h" namespace Service::SPL { diff --git a/src/core/hle/service/spl/spl.h b/src/service/spl/spl.h similarity index 96% rename from src/core/hle/service/spl/spl.h rename to src/service/spl/spl.h index 7b63d8b1a9..e81973876f 100644 --- a/src/core/hle/service/spl/spl.h +++ b/src/service/spl/spl.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/spl/spl_module.h" +#include "service/spl/spl_module.h" namespace Core { class System; diff --git a/src/core/hle/service/spl/spl_module.cpp b/src/service/spl/spl_module.cpp similarity index 92% rename from src/core/hle/service/spl/spl_module.cpp rename to src/service/spl/spl_module.cpp index 549e6f4fa8..d3f3a3db8a 100644 --- a/src/core/hle/service/spl/spl_module.cpp +++ b/src/service/spl/spl_module.cpp @@ -7,12 +7,12 @@ #include #include "common/logging/log.h" #include "common/settings.h" -#include "core/hle/api_version.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/spl/csrng.h" -#include "core/hle/service/spl/spl.h" -#include "core/hle/service/spl/spl_module.h" +#include "core/api_version.h" +#include "service/ipc_helpers.h" +#include "service/server_manager.h" +#include "service/spl/csrng.h" +#include "service/spl/spl.h" +#include "service/spl/spl_module.h" namespace Service::SPL { @@ -121,10 +121,10 @@ Result Module::Interface::GetConfigImpl(u64* out_config, ConfigItem config_item) return ResultSecureMonitorNotImplemented; case ConfigItem::ExosphereApiVersion: // Get information about the current exosphere version. - *out_config = (u64{HLE::ApiVersion::ATMOSPHERE_RELEASE_VERSION_MAJOR} << 56) | - (u64{HLE::ApiVersion::ATMOSPHERE_RELEASE_VERSION_MINOR} << 48) | - (u64{HLE::ApiVersion::ATMOSPHERE_RELEASE_VERSION_MICRO} << 40) | - (static_cast(HLE::ApiVersion::GetTargetFirmware())); + *out_config = (u64{Core::ApiVersion::ATMOSPHERE_RELEASE_VERSION_MAJOR} << 56) | + (u64{Core::ApiVersion::ATMOSPHERE_RELEASE_VERSION_MINOR} << 48) | + (u64{Core::ApiVersion::ATMOSPHERE_RELEASE_VERSION_MICRO} << 40) | + (static_cast(Core::ApiVersion::GetTargetFirmware())); return ResultSuccess; case ConfigItem::ExosphereNeedsReboot: // We are executing, so we aren't in the process of rebooting. diff --git a/src/core/hle/service/spl/spl_module.h b/src/service/spl/spl_module.h similarity index 89% rename from src/core/hle/service/spl/spl_module.h rename to src/service/spl/spl_module.h index 06dcffa6c4..b3c5915496 100644 --- a/src/core/hle/service/spl/spl_module.h +++ b/src/service/spl/spl_module.h @@ -4,9 +4,9 @@ #pragma once #include -#include "core/hle/service/service.h" -#include "core/hle/service/spl/spl_results.h" -#include "core/hle/service/spl/spl_types.h" +#include "service/service.h" +#include "service/spl/spl_results.h" +#include "service/spl/spl_types.h" namespace Core { class System; diff --git a/src/core/hle/service/spl/spl_results.h b/src/service/spl/spl_results.h similarity index 97% rename from src/core/hle/service/spl/spl_results.h rename to src/service/spl/spl_results.h index dd7ba11f34..9effe6774d 100644 --- a/src/core/hle/service/spl/spl_results.h +++ b/src/service/spl/spl_results.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/result.h" +#include "core/result.h" namespace Service::SPL { diff --git a/src/core/hle/service/spl/spl_types.h b/src/service/spl/spl_types.h similarity index 100% rename from src/core/hle/service/spl/spl_types.h rename to src/service/spl/spl_types.h diff --git a/src/core/hle/service/ssl/ssl.cpp b/src/service/ssl/ssl.cpp similarity index 98% rename from src/core/hle/service/ssl/ssl.cpp rename to src/service/ssl/ssl.cpp index 6c8427b0d8..9a03c690e7 100644 --- a/src/core/hle/service/ssl/ssl.cpp +++ b/src/service/ssl/ssl.cpp @@ -4,16 +4,16 @@ #include "common/string_util.h" #include "core/core.h" -#include "core/hle/result.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" -#include "core/hle/service/sm/sm.h" -#include "core/hle/service/sockets/bsd.h" -#include "core/hle/service/ssl/ssl.h" -#include "core/hle/service/ssl/ssl_backend.h" #include "core/internal_network/network.h" #include "core/internal_network/sockets.h" +#include "core/result.h" +#include "service/ipc_helpers.h" +#include "service/server_manager.h" +#include "service/service.h" +#include "service/sm/sm.h" +#include "service/sockets/bsd.h" +#include "service/ssl/ssl.h" +#include "service/ssl/ssl_backend.h" namespace Service::SSL { diff --git a/src/core/hle/service/ssl/ssl.h b/src/service/ssl/ssl.h similarity index 100% rename from src/core/hle/service/ssl/ssl.h rename to src/service/ssl/ssl.h diff --git a/src/core/hle/service/ssl/ssl_backend.h b/src/service/ssl/ssl_backend.h similarity index 98% rename from src/core/hle/service/ssl/ssl_backend.h rename to src/service/ssl/ssl_backend.h index a2ec8e6947..49f767530b 100644 --- a/src/core/hle/service/ssl/ssl_backend.h +++ b/src/service/ssl/ssl_backend.h @@ -10,7 +10,7 @@ #include "common/common_types.h" -#include "core/hle/result.h" +#include "core/result.h" namespace Network { class SocketBase; diff --git a/src/core/hle/service/ssl/ssl_backend_none.cpp b/src/service/ssl/ssl_backend_none.cpp similarity index 90% rename from src/core/hle/service/ssl/ssl_backend_none.cpp rename to src/service/ssl/ssl_backend_none.cpp index a7fafd0a30..cde4c670a5 100644 --- a/src/core/hle/service/ssl/ssl_backend_none.cpp +++ b/src/service/ssl/ssl_backend_none.cpp @@ -3,7 +3,7 @@ #include "common/logging/log.h" -#include "core/hle/service/ssl/ssl_backend.h" +#include "service/ssl/ssl_backend.h" namespace Service::SSL { diff --git a/src/core/hle/service/ssl/ssl_backend_openssl.cpp b/src/service/ssl/ssl_backend_openssl.cpp similarity index 99% rename from src/core/hle/service/ssl/ssl_backend_openssl.cpp rename to src/service/ssl/ssl_backend_openssl.cpp index 5714e6f3c5..d38373c9e9 100644 --- a/src/core/hle/service/ssl/ssl_backend_openssl.cpp +++ b/src/service/ssl/ssl_backend_openssl.cpp @@ -12,9 +12,9 @@ #include "common/hex_util.h" #include "common/string_util.h" -#include "core/hle/service/ssl/ssl_backend.h" #include "core/internal_network/network.h" #include "core/internal_network/sockets.h" +#include "service/ssl/ssl_backend.h" using namespace Common::FS; diff --git a/src/core/hle/service/ssl/ssl_backend_schannel.cpp b/src/service/ssl/ssl_backend_schannel.cpp similarity index 99% rename from src/core/hle/service/ssl/ssl_backend_schannel.cpp rename to src/service/ssl/ssl_backend_schannel.cpp index 212057cfc9..227e381272 100644 --- a/src/core/hle/service/ssl/ssl_backend_schannel.cpp +++ b/src/service/ssl/ssl_backend_schannel.cpp @@ -8,9 +8,9 @@ #include "common/hex_util.h" #include "common/string_util.h" -#include "core/hle/service/ssl/ssl_backend.h" #include "core/internal_network/network.h" #include "core/internal_network/sockets.h" +#include "service/ssl/ssl_backend.h" namespace { diff --git a/src/core/hle/service/ssl/ssl_backend_securetransport.cpp b/src/service/ssl/ssl_backend_securetransport.cpp similarity index 99% rename from src/core/hle/service/ssl/ssl_backend_securetransport.cpp rename to src/service/ssl/ssl_backend_securetransport.cpp index c48914f640..62ee18e983 100644 --- a/src/core/hle/service/ssl/ssl_backend_securetransport.cpp +++ b/src/service/ssl/ssl_backend_securetransport.cpp @@ -13,9 +13,9 @@ #pragma GCC diagnostic pop #endif -#include "core/hle/service/ssl/ssl_backend.h" #include "core/internal_network/network.h" #include "core/internal_network/sockets.h" +#include "service/ssl/ssl_backend.h" namespace { diff --git a/src/core/hle/service/time/clock_types.h b/src/service/time/clock_types.h similarity index 95% rename from src/core/hle/service/time/clock_types.h rename to src/service/time/clock_types.h index 9fc01ea907..522eafe66c 100644 --- a/src/core/hle/service/time/clock_types.h +++ b/src/service/time/clock_types.h @@ -8,10 +8,12 @@ #include "common/common_funcs.h" #include "common/common_types.h" #include "common/uuid.h" -#include "core/hle/service/time/errors.h" -#include "core/hle/service/time/time_zone_types.h" +#include "service/time/errors.h" +#include "service/time/time_zone_types.h" namespace Service::Time::Clock { +// This is defined by Windows.h and conflicts with ClockSnapshot::GetCurrentTime +#undef GetCurrentTime enum class TimeType : u8 { UserSystemClock, diff --git a/src/core/hle/service/time/ephemeral_network_system_clock_context_writer.h b/src/service/time/ephemeral_network_system_clock_context_writer.h similarity index 84% rename from src/core/hle/service/time/ephemeral_network_system_clock_context_writer.h rename to src/service/time/ephemeral_network_system_clock_context_writer.h index 0f928a5a5f..4809a9c5ea 100644 --- a/src/core/hle/service/time/ephemeral_network_system_clock_context_writer.h +++ b/src/service/time/ephemeral_network_system_clock_context_writer.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/time/system_clock_context_update_callback.h" +#include "service/time/system_clock_context_update_callback.h" namespace Service::Time::Clock { diff --git a/src/core/hle/service/time/ephemeral_network_system_clock_core.h b/src/service/time/ephemeral_network_system_clock_core.h similarity index 88% rename from src/core/hle/service/time/ephemeral_network_system_clock_core.h rename to src/service/time/ephemeral_network_system_clock_core.h index 0a5f5aafb6..4c82d2099d 100644 --- a/src/core/hle/service/time/ephemeral_network_system_clock_core.h +++ b/src/service/time/ephemeral_network_system_clock_core.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/time/system_clock_core.h" +#include "service/time/system_clock_core.h" namespace Service::Time::Clock { diff --git a/src/core/hle/service/time/errors.h b/src/service/time/errors.h similarity index 96% rename from src/core/hle/service/time/errors.h rename to src/service/time/errors.h index 6655d30e1c..b9eb5cf8ad 100644 --- a/src/core/hle/service/time/errors.h +++ b/src/service/time/errors.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/result.h" +#include "core/result.h" namespace Service::Time { diff --git a/src/core/hle/service/time/local_system_clock_context_writer.h b/src/service/time/local_system_clock_context_writer.h similarity index 83% rename from src/core/hle/service/time/local_system_clock_context_writer.h rename to src/service/time/local_system_clock_context_writer.h index 1639ef2b9d..c2f4d28003 100644 --- a/src/core/hle/service/time/local_system_clock_context_writer.h +++ b/src/service/time/local_system_clock_context_writer.h @@ -3,8 +3,8 @@ #pragma once -#include "core/hle/service/time/system_clock_context_update_callback.h" -#include "core/hle/service/time/time_sharedmemory.h" +#include "service/time/system_clock_context_update_callback.h" +#include "service/time/time_sharedmemory.h" namespace Service::Time::Clock { diff --git a/src/core/hle/service/time/network_system_clock_context_writer.h b/src/service/time/network_system_clock_context_writer.h similarity index 79% rename from src/core/hle/service/time/network_system_clock_context_writer.h rename to src/service/time/network_system_clock_context_writer.h index 655e4c06d9..c63205a3cf 100644 --- a/src/core/hle/service/time/network_system_clock_context_writer.h +++ b/src/service/time/network_system_clock_context_writer.h @@ -3,9 +3,9 @@ #pragma once -#include "core/hle/service/time/errors.h" -#include "core/hle/service/time/system_clock_context_update_callback.h" -#include "core/hle/service/time/time_sharedmemory.h" +#include "service/time/errors.h" +#include "service/time/system_clock_context_update_callback.h" +#include "service/time/time_sharedmemory.h" namespace Service::Time::Clock { diff --git a/src/core/hle/service/time/standard_local_system_clock_core.h b/src/service/time/standard_local_system_clock_core.h similarity index 88% rename from src/core/hle/service/time/standard_local_system_clock_core.h rename to src/service/time/standard_local_system_clock_core.h index ae2ff1bfd6..964edd27c8 100644 --- a/src/core/hle/service/time/standard_local_system_clock_core.h +++ b/src/service/time/standard_local_system_clock_core.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/time/system_clock_core.h" +#include "service/time/system_clock_core.h" namespace Service::Time::Clock { diff --git a/src/core/hle/service/time/standard_network_system_clock_core.h b/src/service/time/standard_network_system_clock_core.h similarity index 88% rename from src/core/hle/service/time/standard_network_system_clock_core.h rename to src/service/time/standard_network_system_clock_core.h index c1ec5252b6..08c4c35fc7 100644 --- a/src/core/hle/service/time/standard_network_system_clock_core.h +++ b/src/service/time/standard_network_system_clock_core.h @@ -3,9 +3,9 @@ #pragma once -#include "core/hle/service/time/clock_types.h" -#include "core/hle/service/time/steady_clock_core.h" -#include "core/hle/service/time/system_clock_core.h" +#include "service/time/clock_types.h" +#include "service/time/steady_clock_core.h" +#include "service/time/system_clock_core.h" namespace Core { class System; diff --git a/src/core/hle/service/time/standard_steady_clock_core.cpp b/src/service/time/standard_steady_clock_core.cpp similarity index 92% rename from src/core/hle/service/time/standard_steady_clock_core.cpp rename to src/service/time/standard_steady_clock_core.cpp index 5627b70036..91e032b62f 100644 --- a/src/core/hle/service/time/standard_steady_clock_core.cpp +++ b/src/service/time/standard_steady_clock_core.cpp @@ -4,7 +4,7 @@ #include "core/core.h" #include "core/core_timing.h" #include "core/hardware_properties.h" -#include "core/hle/service/time/standard_steady_clock_core.h" +#include "service/time/standard_steady_clock_core.h" namespace Service::Time::Clock { diff --git a/src/core/hle/service/time/standard_steady_clock_core.h b/src/service/time/standard_steady_clock_core.h similarity index 90% rename from src/core/hle/service/time/standard_steady_clock_core.h rename to src/service/time/standard_steady_clock_core.h index 036463b871..2c9721143b 100644 --- a/src/core/hle/service/time/standard_steady_clock_core.h +++ b/src/service/time/standard_steady_clock_core.h @@ -3,8 +3,8 @@ #pragma once -#include "core/hle/service/time/clock_types.h" -#include "core/hle/service/time/steady_clock_core.h" +#include "service/time/clock_types.h" +#include "service/time/steady_clock_core.h" namespace Core { class System; diff --git a/src/core/hle/service/time/standard_user_system_clock_core.cpp b/src/service/time/standard_user_system_clock_core.cpp similarity index 91% rename from src/core/hle/service/time/standard_user_system_clock_core.cpp rename to src/service/time/standard_user_system_clock_core.cpp index b033757ed6..7e6a1174d2 100644 --- a/src/core/hle/service/time/standard_user_system_clock_core.cpp +++ b/src/service/time/standard_user_system_clock_core.cpp @@ -3,10 +3,10 @@ #include "common/assert.h" #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/time/standard_local_system_clock_core.h" -#include "core/hle/service/time/standard_network_system_clock_core.h" -#include "core/hle/service/time/standard_user_system_clock_core.h" +#include "kernel/k_event.h" +#include "service/time/standard_local_system_clock_core.h" +#include "service/time/standard_network_system_clock_core.h" +#include "service/time/standard_user_system_clock_core.h" namespace Service::Time::Clock { diff --git a/src/core/hle/service/time/standard_user_system_clock_core.h b/src/service/time/standard_user_system_clock_core.h similarity index 92% rename from src/core/hle/service/time/standard_user_system_clock_core.h rename to src/service/time/standard_user_system_clock_core.h index ee6e294872..edf261bd88 100644 --- a/src/core/hle/service/time/standard_user_system_clock_core.h +++ b/src/service/time/standard_user_system_clock_core.h @@ -3,9 +3,9 @@ #pragma once -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/time/clock_types.h" -#include "core/hle/service/time/system_clock_core.h" +#include "service/kernel_helpers.h" +#include "service/time/clock_types.h" +#include "service/time/system_clock_core.h" namespace Core { class System; diff --git a/src/core/hle/service/time/steady_clock_core.h b/src/service/time/steady_clock_core.h similarity index 96% rename from src/core/hle/service/time/steady_clock_core.h rename to src/service/time/steady_clock_core.h index 2867c351cf..40a63a36bc 100644 --- a/src/core/hle/service/time/steady_clock_core.h +++ b/src/service/time/steady_clock_core.h @@ -4,7 +4,7 @@ #pragma once #include "common/uuid.h" -#include "core/hle/service/time/clock_types.h" +#include "service/time/clock_types.h" namespace Core { class System; diff --git a/src/core/hle/service/time/system_clock_context_update_callback.cpp b/src/service/time/system_clock_context_update_callback.cpp similarity index 90% rename from src/core/hle/service/time/system_clock_context_update_callback.cpp rename to src/service/time/system_clock_context_update_callback.cpp index cafc04ee72..2fdffad6bd 100644 --- a/src/core/hle/service/time/system_clock_context_update_callback.cpp +++ b/src/service/time/system_clock_context_update_callback.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/kernel/k_event.h" -#include "core/hle/service/time/errors.h" -#include "core/hle/service/time/system_clock_context_update_callback.h" +#include "kernel/k_event.h" +#include "service/time/errors.h" +#include "service/time/system_clock_context_update_callback.h" namespace Service::Time::Clock { diff --git a/src/core/hle/service/time/system_clock_context_update_callback.h b/src/service/time/system_clock_context_update_callback.h similarity index 95% rename from src/core/hle/service/time/system_clock_context_update_callback.h rename to src/service/time/system_clock_context_update_callback.h index bf657acd9e..5b5eb89ac8 100644 --- a/src/core/hle/service/time/system_clock_context_update_callback.h +++ b/src/service/time/system_clock_context_update_callback.h @@ -6,7 +6,7 @@ #include #include -#include "core/hle/service/time/clock_types.h" +#include "service/time/clock_types.h" namespace Kernel { class KEvent; diff --git a/src/core/hle/service/time/system_clock_core.cpp b/src/service/time/system_clock_core.cpp similarity index 93% rename from src/core/hle/service/time/system_clock_core.cpp rename to src/service/time/system_clock_core.cpp index da078241f7..783d1fc654 100644 --- a/src/core/hle/service/time/system_clock_core.cpp +++ b/src/service/time/system_clock_core.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/time/steady_clock_core.h" -#include "core/hle/service/time/system_clock_context_update_callback.h" -#include "core/hle/service/time/system_clock_core.h" +#include "service/time/steady_clock_core.h" +#include "service/time/system_clock_context_update_callback.h" +#include "service/time/system_clock_core.h" namespace Service::Time::Clock { diff --git a/src/core/hle/service/time/system_clock_core.h b/src/service/time/system_clock_core.h similarity index 97% rename from src/core/hle/service/time/system_clock_core.h rename to src/service/time/system_clock_core.h index 8cb34126f7..b509745683 100644 --- a/src/core/hle/service/time/system_clock_core.h +++ b/src/service/time/system_clock_core.h @@ -6,7 +6,7 @@ #include #include "common/common_types.h" -#include "core/hle/service/time/clock_types.h" +#include "service/time/clock_types.h" namespace Core { class System; diff --git a/src/core/hle/service/time/tick_based_steady_clock_core.cpp b/src/service/time/tick_based_steady_clock_core.cpp similarity index 91% rename from src/core/hle/service/time/tick_based_steady_clock_core.cpp rename to src/service/time/tick_based_steady_clock_core.cpp index 0d9fb31433..a01984af39 100644 --- a/src/core/hle/service/time/tick_based_steady_clock_core.cpp +++ b/src/service/time/tick_based_steady_clock_core.cpp @@ -4,7 +4,7 @@ #include "core/core.h" #include "core/core_timing.h" #include "core/hardware_properties.h" -#include "core/hle/service/time/tick_based_steady_clock_core.h" +#include "service/time/tick_based_steady_clock_core.h" namespace Service::Time::Clock { diff --git a/src/core/hle/service/time/tick_based_steady_clock_core.h b/src/service/time/tick_based_steady_clock_core.h similarity index 85% rename from src/core/hle/service/time/tick_based_steady_clock_core.h rename to src/service/time/tick_based_steady_clock_core.h index 491185dc3a..bc7d35d7e1 100644 --- a/src/core/hle/service/time/tick_based_steady_clock_core.h +++ b/src/service/time/tick_based_steady_clock_core.h @@ -3,8 +3,8 @@ #pragma once -#include "core/hle/service/time/clock_types.h" -#include "core/hle/service/time/steady_clock_core.h" +#include "service/time/clock_types.h" +#include "service/time/steady_clock_core.h" namespace Core { class System; diff --git a/src/core/hle/service/time/time.cpp b/src/service/time/time.cpp similarity index 97% rename from src/core/hle/service/time/time.cpp rename to src/service/time/time.cpp index 7197ca30fc..780f4b3b6d 100644 --- a/src/core/hle/service/time/time.cpp +++ b/src/service/time/time.cpp @@ -5,14 +5,14 @@ #include "core/core.h" #include "core/core_timing.h" #include "core/hardware_properties.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/time/time.h" -#include "core/hle/service/time/time_interface.h" -#include "core/hle/service/time/time_manager.h" -#include "core/hle/service/time/time_sharedmemory.h" -#include "core/hle/service/time/time_zone_service.h" +#include "kernel/kernel.h" +#include "service/ipc_helpers.h" +#include "service/server_manager.h" +#include "service/time/time.h" +#include "service/time/time_interface.h" +#include "service/time/time_manager.h" +#include "service/time/time_sharedmemory.h" +#include "service/time/time_zone_service.h" namespace Service::Time { diff --git a/src/core/hle/service/time/time.h b/src/service/time/time.h similarity index 95% rename from src/core/hle/service/time/time.h rename to src/service/time/time.h index b2d754ef33..f96a7de58f 100644 --- a/src/core/hle/service/time/time.h +++ b/src/service/time/time.h @@ -3,8 +3,8 @@ #pragma once -#include "core/hle/service/service.h" -#include "core/hle/service/time/clock_types.h" +#include "service/service.h" +#include "service/time/clock_types.h" namespace Core { class System; diff --git a/src/core/hle/service/time/time_interface.cpp b/src/service/time/time_interface.cpp similarity index 97% rename from src/core/hle/service/time/time_interface.cpp rename to src/service/time/time_interface.cpp index 0c53e98eeb..0bec37916b 100644 --- a/src/core/hle/service/time/time_interface.cpp +++ b/src/service/time/time_interface.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/time/time_interface.h" +#include "service/time/time_interface.h" namespace Service::Time { diff --git a/src/core/hle/service/time/time_interface.h b/src/service/time/time_interface.h similarity index 90% rename from src/core/hle/service/time/time_interface.h rename to src/service/time/time_interface.h index ceeb0e5efd..48fb5e7597 100644 --- a/src/core/hle/service/time/time_interface.h +++ b/src/service/time/time_interface.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/time/time.h" +#include "service/time/time.h" namespace Core { class System; diff --git a/src/core/hle/service/time/time_manager.cpp b/src/service/time/time_manager.cpp similarity index 96% rename from src/core/hle/service/time/time_manager.cpp rename to src/service/time/time_manager.cpp index fa0fd05316..b3b6e0abd9 100644 --- a/src/core/hle/service/time/time_manager.cpp +++ b/src/service/time/time_manager.cpp @@ -6,12 +6,12 @@ #include "common/settings.h" #include "common/time_zone.h" -#include "core/hle/service/time/ephemeral_network_system_clock_context_writer.h" -#include "core/hle/service/time/ephemeral_network_system_clock_core.h" -#include "core/hle/service/time/local_system_clock_context_writer.h" -#include "core/hle/service/time/network_system_clock_context_writer.h" -#include "core/hle/service/time/tick_based_steady_clock_core.h" -#include "core/hle/service/time/time_manager.h" +#include "service/time/ephemeral_network_system_clock_context_writer.h" +#include "service/time/ephemeral_network_system_clock_core.h" +#include "service/time/local_system_clock_context_writer.h" +#include "service/time/network_system_clock_context_writer.h" +#include "service/time/tick_based_steady_clock_core.h" +#include "service/time/time_manager.h" namespace Service::Time { namespace { diff --git a/src/core/hle/service/time/time_manager.h b/src/service/time/time_manager.h similarity index 82% rename from src/core/hle/service/time/time_manager.h rename to src/service/time/time_manager.h index 84572dbfac..5c32d42841 100644 --- a/src/core/hle/service/time/time_manager.h +++ b/src/service/time/time_manager.h @@ -5,13 +5,13 @@ #include "common/common_types.h" #include "core/file_sys/vfs_types.h" -#include "core/hle/service/time/clock_types.h" -#include "core/hle/service/time/standard_local_system_clock_core.h" -#include "core/hle/service/time/standard_network_system_clock_core.h" -#include "core/hle/service/time/standard_steady_clock_core.h" -#include "core/hle/service/time/standard_user_system_clock_core.h" -#include "core/hle/service/time/time_sharedmemory.h" -#include "core/hle/service/time/time_zone_content_manager.h" +#include "service/time/clock_types.h" +#include "service/time/standard_local_system_clock_core.h" +#include "service/time/standard_network_system_clock_core.h" +#include "service/time/standard_steady_clock_core.h" +#include "service/time/standard_user_system_clock_core.h" +#include "service/time/time_sharedmemory.h" +#include "service/time/time_zone_content_manager.h" namespace Service::Time { diff --git a/src/core/hle/service/time/time_sharedmemory.cpp b/src/service/time/time_sharedmemory.cpp similarity index 93% rename from src/core/hle/service/time/time_sharedmemory.cpp rename to src/service/time/time_sharedmemory.cpp index a00676669b..620b71219c 100644 --- a/src/core/hle/service/time/time_sharedmemory.cpp +++ b/src/service/time/time_sharedmemory.cpp @@ -4,10 +4,10 @@ #include "core/core.h" #include "core/core_timing.h" #include "core/hardware_properties.h" -#include "core/hle/kernel/kernel.h" -#include "core/hle/service/time/clock_types.h" -#include "core/hle/service/time/steady_clock_core.h" -#include "core/hle/service/time/time_sharedmemory.h" +#include "kernel/kernel.h" +#include "service/time/clock_types.h" +#include "service/time/steady_clock_core.h" +#include "service/time/time_sharedmemory.h" namespace Service::Time { diff --git a/src/core/hle/service/time/time_sharedmemory.h b/src/service/time/time_sharedmemory.h similarity index 96% rename from src/core/hle/service/time/time_sharedmemory.h rename to src/service/time/time_sharedmemory.h index c89be97651..e0141cd2c7 100644 --- a/src/core/hle/service/time/time_sharedmemory.h +++ b/src/service/time/time_sharedmemory.h @@ -5,8 +5,8 @@ #include "common/common_types.h" #include "common/uuid.h" -#include "core/hle/kernel/k_shared_memory.h" -#include "core/hle/service/time/clock_types.h" +#include "kernel/k_shared_memory.h" +#include "service/time/clock_types.h" namespace Service::Time { diff --git a/src/core/hle/service/time/time_zone_content_manager.cpp b/src/service/time/time_zone_content_manager.cpp similarity index 95% rename from src/core/hle/service/time/time_zone_content_manager.cpp rename to src/service/time/time_zone_content_manager.cpp index 1b96de37a2..b1df9251d6 100644 --- a/src/core/hle/service/time/time_zone_content_manager.cpp +++ b/src/service/time/time_zone_content_manager.cpp @@ -16,11 +16,11 @@ #include "core/file_sys/system_archive/system_archive.h" #include "core/file_sys/vfs.h" #include "core/file_sys/vfs_types.h" -#include "core/hle/result.h" -#include "core/hle/service/filesystem/filesystem.h" -#include "core/hle/service/time/errors.h" -#include "core/hle/service/time/time_manager.h" -#include "core/hle/service/time/time_zone_content_manager.h" +#include "core/result.h" +#include "service/filesystem/filesystem.h" +#include "service/time/errors.h" +#include "service/time/time_manager.h" +#include "service/time/time_zone_content_manager.h" namespace Service::Time::TimeZone { diff --git a/src/core/hle/service/time/time_zone_content_manager.h b/src/service/time/time_zone_content_manager.h similarity index 95% rename from src/core/hle/service/time/time_zone_content_manager.h rename to src/service/time/time_zone_content_manager.h index a6f9698bc9..51b43cc3d7 100644 --- a/src/core/hle/service/time/time_zone_content_manager.h +++ b/src/service/time/time_zone_content_manager.h @@ -7,7 +7,7 @@ #include #include "core/file_sys/vfs_types.h" -#include "core/hle/service/time/time_zone_manager.h" +#include "service/time/time_zone_manager.h" namespace Core { class System; diff --git a/src/core/hle/service/time/time_zone_manager.cpp b/src/service/time/time_zone_manager.cpp similarity index 99% rename from src/core/hle/service/time/time_zone_manager.cpp rename to src/service/time/time_zone_manager.cpp index 205371a263..4d9cd3fa75 100644 --- a/src/core/hle/service/time/time_zone_manager.cpp +++ b/src/service/time/time_zone_manager.cpp @@ -9,8 +9,8 @@ #include "core/file_sys/content_archive.h" #include "core/file_sys/nca_metadata.h" #include "core/file_sys/registered_cache.h" -#include "core/hle/service/time/time_zone_manager.h" -#include "core/hle/service/time/time_zone_types.h" +#include "service/time/time_zone_manager.h" +#include "service/time/time_zone_types.h" namespace Service::Time::TimeZone { diff --git a/src/core/hle/service/time/time_zone_manager.h b/src/service/time/time_zone_manager.h similarity index 95% rename from src/core/hle/service/time/time_zone_manager.h rename to src/service/time/time_zone_manager.h index 8664f28d15..bfcc6142d5 100644 --- a/src/core/hle/service/time/time_zone_manager.h +++ b/src/service/time/time_zone_manager.h @@ -7,8 +7,8 @@ #include "common/common_types.h" #include "core/file_sys/vfs_types.h" -#include "core/hle/service/time/clock_types.h" -#include "core/hle/service/time/time_zone_types.h" +#include "service/time/clock_types.h" +#include "service/time/time_zone_types.h" namespace Service::Time::TimeZone { diff --git a/src/core/hle/service/time/time_zone_service.cpp b/src/service/time/time_zone_service.cpp similarity index 97% rename from src/core/hle/service/time/time_zone_service.cpp rename to src/service/time/time_zone_service.cpp index 8171c82a5b..d7fabe76e1 100644 --- a/src/core/hle/service/time/time_zone_service.cpp +++ b/src/service/time/time_zone_service.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/time/time_zone_content_manager.h" -#include "core/hle/service/time/time_zone_service.h" -#include "core/hle/service/time/time_zone_types.h" +#include "service/ipc_helpers.h" +#include "service/time/time_zone_content_manager.h" +#include "service/time/time_zone_service.h" +#include "service/time/time_zone_types.h" namespace Service::Time { diff --git a/src/core/hle/service/time/time_zone_service.h b/src/service/time/time_zone_service.h similarity index 96% rename from src/core/hle/service/time/time_zone_service.h rename to src/service/time/time_zone_service.h index 952fcb0e25..89cab50459 100644 --- a/src/core/hle/service/time/time_zone_service.h +++ b/src/service/time/time_zone_service.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/time/time_zone_types.h b/src/service/time/time_zone_types.h similarity index 100% rename from src/core/hle/service/time/time_zone_types.h rename to src/service/time/time_zone_types.h diff --git a/src/core/hle/service/usb/usb.cpp b/src/service/usb/usb.cpp similarity index 97% rename from src/core/hle/service/usb/usb.cpp rename to src/service/usb/usb.cpp index f29fff1dd5..fc40930086 100644 --- a/src/core/hle/service/usb/usb.cpp +++ b/src/service/usb/usb.cpp @@ -4,10 +4,10 @@ #include #include "common/logging/log.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" -#include "core/hle/service/usb/usb.h" +#include "service/ipc_helpers.h" +#include "service/server_manager.h" +#include "service/service.h" +#include "service/usb/usb.h" namespace Service::USB { diff --git a/src/core/hle/service/usb/usb.h b/src/service/usb/usb.h similarity index 100% rename from src/core/hle/service/usb/usb.h rename to src/service/usb/usb.h diff --git a/src/core/hle/service/vi/display/vi_display.cpp b/src/service/vi/display/vi_display.cpp similarity index 84% rename from src/core/hle/service/vi/display/vi_display.cpp rename to src/service/vi/display/vi_display.cpp index f0b5eff8af..148d6f1c2a 100644 --- a/src/core/hle/service/vi/display/vi_display.cpp +++ b/src/service/vi/display/vi_display.cpp @@ -8,18 +8,18 @@ #include "common/assert.h" #include "core/core.h" -#include "core/hle/kernel/k_event.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/nvdrv/core/container.h" -#include "core/hle/service/nvnflinger/buffer_item_consumer.h" -#include "core/hle/service/nvnflinger/buffer_queue_consumer.h" -#include "core/hle/service/nvnflinger/buffer_queue_core.h" -#include "core/hle/service/nvnflinger/buffer_queue_producer.h" -#include "core/hle/service/nvnflinger/hos_binder_driver_server.h" -#include "core/hle/service/vi/display/vi_display.h" -#include "core/hle/service/vi/layer/vi_layer.h" -#include "core/hle/service/vi/vi_results.h" +#include "kernel/k_event.h" +#include "kernel/k_readable_event.h" +#include "service/kernel_helpers.h" +#include "service/nvdrv/core/container.h" +#include "service/nvnflinger/buffer_item_consumer.h" +#include "service/nvnflinger/buffer_queue_consumer.h" +#include "service/nvnflinger/buffer_queue_core.h" +#include "service/nvnflinger/buffer_queue_producer.h" +#include "service/nvnflinger/hos_binder_driver_server.h" +#include "service/vi/display/vi_display.h" +#include "service/vi/layer/vi_layer.h" +#include "service/vi/vi_results.h" namespace Service::VI { diff --git a/src/core/hle/service/vi/display/vi_display.h b/src/service/vi/display/vi_display.h similarity index 99% rename from src/core/hle/service/vi/display/vi_display.h rename to src/service/vi/display/vi_display.h index 101cbce20f..46de4bc61d 100644 --- a/src/core/hle/service/vi/display/vi_display.h +++ b/src/service/vi/display/vi_display.h @@ -9,7 +9,7 @@ #include "common/common_funcs.h" #include "common/common_types.h" -#include "core/hle/result.h" +#include "core/result.h" namespace Kernel { class KEvent; diff --git a/src/core/hle/service/vi/layer/vi_layer.cpp b/src/service/vi/layer/vi_layer.cpp similarity index 92% rename from src/core/hle/service/vi/layer/vi_layer.cpp rename to src/service/vi/layer/vi_layer.cpp index 9ae2e0e440..c357585a7f 100644 --- a/src/core/hle/service/vi/layer/vi_layer.cpp +++ b/src/service/vi/layer/vi_layer.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "core/hle/service/vi/layer/vi_layer.h" +#include "service/vi/layer/vi_layer.h" namespace Service::VI { diff --git a/src/core/hle/service/vi/layer/vi_layer.h b/src/service/vi/layer/vi_layer.h similarity index 100% rename from src/core/hle/service/vi/layer/vi_layer.h rename to src/service/vi/layer/vi_layer.h diff --git a/src/core/hle/service/vi/vi.cpp b/src/service/vi/vi.cpp similarity index 97% rename from src/core/hle/service/vi/vi.cpp rename to src/service/vi/vi.cpp index b1bfb98982..c5d6b3a8c9 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/service/vi/vi.cpp @@ -17,25 +17,25 @@ #include "common/settings.h" #include "common/swap.h" #include "core/core_timing.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/service/ipc_helpers.h" -#include "core/hle/service/nvdrv/devices/nvmap.h" -#include "core/hle/service/nvdrv/nvdata.h" -#include "core/hle/service/nvdrv/nvdrv.h" -#include "core/hle/service/nvnflinger/binder.h" -#include "core/hle/service/nvnflinger/buffer_queue_producer.h" -#include "core/hle/service/nvnflinger/fb_share_buffer_manager.h" -#include "core/hle/service/nvnflinger/hos_binder_driver_server.h" -#include "core/hle/service/nvnflinger/nvnflinger.h" -#include "core/hle/service/nvnflinger/parcel.h" -#include "core/hle/service/server_manager.h" -#include "core/hle/service/service.h" -#include "core/hle/service/vi/vi.h" -#include "core/hle/service/vi/vi_m.h" -#include "core/hle/service/vi/vi_results.h" -#include "core/hle/service/vi/vi_s.h" -#include "core/hle/service/vi/vi_u.h" +#include "kernel/k_readable_event.h" +#include "kernel/k_thread.h" +#include "service/ipc_helpers.h" +#include "service/nvdrv/devices/nvmap.h" +#include "service/nvdrv/nvdata.h" +#include "service/nvdrv/nvdrv.h" +#include "service/nvnflinger/binder.h" +#include "service/nvnflinger/buffer_queue_producer.h" +#include "service/nvnflinger/fb_share_buffer_manager.h" +#include "service/nvnflinger/hos_binder_driver_server.h" +#include "service/nvnflinger/nvnflinger.h" +#include "service/nvnflinger/parcel.h" +#include "service/server_manager.h" +#include "service/service.h" +#include "service/vi/vi.h" +#include "service/vi/vi_m.h" +#include "service/vi/vi_results.h" +#include "service/vi/vi_s.h" +#include "service/vi/vi_u.h" namespace Service::VI { diff --git a/src/core/hle/service/vi/vi.h b/src/service/vi/vi.h similarity index 100% rename from src/core/hle/service/vi/vi.h rename to src/service/vi/vi.h diff --git a/src/core/hle/service/vi/vi_m.cpp b/src/service/vi/vi_m.cpp similarity index 94% rename from src/core/hle/service/vi/vi_m.cpp rename to src/service/vi/vi_m.cpp index 0f06dc2f36..bd043b32c2 100644 --- a/src/core/hle/service/vi/vi_m.cpp +++ b/src/service/vi/vi_m.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/service/vi/vi.h" -#include "core/hle/service/vi/vi_m.h" +#include "service/vi/vi.h" +#include "service/vi/vi_m.h" namespace Service::VI { diff --git a/src/core/hle/service/vi/vi_m.h b/src/service/vi/vi_m.h similarity index 95% rename from src/core/hle/service/vi/vi_m.h rename to src/service/vi/vi_m.h index 9ca6f39051..5eb90a897d 100644 --- a/src/core/hle/service/vi/vi_m.h +++ b/src/service/vi/vi_m.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/vi/vi_results.h b/src/service/vi/vi_results.h similarity index 93% rename from src/core/hle/service/vi/vi_results.h rename to src/service/vi/vi_results.h index 22bac799f0..012ddf80ae 100644 --- a/src/core/hle/service/vi/vi_results.h +++ b/src/service/vi/vi_results.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/result.h" +#include "core/result.h" namespace Service::VI { diff --git a/src/core/hle/service/vi/vi_s.cpp b/src/service/vi/vi_s.cpp similarity index 93% rename from src/core/hle/service/vi/vi_s.cpp rename to src/service/vi/vi_s.cpp index 77f7a88ff6..e44d524213 100644 --- a/src/core/hle/service/vi/vi_s.cpp +++ b/src/service/vi/vi_s.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/service/vi/vi.h" -#include "core/hle/service/vi/vi_s.h" +#include "service/vi/vi.h" +#include "service/vi/vi_s.h" namespace Service::VI { diff --git a/src/core/hle/service/vi/vi_s.h b/src/service/vi/vi_s.h similarity index 95% rename from src/core/hle/service/vi/vi_s.h rename to src/service/vi/vi_s.h index 157839c914..9ac5a2fd6e 100644 --- a/src/core/hle/service/vi/vi_s.h +++ b/src/service/vi/vi_s.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/core/hle/service/vi/vi_u.cpp b/src/service/vi/vi_u.cpp similarity index 93% rename from src/core/hle/service/vi/vi_u.cpp rename to src/service/vi/vi_u.cpp index 59e13c86bd..a2705ce17f 100644 --- a/src/core/hle/service/vi/vi_u.cpp +++ b/src/service/vi/vi_u.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "common/logging/log.h" -#include "core/hle/service/vi/vi.h" -#include "core/hle/service/vi/vi_u.h" +#include "service/vi/vi.h" +#include "service/vi/vi_u.h" namespace Service::VI { diff --git a/src/core/hle/service/vi/vi_u.h b/src/service/vi/vi_u.h similarity index 95% rename from src/core/hle/service/vi/vi_u.h rename to src/service/vi/vi_u.h index 5d9ca54c66..cfc1ed79bc 100644 --- a/src/core/hle/service/vi/vi_u.h +++ b/src/service/vi/vi_u.h @@ -3,7 +3,7 @@ #pragma once -#include "core/hle/service/service.h" +#include "service/service.h" namespace Core { class System; diff --git a/src/video_core/framebuffer_config.h b/src/video_core/framebuffer_config.h index 5f3bffcab2..b4293c3767 100644 --- a/src/video_core/framebuffer_config.h +++ b/src/video_core/framebuffer_config.h @@ -5,8 +5,8 @@ #include "common/common_types.h" #include "common/math_util.h" -#include "core/hle/service/nvnflinger/buffer_transform_flags.h" -#include "core/hle/service/nvnflinger/pixel_format.h" +#include "service/nvnflinger/buffer_transform_flags.h" +#include "service/nvnflinger/pixel_format.h" namespace Tegra { diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp index 11549d448f..750f4308c4 100644 --- a/src/video_core/gpu.cpp +++ b/src/video_core/gpu.cpp @@ -15,8 +15,8 @@ #include "core/core_timing.h" #include "core/frontend/emu_window.h" #include "core/frontend/graphics_context.h" -#include "core/hle/service/nvdrv/nvdata.h" #include "core/perf_stats.h" +#include "service/nvdrv/nvdata.h" #include "video_core/cdma_pusher.h" #include "video_core/control/channel_state.h" #include "video_core/control/scheduler.h" diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h index ba2838b894..2f97c40ee3 100644 --- a/src/video_core/gpu.h +++ b/src/video_core/gpu.h @@ -7,7 +7,7 @@ #include "common/bit_field.h" #include "common/common_types.h" -#include "core/hle/service/nvdrv/nvdata.h" +#include "service/nvdrv/nvdata.h" #include "video_core/cdma_pusher.h" #include "video_core/framebuffer_config.h" #include "video_core/rasterizer_download_area.h" diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index d160406138..320cddbc8b 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp @@ -8,8 +8,8 @@ #include "common/logging/log.h" #include "core/core.h" #include "core/device_memory.h" -#include "core/hle/kernel/k_page_table.h" -#include "core/hle/kernel/k_process.h" +#include "kernel/k_page_table.h" +#include "kernel/k_process.h" #include "video_core/invalidation_accumulator.h" #include "video_core/memory_manager.h" #include "video_core/rasterizer_interface.h" diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 33e1fb6639..80a900e3ac 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -344,7 +344,7 @@ endif() create_target_directory_groups(yuzu) -target_link_libraries(yuzu PRIVATE common core input_common network video_core) +target_link_libraries(yuzu PRIVATE common core input_common kernel network service video_core) target_link_libraries(yuzu PRIVATE Boost::headers glad Qt${QT_MAJOR_VERSION}::Widgets) target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) diff --git a/src/yuzu/applets/qt_amiibo_settings.cpp b/src/yuzu/applets/qt_amiibo_settings.cpp index b457a736ab..8feeb0cd33 100644 --- a/src/yuzu/applets/qt_amiibo_settings.cpp +++ b/src/yuzu/applets/qt_amiibo_settings.cpp @@ -8,10 +8,10 @@ #include "common/assert.h" #include "common/string_util.h" -#include "core/hle/service/nfc/common/device.h" -#include "core/hle/service/nfp/nfp_result.h" #include "input_common/drivers/virtual_amiibo.h" #include "input_common/main.h" +#include "service/nfc/common/device.h" +#include "service/nfp/nfp_result.h" #include "ui_qt_amiibo_settings.h" #ifdef ENABLE_WEB_SERVICE #include "web_service/web_backend.h" diff --git a/src/yuzu/applets/qt_controller.cpp b/src/yuzu/applets/qt_controller.cpp index 515cb7ce6e..6aada2bcea 100644 --- a/src/yuzu/applets/qt_controller.cpp +++ b/src/yuzu/applets/qt_controller.cpp @@ -12,9 +12,9 @@ #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" #include "core/hid/hid_types.h" -#include "core/hle/service/hid/controllers/npad.h" -#include "core/hle/service/hid/hid.h" -#include "core/hle/service/sm/sm.h" +#include "service/hid/controllers/npad.h" +#include "service/hid/hid.h" +#include "service/sm/sm.h" #include "ui_qt_controller.h" #include "yuzu/applets/qt_controller.h" #include "yuzu/configuration/configure_input.h" diff --git a/src/yuzu/applets/qt_profile_select.h b/src/yuzu/applets/qt_profile_select.h index 99056e274b..03ab66602d 100644 --- a/src/yuzu/applets/qt_profile_select.h +++ b/src/yuzu/applets/qt_profile_select.h @@ -7,7 +7,7 @@ #include #include #include "core/frontend/applets/profile_select.h" -#include "core/hle/service/acc/profile_manager.h" +#include "service/acc/profile_manager.h" class ControllerNavigation; class GMainWindow; diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 42bbb29641..d70596c784 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -11,10 +11,10 @@ #include "common/settings_common.h" #include "common/settings_enums.h" #include "core/core.h" -#include "core/hle/service/acc/profile_manager.h" -#include "core/hle/service/hid/controllers/npad.h" #include "input_common/main.h" #include "network/network.h" +#include "service/acc/profile_manager.h" +#include "service/hid/controllers/npad.h" #include "yuzu/configuration/config.h" namespace FS = Common::FS; diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp index 02e23cce67..909fb09726 100644 --- a/src/yuzu/configuration/configure_input.cpp +++ b/src/yuzu/configuration/configure_input.cpp @@ -9,10 +9,10 @@ #include "core/core.h" #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" -#include "core/hle/service/am/am.h" -#include "core/hle/service/am/applet_ae.h" -#include "core/hle/service/am/applet_oe.h" -#include "core/hle/service/sm/sm.h" +#include "service/am/am.h" +#include "service/am/applet_ae.h" +#include "service/am/applet_oe.h" +#include "service/sm/sm.h" #include "ui_configure_input.h" #include "ui_configure_input_advanced.h" #include "ui_configure_input_player.h" diff --git a/src/yuzu/configuration/configure_profile_manager.cpp b/src/yuzu/configuration/configure_profile_manager.cpp index 6d2219bf50..d41e3c787f 100644 --- a/src/yuzu/configuration/configure_profile_manager.cpp +++ b/src/yuzu/configuration/configure_profile_manager.cpp @@ -16,7 +16,7 @@ #include "common/settings.h" #include "common/string_util.h" #include "core/core.h" -#include "core/hle/service/acc/profile_manager.h" +#include "service/acc/profile_manager.h" #include "ui_configure_profile_manager.h" #include "yuzu/configuration/configure_profile_manager.h" #include "yuzu/util/limitable_input_dialog.h" diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index 0c8e5c8b4a..45bdfee737 100644 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp @@ -14,7 +14,7 @@ #include #include "common/settings.h" #include "core/core.h" -#include "core/hle/service/time/time_manager.h" +#include "service/time/time_manager.h" #include "ui_configure_system.h" #include "yuzu/configuration/config.h" #include "yuzu/configuration/configuration_shared.h" diff --git a/src/yuzu/debugger/wait_tree.cpp b/src/yuzu/debugger/wait_tree.cpp index 7049c57b6e..cea227cac1 100644 --- a/src/yuzu/debugger/wait_tree.cpp +++ b/src/yuzu/debugger/wait_tree.cpp @@ -9,16 +9,16 @@ #include "core/arm/arm_interface.h" #include "core/core.h" -#include "core/hle/kernel/k_class_token.h" -#include "core/hle/kernel/k_handle_table.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/kernel/k_readable_event.h" -#include "core/hle/kernel/k_scheduler.h" -#include "core/hle/kernel/k_synchronization_object.h" -#include "core/hle/kernel/k_thread.h" -#include "core/hle/kernel/svc_common.h" -#include "core/hle/kernel/svc_types.h" #include "core/memory.h" +#include "kernel/k_class_token.h" +#include "kernel/k_handle_table.h" +#include "kernel/k_process.h" +#include "kernel/k_readable_event.h" +#include "kernel/k_scheduler.h" +#include "kernel/k_synchronization_object.h" +#include "kernel/k_thread.h" +#include "kernel/svc_common.h" +#include "kernel/svc_types.h" namespace { diff --git a/src/yuzu/debugger/wait_tree.h b/src/yuzu/debugger/wait_tree.h index 23c329fbe8..948b36b667 100644 --- a/src/yuzu/debugger/wait_tree.h +++ b/src/yuzu/debugger/wait_tree.h @@ -11,8 +11,8 @@ #include #include "common/common_types.h" -#include "core/hle/kernel/k_auto_object.h" -#include "core/hle/kernel/svc_common.h" +#include "kernel/k_auto_object.h" +#include "kernel/svc_common.h" class EmuThread; diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index f077d7f9cd..9289747d46 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -42,10 +42,10 @@ #include "core/frontend/applets/software_keyboard.h" #include "core/hid/emulated_controller.h" #include "core/hid/hid_core.h" -#include "core/hle/service/acc/profile_manager.h" -#include "core/hle/service/am/applet_ae.h" -#include "core/hle/service/am/applet_oe.h" -#include "core/hle/service/am/applets/applets.h" +#include "service/acc/profile_manager.h" +#include "service/am/applet_ae.h" +#include "service/am/applet_oe.h" +#include "service/am/applets/applets.h" #include "yuzu/multiplayer/state.h" #include "yuzu/util/controller_navigation.h" @@ -120,16 +120,16 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual #include "core/file_sys/romfs.h" #include "core/file_sys/savedata_factory.h" #include "core/file_sys/submission_package.h" -#include "core/hle/kernel/k_process.h" -#include "core/hle/service/am/am.h" -#include "core/hle/service/filesystem/filesystem.h" -#include "core/hle/service/sm/sm.h" #include "core/loader/loader.h" #include "core/perf_stats.h" #include "core/telemetry_session.h" #include "input_common/drivers/tas_input.h" #include "input_common/drivers/virtual_amiibo.h" #include "input_common/main.h" +#include "kernel/k_process.h" +#include "service/am/am.h" +#include "service/filesystem/filesystem.h" +#include "service/sm/sm.h" #include "ui_main.h" #include "util/overlay_dialog.h" #include "video_core/gpu.h" diff --git a/src/yuzu/multiplayer/lobby.cpp b/src/yuzu/multiplayer/lobby.cpp index 603e9ae3de..b8e5488946 100644 --- a/src/yuzu/multiplayer/lobby.cpp +++ b/src/yuzu/multiplayer/lobby.cpp @@ -7,9 +7,9 @@ #include "common/logging/log.h" #include "common/settings.h" #include "core/core.h" -#include "core/hle/service/acc/profile_manager.h" #include "core/internal_network/network_interface.h" #include "network/network.h" +#include "service/acc/profile_manager.h" #include "ui_lobby.h" #include "yuzu/game_list_p.h" #include "yuzu/main.h" diff --git a/src/yuzu/play_time_manager.cpp b/src/yuzu/play_time_manager.cpp index 155c36b7d1..1e03ebf180 100644 --- a/src/yuzu/play_time_manager.cpp +++ b/src/yuzu/play_time_manager.cpp @@ -8,7 +8,7 @@ #include "common/logging/log.h" #include "common/settings.h" #include "common/thread.h" -#include "core/hle/service/acc/profile_manager.h" +#include "service/acc/profile_manager.h" #include "yuzu/play_time_manager.h" namespace PlayTime { diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 0d25ff4001..f9f4d03f8b 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -11,8 +11,8 @@ #include "common/fs/path_util.h" #include "common/logging/log.h" #include "common/settings.h" -#include "core/hle/service/acc/profile_manager.h" #include "input_common/main.h" +#include "service/acc/profile_manager.h" #include "yuzu_cmd/config.h" #include "yuzu_cmd/default_ini.h" diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 087cfaa26e..933f06300b 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp @@ -26,11 +26,11 @@ #include "core/crypto/key_manager.h" #include "core/file_sys/registered_cache.h" #include "core/file_sys/vfs_real.h" -#include "core/hle/service/filesystem/filesystem.h" #include "core/loader/loader.h" #include "core/telemetry_session.h" #include "input_common/main.h" #include "network/network.h" +#include "service/filesystem/filesystem.h" #include "video_core/renderer_base.h" #include "yuzu_cmd/config.h" #include "yuzu_cmd/emu_window/emu_window_sdl2.h"