From aeb9c12f5d4734244b1c9a060927e6e727677db0 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sat, 25 Apr 2015 21:30:29 +0200 Subject: [PATCH] Removed "gp2x.h" header None of the definitions in it were used anymore. --- src/Makefile.am | 2 +- src/gmenu2x.cpp | 2 -- src/gp2x.h | 53 ------------------------------------------------- 3 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 src/gp2x.h diff --git a/src/Makefile.am b/src/Makefile.am index 8765200..97b95ad 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,7 +16,7 @@ gmenu2x_SOURCES = font.cpp cpu.cpp dirdialog.cpp filedialog.cpp \ helppopup.cpp contextmenu.cpp background.cpp battery.cpp noinst_HEADERS = font.h cpu.h dirdialog.h \ - filedialog.h filelister.h gmenu2x.h gp2x.h iconbutton.h imagedialog.h \ + filedialog.h filelister.h gmenu2x.h iconbutton.h imagedialog.h \ inputdialog.h inputmanager.h linkapp.h link.h \ menu.h menusettingbool.h menusettingdir.h \ menusettingfile.h menusetting.h menusettingimage.h menusettingint.h \ diff --git a/src/gmenu2x.cpp b/src/gmenu2x.cpp index 3963084..1393dc7 100644 --- a/src/gmenu2x.cpp +++ b/src/gmenu2x.cpp @@ -18,8 +18,6 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "gp2x.h" - #include "background.h" #include "cpu.h" #include "debug.h" diff --git a/src/gp2x.h b/src/gp2x.h deleted file mode 100644 index 3adb7d3..0000000 --- a/src/gp2x.h +++ /dev/null @@ -1,53 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2006 by Massimiliano Torromeo * - * massimiliano.torromeo@gmail.com * - * * - * This program 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 Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * 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 for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ - -#include - -#define GP2X_CLK_FREQ 7372800 - -#define GP2X_BUTTON_UP (0) -#define GP2X_BUTTON_DOWN (4) -#define GP2X_BUTTON_LEFT (2) -#define GP2X_BUTTON_RIGHT (6) -#define GP2X_BUTTON_UPLEFT (1) -#define GP2X_BUTTON_UPRIGHT (7) -#define GP2X_BUTTON_DOWNLEFT (3) -#define GP2X_BUTTON_DOWNRIGHT (5) -#define GP2X_BUTTON_CLICK (18) -#define GP2X_BUTTON_A (12) -#define GP2X_BUTTON_B (13) -#define GP2X_BUTTON_START (8) -#define GP2X_BUTTON_SELECT (9) -#define GP2X_BUTTON_VOLUP (16) -#define GP2X_BUTTON_VOLDOWN (17) - -#ifdef GP2X_OLDSDL_FIX - #define GP2X_BUTTON_X (15) - #define GP2X_BUTTON_Y (14) - #define GP2X_BUTTON_L (11) - #define GP2X_BUTTON_R (10) -#else - #define GP2X_BUTTON_X (14) - #define GP2X_BUTTON_Y (15) - #define GP2X_BUTTON_L (10) - #define GP2X_BUTTON_R (11) -#endif - -#define FBMMSP2CTRL 0x4619