flodavid/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

fixed licensing issue with core_timing being GPL v2+ instead of Dolphin's GPL v2

Browse source
This commit is contained in:
bunnei 2014-04-08 19:11:21 -04:00
parent ef7cfa0207
commit 3dc3bd5627
2 changed files with 444 additions and 476 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/core/src/core_timing.cpp
View file

@ -1,20 +1,6 @@
// Copyright (c) 2012- PPSSPP Project / Dolphin Project. // Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// This program is free software: you can redistribute it and/or modify // Refer to the license.txt file included.
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, version 2.0 or later versions.
// 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 2.0 for more details.
// A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include <vector> #include <vector>
#include <cstdio> #include <cstdio>
@ -26,8 +12,6 @@
#include "core.h" #include "core.h"
#include "chunk_file.h" #include "chunk_file.h"
//#include "HLE/sceKernelThread.h"
int g_clock_rate_arm11 = 268123480; int g_clock_rate_arm11 = 268123480;
// is this really necessary? // is this really necessary?

28
src/core/src/core_timing.h
View file

@ -1,22 +1,8 @@
// Copyright (c) 2012- PPSSPP Project / Dolphin Project. // Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.
// This program is free software: you can redistribute it and/or modify #pragma once
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, version 2.0 or later versions.
// 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 2.0 for more details.
// A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#ifndef CORE_CORE_TIMING_H_
#define CORE_CORE_TIMING_H_
// This is a system to schedule events into the emulated machine's future. Time is measured // This is a system to schedule events into the emulated machine's future. Time is measured
// in main CPU clock cycles. // in main CPU clock cycles.
@ -69,8 +55,8 @@ inline s64 cyclesToUs(s64 cycles) {
return cycles / (g_clock_rate_arm11 / 1000000); return cycles / (g_clock_rate_arm11 / 1000000);
} }
namespace CoreTiming namespace CoreTiming {
{
void Init(); void Init();
void Shutdown(); void Shutdown();
@ -121,5 +107,3 @@ namespace CoreTiming
extern int slicelength; extern int slicelength;
}; // namespace }; // namespace
#endif // CORE_CORE_TIMING_H_