diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c index debc16e72d..5806d2616e 100644 --- a/frontend/platform/platform_ps3.c +++ b/frontend/platform/platform_ps3.c @@ -17,7 +17,6 @@ #include #include "../../ps3/sdk_defines.h" -#include "../../ps3/ps3_input.h" #include "../menu/menu_common.h" #include "../../console/rarch_console.h" diff --git a/general.h b/general.h index 37eae77379..61c463c459 100644 --- a/general.h +++ b/general.h @@ -49,11 +49,6 @@ #endif // Platform-specific headers -// PS3 -#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) -#include "ps3/ps3_input.h" -#endif - // Windows #ifdef _WIN32 #ifdef _XBOX diff --git a/ps3/ps3_input.c b/ps3/ps3_input.c index bbf8b5ccde..55da08cc13 100644 --- a/ps3/ps3_input.c +++ b/ps3/ps3_input.c @@ -22,10 +22,11 @@ #endif #include +#include +#include #include "sdk_defines.h" -#include "ps3_input.h" #include "../driver.h" #include "../libretro.h" #include "../general.h" @@ -36,6 +37,29 @@ #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 ============================================================ */ diff --git a/ps3/ps3_input.h b/ps3/ps3_input.h deleted file mode 100644 index d8c9232466..0000000000 --- a/ps3/ps3_input.h +++ /dev/null @@ -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 . - */ - -#ifndef _PS3_INPUT_H_ -#define _PS3_INPUT_H_ - -#include -#include - -#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