sh2 overclock and logging stuff, menu refactoring

[libpicofe.git] / common / menu.h

diff --git a/common/menu.h b/common/menu.h
index 83cb9c2..74bf8e6 100644 (file)
--- a/common/menu.h
+++ b/common/menu.h
@@ -8,6 +8,7 @@ typedef enum
        MB_OPT_CUSTOM,          /* custom value */
        MB_OPT_CUSTONOFF,
        MB_OPT_CUSTRANGE,
+       MB_OPT_ENUM,
 } menu_behavior;
 
 typedef enum
@@ -18,7 +19,6 @@ typedef enum
        MA_MAIN_LOAD_STATE,
        MA_MAIN_RESET_GAME,
        MA_MAIN_LOAD_ROM,
-       MA_MAIN_OPTIONS,
        MA_MAIN_CONTROLS,
        MA_MAIN_CREDITS,
        MA_MAIN_PATCHES,
@@ -88,6 +88,8 @@ typedef enum
        MA_32XOPT_ENABLE_32X,
        MA_32XOPT_RENDERER,
        MA_32XOPT_PWM,
+       MA_32XOPT_MSH2_CYCLES,
+       MA_32XOPT_SSH2_CYCLES,
        MA_CTRL_PLAYER1,
        MA_CTRL_PLAYER2,
        MA_CTRL_EMU,
@@ -111,40 +113,57 @@ typedef struct
        int selectable:1;
        int (*handler)(menu_id id, int keys);
        const char * (*generate_name)(menu_id id, int *offs);
+       const void *data;
+       const char *help;
 } menu_entry;
 
 #define mee_handler_id(name, id, handler) \
-       { name, MB_NONE, id, NULL, 0, 0, 0, 1, 0, 1, handler, NULL }
+       { name, MB_NONE, id, NULL, 0, 0, 0, 1, 0, 1, handler, NULL, NULL, NULL }
 
 #define mee_handler(name, handler) \
        mee_handler_id(name, MA_NONE, handler)
 
-#define mee_handler_mkname_id(id, handler, name_func) \
-       { "", MB_NONE, id, NULL, 0, 0, 0, 1, 0, 1, handler, name_func }
-
 #define mee_label(name) \
-       { name, MB_NONE, MA_NONE, NULL, 0, 0, 0, 1, 0, 0, NULL, NULL }
+       { name, MB_NONE, MA_NONE, NULL, 0, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL }
 
 #define mee_label_mk(id, name_func) \
-       { "", MB_NONE, id, NULL, 0, 0, 0, 1, 0, 0, NULL, name_func }
+       { "", MB_NONE, id, NULL, 0, 0, 0, 1, 0, 0, NULL, name_func, NULL, NULL }
+
+#define mee_onoff_h(name, id, var, mask, help) \
+       { name, MB_OPT_ONOFF, id, &(var), mask, 0, 0, 1, 1, 1, NULL, NULL, NULL, help }
 
 #define mee_onoff(name, id, var, mask) \
-       { name, MB_OPT_ONOFF, id, &(var), mask, 0, 0, 1, 1, 1, NULL, NULL }
+       mee_onoff_h(name, id, var, mask, NULL)
 
 #define mee_range(name, id, var, min, max) \
-       { name, MB_OPT_RANGE, id, &(var), 0, min, max, 1, 1, 1, NULL, NULL }
+       { name, MB_OPT_RANGE, id, &(var), 0, min, max, 1, 1, 1, NULL, NULL, NULL, NULL }
+
+#define mee_cust_s_h(name, id, need_save, handler, name_func, help) \
+       { name, MB_OPT_CUSTOM, id, NULL, 0, 0, 0, 1, need_save, 1, handler, name_func, NULL, help }
+
+#define mee_cust_h(name, id, handler, name_func, help) \
+       mee_cust_s_h(name, id, 1, handler, name_func, help)
 
 #define mee_cust(name, id, handler, name_func) \
-       { name, MB_OPT_CUSTOM, id, NULL, 0, 0, 0, 1, 1, 1, handler, name_func }
+       mee_cust_h(name, id, handler, name_func, NULL)
+
+#define mee_cust_nosave(name, id, handler, name_func) \
+       mee_cust_s_h(name, id, 0, handler, name_func, NULL)
 
 #define mee_onoff_cust(name, id, var, mask, name_func) \
-       { name, MB_OPT_CUSTONOFF, id, &(var), mask, 0, 0, 1, 1, 1, NULL, name_func }
+       { name, MB_OPT_CUSTONOFF, id, &(var), mask, 0, 0, 1, 1, 1, NULL, name_func, NULL, NULL }
 
 #define mee_range_cust(name, id, var, min, max, name_func) \
-       { name, MB_OPT_CUSTRANGE, id, &(var), 0, min, max, 1, 1, 1, NULL, name_func }
+       { name, MB_OPT_CUSTRANGE, id, &(var), 0, min, max, 1, 1, 1, NULL, name_func, NULL, NULL }
+
+#define mee_enum_h(name, id, var, names_list, help) \
+       { name, MB_OPT_ENUM, id, &(var), 0, 0, 0, 1, 1, 1, NULL, NULL, names_list, help }
+
+#define mee_enum(name, id, var, names_list) \
+       mee_enum_h(name, id, var, names_list, NULL)
 
 #define mee_end \
-       { NULL, 0, 0, NULL, 0, 0, 0, 0, 0, 0, NULL, NULL }
+       { NULL, 0, 0, NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL }
 
 typedef struct
 {