ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(PS3) Get rid of ps3_input.h

This commit is contained in:
twinaphex 2013-11-13 00:41:03 +01:00
parent aec049c803
commit d87c20feee
4 changed files with 25 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/platform/platform_ps3.c
View File

@ -17,7 +17,6 @@
#include <sys/process.h> #include <sys/process.h>
#include "../../ps3/sdk_defines.h" #include "../../ps3/sdk_defines.h"
#include "../../ps3/ps3_input.h"
#include "../menu/menu_common.h" #include "../menu/menu_common.h"
#include "../../console/rarch_console.h" #include "../../console/rarch_console.h"

5
general.h
View File

@ -49,11 +49,6 @@
#endif #endif
// Platform-specific headers // Platform-specific headers
// PS3
#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
#include "ps3/ps3_input.h"
#endif
// Windows // Windows
#ifdef _WIN32 #ifdef _WIN32
#ifdef _XBOX #ifdef _XBOX

26
ps3/ps3_input.c
View File

@ -22,10 +22,11 @@
#endif #endif
#include <sys/memory.h> #include <sys/memory.h>
#include <stdbool.h>
#include <wchar.h>
#include "sdk_defines.h" #include "sdk_defines.h"
#include "ps3_input.h"
#include "../driver.h" #include "../driver.h"
#include "../libretro.h" #include "../libretro.h"
#include "../general.h" #include "../general.h"
@ -36,6 +37,29 @@
#endif #endif
#endif #endif
#ifndef __PSL1GHT__
#define MAX_PADS 7
#endif
#define DEADZONE_LOW 55
#define DEADZONE_HIGH 210
#ifdef HAVE_OSK
typedef struct ps3_osk
{
unsigned int osk_memorycontainer;
wchar_t init_message[CELL_OSKDIALOG_STRING_SIZE + 1];
wchar_t message[CELL_OSKDIALOG_STRING_SIZE + 1];
wchar_t text_buf[CELL_OSKDIALOG_STRING_SIZE + 1];
uint32_t flags;
sys_memory_container_t containerid;
CellOskDialogPoint pos;
CellOskDialogInputFieldInfo inputFieldInfo;
CellOskDialogCallbackReturnParam outputInfo;
CellOskDialogParam dialogParam;
} ps3_osk_t;
#endif
/*============================================================ /*============================================================
PS3 PAD PS3 PAD
============================================================ */ ============================================================ */

53
ps3/ps3_input.h
View File

@ -1,53 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2013 - Hans-Kristian Arntzen
* Copyright (C) 2011-2013 - Daniel De Matteis
*
* RetroArch 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 Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch 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 RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _PS3_INPUT_H_
#define _PS3_INPUT_H_
#include <stdbool.h>
#include <wchar.h>
#include "sdk_defines.h"
#ifndef __PSL1GHT__
#define MAX_PADS 7
#endif
#define DEADZONE_LOW 55
#define DEADZONE_HIGH 210
#ifdef HAVE_OSK
typedef struct ps3_osk
{
unsigned int osk_memorycontainer;
wchar_t init_message[CELL_OSKDIALOG_STRING_SIZE + 1];
wchar_t message[CELL_OSKDIALOG_STRING_SIZE + 1];
wchar_t text_buf[CELL_OSKDIALOG_STRING_SIZE + 1];
uint32_t flags;
sys_memory_container_t containerid;
CellOskDialogPoint pos;
CellOskDialogInputFieldInfo inputFieldInfo;
CellOskDialogCallbackReturnParam outputInfo;
CellOskDialogParam dialogParam;
} ps3_osk_t;
void oskutil_write_message(void *params, const void* msg);
void oskutil_write_initial_message(void *params, const void* msg);
void *oskutil_init(unsigned containersize);
void oskutil_free(void *data);
#endif
#endif