summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/src/core.h33
-rw-r--r--src/core/src/hw/hw.cpp26
-rw-r--r--src/core/src/hw/hw.h28
-rw-r--r--src/core/src/hw/hw_lcd.cpp26
-rw-r--r--src/core/src/hw/hw_lcd.h26
-rw-r--r--src/core/src/loader.cpp26
-rw-r--r--src/core/src/loader.h31
-rw-r--r--src/core/src/mem_map.cpp28
-rw-r--r--src/core/src/mem_map.h35
-rw-r--r--src/core/src/mem_map_funcs.cpp26
-rw-r--r--src/core/src/system.cpp26
-rw-r--r--src/core/src/system.h36
12 files changed, 44 insertions, 303 deletions
diff --git a/src/core/src/core.h b/src/core/src/core.h
index a71e4ed8d..bae9f3e3d 100644
--- a/src/core/src/core.h
+++ b/src/core/src/core.h
@@ -1,29 +1,8 @@
1/** 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2013 Citrus Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file core.h
5 * @author ShizZy <shizzy247@gmail.com>
6 * @date 2013-09-04
7 * @brief Core of emulator
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24 4
25#ifndef CORE_CORE_H_ 5#pragma once
26#define CORE_CORE_H_
27 6
28#include "arm/arm_interface.h" 7#include "arm/arm_interface.h"
29#include "arm/interpreter/armdefs.h" 8#include "arm/interpreter/armdefs.h"
@@ -59,7 +38,3 @@ int Init();
59void Shutdown(); 38void Shutdown();
60 39
61} // namespace 40} // namespace
62
63////////////////////////////////////////////////////////////////////////////////////////////////////
64
65#endif // CORE_CORE_H_
diff --git a/src/core/src/hw/hw.cpp b/src/core/src/hw/hw.cpp
index 50001c87a..57be4d6a8 100644
--- a/src/core/src/hw/hw.cpp
+++ b/src/core/src/hw/hw.cpp
@@ -1,26 +1,6 @@
1/** 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2013 Citrus Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file hw.cpp
5 * @author bunnei
6 * @date 2014-04-04
7 * @brief Hardware interface
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24 4
25#include "log.h" 5#include "log.h"
26#include "hw/hw.h" 6#include "hw/hw.h"
diff --git a/src/core/src/hw/hw.h b/src/core/src/hw/hw.h
index 245822423..5b0cc8c87 100644
--- a/src/core/src/hw/hw.h
+++ b/src/core/src/hw/hw.h
@@ -1,26 +1,8 @@
1/** 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2013 Citrus Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file hw.h 4
5 * @author bunnei 5#pragma once
6 * @date 2014-04-04
7 * @brief Hardware interface
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24 6
25#include "common_types.h" 7#include "common_types.h"
26 8
diff --git a/src/core/src/hw/hw_lcd.cpp b/src/core/src/hw/hw_lcd.cpp
index ee806d5dc..ad346c794 100644
--- a/src/core/src/hw/hw_lcd.cpp
+++ b/src/core/src/hw/hw_lcd.cpp
@@ -1,26 +1,6 @@
1/** 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2013 Citrus Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file hw_lcd.cpp
5 * @author bunnei
6 * @date 2014-04-05
7 * @brief Hardware LCD interface
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24 4
25#include "log.h" 5#include "log.h"
26#include "core.h" 6#include "core.h"
diff --git a/src/core/src/hw/hw_lcd.h b/src/core/src/hw/hw_lcd.h
index fa19b1cd4..30e347ccb 100644
--- a/src/core/src/hw/hw_lcd.h
+++ b/src/core/src/hw/hw_lcd.h
@@ -1,26 +1,6 @@
1/** 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2013 Citrus Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file hw_lcd.h
5 * @author bunnei
6 * @date 2014-04-05
7 * @brief Hardware LCD interface
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24 4
25#pragma once 5#pragma once
26 6
diff --git a/src/core/src/loader.cpp b/src/core/src/loader.cpp
index 71ace20c4..5d039dc94 100644
--- a/src/core/src/loader.cpp
+++ b/src/core/src/loader.cpp
@@ -1,26 +1,6 @@
1/** 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2013 Citrus Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file loader.cpp
5 * @author ShizZy <shizzy247@gmail.com>
6 * @date 2013-09-18
7 * @brief Loads bootable binaries into the emu
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24 4
25#include "file_util.h" 5#include "file_util.h"
26#include "loader.h" 6#include "loader.h"
diff --git a/src/core/src/loader.h b/src/core/src/loader.h
index adad3e734..46525fcf8 100644
--- a/src/core/src/loader.h
+++ b/src/core/src/loader.h
@@ -1,29 +1,8 @@
1/** 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2013 Citrus Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file loader.h
5 * @author ShizZy <shizzy247@gmail.com>
6 * @date 2013-09-18
7 * @brief Loads bootable binaries into the emu
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24 4
25#ifndef CORE_LOADER_H_ 5#pragma once
26#define CORE_LOADER_H_
27 6
28#include "common.h" 7#include "common.h"
29 8
@@ -70,5 +49,3 @@ FileType IdentifyFile(std::string &filename);
70bool LoadFile(std::string &filename, std::string *error_string); 49bool LoadFile(std::string &filename, std::string *error_string);
71 50
72} // namespace 51} // namespace
73
74#endif // CORE_LOADER_H_ \ No newline at end of file
diff --git a/src/core/src/mem_map.cpp b/src/core/src/mem_map.cpp
index 6477499d5..96f77d32e 100644
--- a/src/core/src/mem_map.cpp
+++ b/src/core/src/mem_map.cpp
@@ -1,26 +1,6 @@
1/** 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2014 Citra Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file mem_map.cpp
5 * @author ShizZy <shizzy247@gmail.com>
6 * @date 2013-09-05
7 * @brief Memory map - handles virtual to physical memory access
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24 4
25#include "common.h" 5#include "common.h"
26#include "mem_arena.h" 6#include "mem_arena.h"
@@ -100,6 +80,4 @@ void Shutdown() {
100 NOTICE_LOG(MEMMAP, "Memory system shut down."); 80 NOTICE_LOG(MEMMAP, "Memory system shut down.");
101} 81}
102 82
103
104
105} // namespace 83} // namespace
diff --git a/src/core/src/mem_map.h b/src/core/src/mem_map.h
index e880503d2..ad5abd16d 100644
--- a/src/core/src/mem_map.h
+++ b/src/core/src/mem_map.h
@@ -1,29 +1,8 @@
1/** 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2014 Citra Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file mem_map.h 4
5 * @author ShizZy <shizzy247@gmail.com> 5#pragma once
6 * @date 2013-09-05
7 * @brief Memory map - handles virtual to physical memory access
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24
25#ifndef CORE_MEM_MAP_H_
26#define CORE_MEM_MAP_H_
27 6
28//////////////////////////////////////////////////////////////////////////////////////////////////// 7////////////////////////////////////////////////////////////////////////////////////////////////////
29 8
@@ -92,7 +71,3 @@ void Write32(const u32 addr, const u32 data);
92u8* GetPointer(const u32 Address); 71u8* GetPointer(const u32 Address);
93 72
94} // namespace 73} // namespace
95
96////////////////////////////////////////////////////////////////////////////////////////////////////
97
98#endif // CORE_MEM_MAP_H_ \ No newline at end of file
diff --git a/src/core/src/mem_map_funcs.cpp b/src/core/src/mem_map_funcs.cpp
index ee2f79278..7d8ae2915 100644
--- a/src/core/src/mem_map_funcs.cpp
+++ b/src/core/src/mem_map_funcs.cpp
@@ -1,26 +1,6 @@
1/** 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2014 Citra Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file mem_map_funcs.cpp
5 * @author ShizZy <shizzy247@gmail.com>
6 * @date 2013-09-18
7 * @brief Memory map R/W functions
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24 4
25#include "common.h" 5#include "common.h"
26 6
diff --git a/src/core/src/system.cpp b/src/core/src/system.cpp
index 7c829d609..1fc272d70 100644
--- a/src/core/src/system.cpp
+++ b/src/core/src/system.cpp
@@ -1,26 +1,6 @@
1/** 1// Copyright 2014 Citra Emulator Project
2* Copyright (C) 2013 Citrus Emulator 2// Licensed under GPLv2
3* 3// Refer to the license.txt file included.
4* @file system.cpp
5* @author ShizZy <shizzy247@gmail.com>
6* @date 2013-09-26
7* @brief Emulation of main system
8*
9* @section LICENSE
10* This program is free software; you can redistribute it and/or
11* modify it under the terms of the GNU General Public License as
12* published by the Free Software Foundation; either version 2 of
13* the License, or (at your option) any later version.
14*
15* This program is distributed in the hope that it will be useful, but
16* WITHOUT ANY WARRANTY; without even the implied warranty of
17* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18* General Public License for more details at
19* http://www.gnu.org/copyleft/gpl.html
20*
21* Official project repository can be found at:
22* http://code.google.com/p/gekko-gc-emu/
23*/
24 4
25#include "core.h" 5#include "core.h"
26#include "hw/hw.h" 6#include "hw/hw.h"
diff --git a/src/core/src/system.h b/src/core/src/system.h
index e05413d86..8e94e5252 100644
--- a/src/core/src/system.h
+++ b/src/core/src/system.h
@@ -1,29 +1,8 @@
1/** 1// Copyright 2014 Citra Emulator Project
2 * Copyright (C) 2013 Citrus Emulator 2// Licensed under GPLv2
3 * 3// Refer to the license.txt file included.
4 * @file system.h 4
5 * @author ShizZy <shizzy247@gmail.com> 5#pragma once
6 * @date 2013-09-26
7 * @brief Emulation of main system
8 *
9 * @section LICENSE
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful, but
16 * WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * General Public License for more details at
19 * http://www.gnu.org/copyleft/gpl.html
20 *
21 * Official project repository can be found at:
22 * http://code.google.com/p/gekko-gc-emu/
23 */
24
25#ifndef CORE_SYSTEM_H_
26#define CORE_SYSTEM_H_
27 6
28#include "emu_window.h" 7#include "emu_window.h"
29#include "file_sys/meta_file_system.h" 8#include "file_sys/meta_file_system.h"
@@ -54,8 +33,3 @@ void RunLoopUntil(u64 global_cycles);
54void Shutdown(); 33void Shutdown();
55 34
56}; 35};
57
58////////////////////////////////////////////////////////////////////////////////////////////////////
59
60#endif // CORE_SYSTEM_H_
61 \ No newline at end of file
HIC SVNT DRACONES