Fix Include Order

This commit fixes the include order of files throughout the code-base to be compliant with the new guidelines.
This commit is contained in:
◱ PixelyIon 2020-03-26 20:03:19 +05:30 committed by ◱ PixelyIon
parent d19c3b222e
commit a60ab89c5d
22 changed files with 32 additions and 28 deletions

View File

@ -1,8 +1,8 @@
#include <csignal>
#include <unistd.h>
#include "skyline/common.h"
#include "skyline/os.h"
#include "skyline/jvm.h"
#include <unistd.h>
#include <csignal>
bool Halt;
jobject Surface;

View File

@ -1,8 +1,8 @@
#pragma once
#include <forward_list>
#include <common.h>
#include "types/KObject.h"
#include <forward_list>
namespace skyline {
namespace memory {

View File

@ -1,5 +1,5 @@
#include "svc.h"
#include <os.h>
#include "svc.h"
namespace skyline::kernel::svc {
void SetHeapSize(DeviceState &state) {

View File

@ -1,7 +1,7 @@
#pragma once
#include "ipc.h"
#include <common.h>
#include "ipc.h"
namespace skyline {
namespace constant::infoState {

View File

@ -1,9 +1,9 @@
#include "KPrivateMemory.h"
#include "KProcess.h"
#include <os.h>
#include <android/sharedmem.h>
#include <asm/unistd.h>
#include <unistd.h>
#include <os.h>
#include "KPrivateMemory.h"
#include "KProcess.h"
namespace skyline::kernel::type {
KPrivateMemory::KPrivateMemory(const DeviceState &state, u64 address, size_t size, memory::Permission permission, const memory::MemoryState memState) : size(size), KMemory(state, KType::KPrivateMemory) {

View File

@ -1,11 +1,11 @@
#include "KProcess.h"
#include <nce.h>
#include <os.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/uio.h>
#include <asm/unistd.h>
#include <nce/guest.h>
#include <nce.h>
#include <os.h>
#include "KProcess.h"
namespace skyline::kernel::type {
KProcess::TlsPage::TlsPage(u64 address) : address(address) {}

View File

@ -1,13 +1,13 @@
#pragma once
#include <list>
#include <kernel/memory.h>
#include "KThread.h"
#include "KPrivateMemory.h"
#include "KTransferMemory.h"
#include "KSharedMemory.h"
#include "KSession.h"
#include "KEvent.h"
#include <kernel/memory.h>
#include <list>
namespace skyline {
namespace constant {

View File

@ -1,9 +1,9 @@
#include "KSharedMemory.h"
#include "KProcess.h"
#include <os.h>
#include <android/sharedmem.h>
#include <unistd.h>
#include <asm/unistd.h>
#include <os.h>
#include "KSharedMemory.h"
#include "KProcess.h"
namespace skyline::kernel::type {
KSharedMemory::KSharedMemory(const DeviceState &state, u64 address, size_t size, const memory::Permission permission, memory::MemoryState memState, int mmapFlags) : initialState(memState), KMemory(state, KType::KSharedMemory) {

View File

@ -1,7 +1,7 @@
#include <sys/resource.h>
#include <nce.h>
#include "KThread.h"
#include "KProcess.h"
#include <nce.h>
namespace skyline::kernel::type {
KThread::KThread(const DeviceState &state, KHandle handle, pid_t selfPid, u64 entryPoint, u64 entryArg, u64 stackTop, u64 tls, u8 priority, KProcess *parent, std::shared_ptr<type::KSharedMemory> &tlsMemory) : handle(handle), pid(selfPid), entryPoint(entryPoint), entryArg(entryArg), stackTop(stackTop), tls(tls), priority(priority), parent(parent), ctxMemory(tlsMemory), KSyncObject(state, KType::KThread) {

View File

@ -1,7 +1,7 @@
#include "KTransferMemory.h"
#include <asm/unistd.h>
#include <nce.h>
#include <os.h>
#include <asm/unistd.h>
#include "KTransferMemory.h"
namespace skyline::kernel::type {
KTransferMemory::KTransferMemory(const DeviceState &state, bool host, u64 address, size_t size, const memory::Permission permission, memory::MemoryState memState) : host(host), size(size), KMemory(state, KType::KTransferMemory) {

View File

@ -1,8 +1,8 @@
#pragma once
#include <unistd.h>
#include <os.h>
#include <kernel/types/KProcess.h>
#include <unistd.h>
namespace skyline::loader {
class Loader {

View File

@ -1,5 +1,7 @@
#pragma once
#include "guest_common.h"
namespace skyline {
namespace guest {
constexpr size_t SaveCtxSize = 20 * sizeof(u32); //!< The size of the SaveCtx function in 32-bit ARMv8 instructions

View File

@ -1,7 +1,7 @@
#pragma once
#include <sys/mman.h>
#include <thread>
#include <sys/mman.h>
#include "common.h"
#include "kernel/ipc.h"
#include "kernel/types/KProcess.h"

View File

@ -1,6 +1,7 @@
#pragma once
#include <common.h>
namespace skyline {
namespace constant {
constexpr u32 SupportedRevision = 7; //!< The audren revision our implementation supports

View File

@ -1,6 +1,6 @@
#include "parcel.h"
#include <os.h>
#include <kernel/types/KProcess.h>
#include "parcel.h"
namespace skyline::service {
Parcel::Parcel(kernel::ipc::InputBuffer &buffer, const DeviceState &state, bool hasToken) : Parcel(buffer.address, buffer.size, state, hasToken) {}

View File

@ -3,6 +3,7 @@
#include <kernel/types/KProcess.h>
#include <services/base_service.h>
#include <services/serviceman.h>
namespace skyline {
namespace constant {
constexpr auto HidSharedMemSize = 0x40000; //!< The size of HID Shared Memory (https://switchbrew.org/wiki/HID_Shared_Memory)

View File

@ -1,9 +1,9 @@
#include "INvDrvServices.h"
#include <kernel/types/KProcess.h>
#include "devices/nvhost_ctrl.h"
#include "devices/nvhost_ctrl_gpu.h"
#include "devices/nvhost_channel.h"
#include "devices/nvhost_as_gpu.h"
#include "INvDrvServices.h"
namespace skyline::service::nvdrv {
u32 INvDrvServices::OpenDevice(const std::string &path) {

View File

@ -51,7 +51,7 @@ namespace skyline::service::nvdrv::device {
{"/dev/nvhost-as-gpu", NvDeviceType::nvhost_as_gpu},
{"/dev/nvhost-dbg-gpu", NvDeviceType::nvhost_dbg_gpu},
{"/dev/nvhost-prof-gpu", NvDeviceType::nvhost_prof_gpu},
{"/dev/nvhost-ctrl-gpu", NvDeviceType::nvhost_ctrl_gpu}
{"/dev/nvhost-ctrl-gpu", NvDeviceType::nvhost_ctrl_gpu},
};
/**

View File

@ -1,5 +1,5 @@
#include "nvhost_channel.h"
#include <kernel/types/KProcess.h>
#include "nvhost_channel.h"
namespace skyline::service::nvdrv::device {
NvHostChannel::NvHostChannel(const DeviceState &state, NvDeviceType type) : NvDevice(state, type, {

View File

@ -1,5 +1,5 @@
#include "nvhost_ctrl_gpu.h"
#include <kernel/types/KProcess.h>
#include "nvhost_ctrl_gpu.h"
namespace skyline::service::nvdrv::device {
NvHostCtrlGpu::NvHostCtrlGpu(const DeviceState &state) : NvDevice(state, NvDeviceType::nvhost_ctrl_gpu, {

View File

@ -1,5 +1,5 @@
#include "nvmap.h"
#include <kernel/types/KProcess.h>
#include "nvmap.h"
namespace skyline::service::nvdrv::device {
NvMap::NvMapObject::NvMapObject(u32 id, u32 size) : id(id), size(size) {}

View File

@ -1,5 +1,5 @@
#include "IManagerRootService.h"
#include <kernel/types/KProcess.h>
#include "IManagerRootService.h"
#include "IApplicationDisplayService.h"
namespace skyline::service::visrv {