From cc41003e1cec5ccf4d09a8f8dea4bc51ca4659ab Mon Sep 17 00:00:00 2001
From: TuxSH <tuxsh@sfr.fr>
Date: Thu, 15 Jun 2017 01:53:34 +0200
Subject: [PATCH] Fix exheader.h

---
 sysmodules/loader/source/exheader.h    |   2 +-
 sysmodules/rosalina/include/exheader.h | 127 +------------------------
 2 files changed, 2 insertions(+), 127 deletions(-)

diff --git a/sysmodules/loader/source/exheader.h b/sysmodules/loader/source/exheader.h
index 811ff1f..2d6b27e 100755
--- a/sysmodules/loader/source/exheader.h
+++ b/sysmodules/loader/source/exheader.h
@@ -53,7 +53,7 @@ typedef struct
 typedef struct
 {
     u64 programid;
-    u32 coreversion;
+    u32 firm;
     u8 flags[3];
     u8 priority;
     u16 resourcelimitdescriptor[0x10];
diff --git a/sysmodules/rosalina/include/exheader.h b/sysmodules/rosalina/include/exheader.h
index 7fc2f28..e926338 100644
--- a/sysmodules/rosalina/include/exheader.h
+++ b/sysmodules/rosalina/include/exheader.h
@@ -1,127 +1,2 @@
-/*
-*   This file is part of Luma3DS
-*   Copyright (C) 2016-2017 Aurora Wright, TuxSH
-*
-*   This program is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   This program is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
-*       * Requiring preservation of specified reasonable legal notices or
-*         author attributions in that material or in the Appropriate Legal
-*         Notices displayed by works containing it.
-*       * Prohibiting misrepresentation of the origin of that material,
-*         or requiring that modified versions of such material be marked in
-*         reasonable ways as different from the original version.
-*/
-
-/* File written by fincs */
-
 #pragma once
-
-#include <3ds/types.h>
-
-typedef struct
-{
-    u8 reserved[5];
-    u8 flag;
-    u8 remasterversion[2];
-} PACKED exheader_systeminfoflags;
-
-typedef struct
-{
-    u32 address;
-    u32 nummaxpages;
-    u32 codesize;
-} PACKED exheader_codesegmentinfo;
-
-typedef struct
-{
-    u8 name[8];
-    exheader_systeminfoflags flags;
-    exheader_codesegmentinfo text;
-    u8 stacksize[4];
-    exheader_codesegmentinfo ro;
-    u8 reserved[4];
-    exheader_codesegmentinfo data;
-    u32 bsssize;
-} PACKED exheader_codesetinfo;
-
-typedef struct
-{
-    u64 programid[0x30];
-} PACKED exheader_dependencylist;
-
-typedef struct
-{
-    u8 savedatasize[4];
-    u8 reserved[4];
-    u8 jumpid[8];
-    u8 reserved2[0x30];
-} PACKED exheader_systeminfo;
-
-typedef struct
-{
-    u8 extsavedataid[8];
-    u8 systemsavedataid[8];
-    u8 reserved[8];
-    u8 accessinfo[7];
-    u8 otherattributes;
-} PACKED exheader_storageinfo;
-
-typedef struct
-{
-    u64 programid;
-    u32 firm;
-    u8 flags[3];
-    u8 priority;
-    u16 resourcelimitdescriptor[0x10];
-    exheader_storageinfo storageinfo;
-    u64 serviceaccesscontrol[0x20];
-    u8 reserved[0x1f];
-    u8 resourcelimitcategory;
-} PACKED exheader_arm11systemlocalcaps;
-
-typedef struct
-{
-    u32 descriptors[28];
-    u8 reserved[0x10];
-} PACKED exheader_arm11kernelcapabilities;
-
-typedef struct
-{
-    u8 descriptors[15];
-    u8 descversion;
-} PACKED exheader_arm9accesscontrol;
-
-typedef struct
-{
-    // systemcontrol info {
-    //   coreinfo {
-    exheader_codesetinfo codesetinfo;
-    exheader_dependencylist deplist;
-    //   }
-    exheader_systeminfo systeminfo;
-    // }
-    // accesscontrolinfo {
-    exheader_arm11systemlocalcaps arm11systemlocalcaps;
-    exheader_arm11kernelcapabilities arm11kernelcaps;
-    exheader_arm9accesscontrol arm9accesscontrol;
-    // }
-    struct {
-        u8 signature[0x100];
-        u8 ncchpubkeymodulus[0x100];
-        exheader_arm11systemlocalcaps arm11systemlocalcaps;
-        exheader_arm11kernelcapabilities arm11kernelcaps;
-        exheader_arm9accesscontrol arm9accesscontrol;
-    } PACKED accessdesc;
-} PACKED exheader_header;
+#include "../../loader/source/exheader.h"