added config file handling (saving console and game aspect ratio for now)

Author: Vincent-FK

chip/Makefile

@@ -8,7 +8,7 @@ CC        = $(CROSS_COMPILE)-gcc
 
 OBJS      = chip.o main.o menu.o cpu.o memory.o video.o input.o sound.o gui.o \
             cheats.o zip.o cpu_threaded.o arm_stub.o video_blend.o warm.o \
-            upscale_aspect.o neon_scaler.o
+            upscale_aspect.o neon_scaler.o configfile.o
 BIN       = gpsp
 
 # Platform specific definitions 

input.c

@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "menu.h"
+#include "configfile.h"
 #include "video.h"
 
 // Special thanks to psp298 for the analog->dpad code!
@@ -943,6 +944,9 @@ u32 update_input()
           if (fp == NULL) {
             printf("Failed to run command %s\n", shell_cmd);
           }
+
+          // Save config file
+          configfile_save(cfg_file_rom);
         }
         /// --- Aspect ratio increase ---
         else if(event.key.keysym.sym == SDLK_i)
@@ -964,6 +968,9 @@ u32 update_input()
           if (fp == NULL) {
             printf("Failed to run command %s\n", shell_cmd);
           }
+
+          // Save config file
+          configfile_save(cfg_file_rom);
         }
         /// --- Change display mode ---
         else if(event.key.keysym.sym == SDLK_h)
@@ -987,6 +994,9 @@ u32 update_input()
           if (fp == NULL) {
             printf("Failed to run command %s\n", shell_cmd);
           }
+
+          // Save config file
+          configfile_save(cfg_file_rom);
         }
         else if(event.key.keysym.sym == SDLK_BACKQUOTE)
         {

main.c

@@ -18,8 +18,10 @@
  */
 
 #include <signal.h>
+#include <ini.h>
 #include "common.h"
 #include "menu.h"
+#include "configfile.h"
 #include "video.h"
 
 #define BIOS_PATH "/mnt/Game Boy Advance"
@@ -101,6 +103,11 @@ static char *quick_save_file_extension = "quicksave";
 char *mRomName = NULL;
 char *mRomPath = NULL;
 char *quick_save_file = NULL;
+char *console_name;
+char *cfg_file_default = NULL;
+char *cfg_file_rom = NULL;
+static char *cfg_file_default_name = "default_config";
+static char *cfg_file_extension = "cfg";
 u32 mQuickSaveAndPoweroff=0;
 
 
@@ -333,7 +340,7 @@ void parse_cmd_line(int argc, char *argv[])
         *slash = 0;
 
         /* Rom name without extension */
-        char *point = strrchr ((char*)slash+1, '.');
+        char *point = strrchr((char*)slash+1, '.');
         *point = 0;
 
         /* Set quicksave filename */
@@ -343,6 +350,25 @@ void parse_cmd_line(int argc, char *argv[])
           mRomPath, slash+1, quick_save_file_extension);
         printf("Quick_save_file: %s\n", quick_save_file);
 
+        /* Set rom cfg filepath */
+        cfg_file_rom = (char *)malloc(strlen(mRomPath) + strlen(slash+1) +
+          strlen(cfg_file_extension) + 2 + 1);
+        sprintf(cfg_file_rom, "%s/%s.%s",
+          mRomPath, slash+1, cfg_file_extension);
+        printf("cfg_file_rom: %s\n", cfg_file_rom);
+
+        /* Set console cfg filepath */
+        cfg_file_default = (char *)malloc(strlen(mRomPath) + strlen(cfg_file_default_name) +
+          strlen(cfg_file_extension) + 2 + 1);
+        sprintf(cfg_file_default, "%s/%s.%s",
+          mRomPath, cfg_file_default_name, cfg_file_extension);
+        printf("cfg_file_default: %s\n", cfg_file_default);
+
+        /** Load config files */
+        configfile_load(cfg_file_default);
+        configfile_load(cfg_file_rom);
+
+
         fclose(f);
         break;
       }

menu.c

@@ -10,12 +10,14 @@
 #include <SDL/SDL.h>
 #include <SDL/SDL_ttf.h>
 #include <SDL/SDL_image.h>
+#include <ini.h>
 
 #include "common.h"
 #include "main.h"
 #include "menu.h"
 #include "gui.h"
 #include "video.h"
+#include "configfile.h"
 
 
 /// -------------- DEFINES --------------
@@ -103,13 +105,6 @@ static uint16_t y_brightness_bar = 0;
 int volume_percentage = 0;
 int brightness_percentage = 0;
 
-#undef X
-#define X(a, b) b,
-const char *aspect_ratio_name[] = {ASPECT_RATIOS};
-int aspect_ratio = ASPECT_RATIOS_TYPE_STRETCHED;
-int aspect_ratio_factor_percent = 50;
-int aspect_ratio_factor_step = 10;
-
 static int quick_load_slot_chosen = 0;
 
 #undef X
@@ -767,8 +762,12 @@ void run_menu_loop()
                         else if(idx_menus[menuItem] == MENU_TYPE_ASPECT_RATIO){
                             MENU_DEBUG_PRINTF("Aspect Ratio DOWN\n");
                             aspect_ratio = (!aspect_ratio)?(NB_ASPECT_RATIOS_TYPES-1):(aspect_ratio-1);
+                            
                             /// ------ Refresh screen ------
                             screen_refresh = 1;
+
+                            // Save config file
+                            configfile_save(cfg_file_rom);
                         }
                         break;
 
@@ -834,8 +833,12 @@ void run_menu_loop()
                         else if(idx_menus[menuItem] == MENU_TYPE_ASPECT_RATIO){
                             MENU_DEBUG_PRINTF("Aspect Ratio UP\n");
                             aspect_ratio = (aspect_ratio+1)%NB_ASPECT_RATIOS_TYPES;
+                            
                             /// ------ Refresh screen ------
                             screen_refresh = 1;
+
+                            // Save config file
+                            configfile_save(cfg_file_rom);
                         }
                         break;
 

menu.h

@@ -19,20 +19,6 @@ typedef enum{
     NB_MENU_TYPES,
 } ENUM_MENU_TYPE;
 
-
-///------ Definition of the different aspect ratios
-#define ASPECT_RATIOS \
-    X(ASPECT_RATIOS_TYPE_MANUAL, "MANUAL ZOOM") \
-    X(ASPECT_RATIOS_TYPE_STRETCHED, "STRETCHED") \
-    X(ASPECT_RATIOS_TYPE_CROPPED, "CROPPED") \
-    X(ASPECT_RATIOS_TYPE_SCALED, "SCALED") \
-    X(NB_ASPECT_RATIOS_TYPES, "")
-
-////------ Enumeration of the different aspect ratios ------
-#undef X
-#define X(a, b) a,
-typedef enum {ASPECT_RATIOS} ENUM_ASPECT_RATIOS_TYPES;
-
 ///------ Definition of the different resume options
 #define RESUME_OPTIONS \
     X(RESUME_YES, "RESUME GAME") \
@@ -67,13 +53,10 @@ typedef enum {RESUME_OPTIONS} ENUM_RESUME_OPTIONS;
 extern int volume_percentage;
 extern int brightness_percentage;
 
-extern const char *aspect_ratio_name[];
-extern int aspect_ratio;
-extern int aspect_ratio_factor_percent;
-extern int aspect_ratio_factor_step;
 extern int stop_menu_loop;
 extern char *mRomName;
 extern char *mRomPath;
+extern char *cfg_file_rom;
 extern char *quick_save_file;
 
 #endif //MENU_H

video.c

@@ -22,6 +22,7 @@
 #define WANT_FONT_BITS
 #include "font.h"
 #include "menu.h"
+#include "configfile.h"
 
 #ifdef CHIP_BUILD
 #include "arm/neon_scaler.h"