piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix headings and more.

Browse Source
This commit is contained in:
Matthew Parlane
2013-08-28 00:57:08 +12:00
parent d493525050
commit 75c398118f
5 changed files with 29 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/Common/Src/SettingsHandler.cpp
View File

@ -1,19 +1,6 @@
// Copyright (C) 2003 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.
// 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 SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
// Thanks to Treeki for writing the original class - 29/01/2012 // Thanks to Treeki for writing the original class - 29/01/2012
@ -89,7 +76,7 @@ void SettingsHandler::Reset()
{ {
decoded = ""; decoded = "";
m_position = 0; m_position = 0;
m_key = 0x73B5DBFA; m_key = INITIAL_SEED;
memset(m_buffer, 0, SETTINGS_SIZE); memset(m_buffer, 0, SETTINGS_SIZE);
} }

23
Source/Core/Common/Src/SettingsHandler.h
View File

@ -1,19 +1,6 @@
// Copyright (C) 2003 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.
// 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 SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
// Thanks to Treeki for writing the original class - 29/01/2012 // Thanks to Treeki for writing the original class - 29/01/2012
@ -30,7 +17,9 @@ public:
enum enum
{ {
SETTINGS_SIZE = 0x100 SETTINGS_SIZE = 0x100,
// Key used to encrypt/decrypt setting.txt contents
INITIAL_SEED = 0x73B5DBFA
}; };
void AddSetting(const char *key, const char *value); void AddSetting(const char *key, const char *value);

18
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
View File

@ -136,15 +136,15 @@ private:
typedef struct ecc_cert_t typedef struct ecc_cert_t
{ {
u32 sig_type ; u32 sig_type ;
u8 sig [0x3c] ; u8 sig [0x3c];
u8 pad [0x40] ; u8 pad [0x40];
u8 issuer [0x40] ; u8 issuer [0x40];
u32 key_type ; u32 key_type ;
u8 key_name [0x40] ; u8 key_name [0x40];
u32 ng_key_id ; u32 ng_key_id ;
u8 ecc_pubkey [0x3c] ; u8 ecc_pubkey [0x3c];
u8 padding [0x3c] ; u8 padding [0x3c];
} ecc_cert_t; } ecc_cert_t;
}; };

19
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp
View File

@ -1,19 +1,6 @@
// Copyright (C) 2003 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.
// 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 SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#include "../Core.h" #include "../Core.h"
#include "../Debugger/Debugger_SymbolMap.h" #include "../Debugger/Debugger_SymbolMap.h"

24
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.h
View File

@ -1,21 +1,9 @@
// Copyright (C) 2003 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 #ifndef _WII_IPC_HLE_DEVICE_HID_H_
// it under the terms of the GNU General Public License as published by #define _WII_IPC_HLE_DEVICE_HID_H_
// the Free Software Foundation, version 2.0.
// 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 SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#pragma once
#include "WII_IPC_HLE.h" #include "WII_IPC_HLE.h"
#include "WII_IPC_HLE_Device.h" #include "WII_IPC_HLE_Device.h"
@ -149,3 +137,5 @@ private:
std::list<_hidevent> event_list; std::list<_hidevent> event_list;
}; };
#endif