Added: Configuration of Keyboard and Gamepad by GUI.

Author: DPRCZ

gui.c

@@ -75,6 +75,10 @@ typedef enum
   CURSOR_NONE
 } gui_action_type;
 
+#ifdef RPI_BUILD
+extern u32 menu_hotkey;
+#endif
+
 void init_input();
 u32 update_input();
 gui_action_type get_gui_input();
@@ -83,6 +87,7 @@ void input_write_mem_savestate(file_tag_type savestate_file);
 void input_read_savestate(file_tag_type savestate_file);
 
 extern u32 gamepad_config_map[];
+extern u32 keyboard_config_map[];
 extern u32 global_enable_analog;
 extern u32 analog_sensitivity_level;
 

input.c

@@ -20,7 +20,7 @@ CFLAGS     += -DARM_ARCH -DRPI_BUILD -Wall
 CFLAGS     += -O3 -mfpu=vfp
 CFLAGS     += `sdl-config --cflags`
 CFLAGS     += -I$(SDKSTAGE)/opt/vc/include -I$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads
-CFLAGS     += -I/opt/vc/include/interface/vmcs_host/linux
+CFLAGS     += -I$(SDKSTAGE)/opt/vc/include/interface/vmcs_host/linux
 
 # expecting to have PATH set up to get correct sdl-config first
 

input.h

@@ -1,26 +1,26 @@
-/*
-
-This file is based on Portable ZX-Spectrum emulator.
-Copyright (C) 2001-2012 SMT, Dexus, Alone Coder, deathsoft, djdron, scor
-	
-C++ to C code conversion by Pate
-
-Modified by DPR for gpsp for Raspberry Pi
-
-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 3 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, see <http://www.gnu.org/licenses/>.
-
-*/
+/*
+ * 
+ * This file is based on Portable ZX-Spectrum emulator.
+ * Copyright (C) 2001-2012 SMT, Dexus, Alone Coder, deathsoft, djdron, scor
+ *	
+ * C++ to C code conversion by Pate
+ * 
+ * Modified by DPR for gpsp for Raspberry Pi
+ * 
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ * 
+ */
 
 #include "bcm_host.h"
 #include "GLES/gl.h"
@@ -57,16 +57,8 @@ static const char* fragment_shader =
 	"void main()											\n"
 	"{														\n"
 	"	gl_FragColor = texture2D(u_texture, v_texcoord);	\n"
-	"}														\n";
-/*
-static const GLfloat vertices[] =
-{
-	-0.5f, -0.5f, 0.0f,
-	+0.5f, -0.5f, 0.0f,
-	+0.5f, +0.5f, 0.0f,
-	-0.5f, +0.5f, 0.0f,
-};
-*/
+	"}														\n";
+
 static const GLfloat vertices[] =
 {
 	-0.5f, -0.5f, 0.0f,
@@ -259,8 +251,6 @@ void video_init(uint32_t _width, uint32_t _height, uint32_t filter)
 
 	frame_width = _width;
 	frame_height = _height;
-	
-	//bcm_host_init();
 
 	// get an EGL display connection
 	display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
@@ -364,7 +354,6 @@ static void SetOrtho(GLfloat m[4][4], GLfloat left, GLfloat right, GLfloat botto
 	m[3][2] = -(far + near)/(far - near);
 	m[3][3] = 1;
 }
-#define RGB15(r, g, b)  (((r) << (5+6)) | ((g) << 6) | (b))
 
 static void gles2_Draw( uint16_t *pixels)
 {
@@ -375,7 +364,7 @@ static void gles2_Draw( uint16_t *pixels)
 
 	glUseProgram(shader.program);
 
-        glBindTexture(GL_TEXTURE_2D, textures[0]);
+    glBindTexture(GL_TEXTURE_2D, textures[0]);
 	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, frame_width, frame_height, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, pixels);
 	glActiveTexture(GL_TEXTURE0);
 	glUniform1i(shader.u_texture, 0);
@@ -397,13 +386,11 @@ static void gles2_Draw( uint16_t *pixels)
 
 	glBindBuffer(GL_ARRAY_BUFFER, 0);
 	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-	//glFlush();
 }
 
 void video_close()
 {
 	gles2_destroy();
-	// Release OpenGL resources
 	eglMakeCurrent( display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT );
 	eglDestroySurface( display, surface );
 	eglDestroyContext( display, context );

raspberrypi/Makefile

@@ -1,26 +1,26 @@
 /*
-
-This file is based on Portable ZX-Spectrum emulator.
-Copyright (C) 2001-2012 SMT, Dexus, Alone Coder, deathsoft, djdron, scor
-	
-C++ to C code conversion by Pate
-
-Modified by DPR for gpsp for Raspberry Pi
-
-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 3 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, see <http://www.gnu.org/licenses/>.
-
-*/
+ * 
+ * This file is based on Portable ZX-Spectrum emulator.
+ * Copyright (C) 2001-2012 SMT, Dexus, Alone Coder, deathsoft, djdron, scor
+ *	
+ * C++ to C code conversion by Pate
+ * 
+ * Modified by DPR for gpsp for Raspberry Pi
+ * 
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ * 
+ */
 
 void video_init(uint32_t width,uint32_t height,uint32_t filter);
 void video_close();