usbjoy fix

git-svn-id: file:///home/notaz/opt/svn/fceu@155 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/drivers/gp2x/menu.c b/drivers/gp2x/menu.c
index 5cedc85..6abe009 100644 (file)
--- a/drivers/gp2x/menu.c
+++ b/drivers/gp2x/menu.c
@@ -731,15 +731,14 @@ static void unbind_action(int action)
                        Settings.JoyBinds[u][i] &= ~action;\r
 }\r
 \r
-static int count_bound_keys(int action, int is_joy)\r
+static int count_bound_keys(int action, int joy)\r
 {\r
-       int i, u, keys = 0;\r
+       int i, keys = 0;\r
 \r
-       if (is_joy)\r
+       if (joy)\r
        {\r
-               for (u = 0; u < 4; u++)\r
-                       for (i = 0; i < 32; i++)\r
-                               if (Settings.JoyBinds[u][i] & action) keys++;\r
+               for (i = 0; i < 32; i++)\r
+                       if (Settings.JoyBinds[joy-1][i] & action) keys++;\r
        }\r
        else\r
        {\r
@@ -824,7 +823,7 @@ static void key_config_loop(const bind_action_t *opts, int opt_cnt, int player_i
                {\r
                        for (i = 0; i < 32; i++)\r
                                if (inp & (1 << i)) {\r
-                                       if (count_bound_keys(opts[sel].mask, 1) >= 1) // disallow combos for usbjoy\r
+                                       if (count_bound_keys(opts[sel].mask, joy) >= 1) // disallow combos for usbjoy\r
                                             Settings.JoyBinds[joy-1][i] &= ~opts[sel].mask;\r
                                        else Settings.JoyBinds[joy-1][i] ^=  opts[sel].mask;\r
                                        if (player_idx >= 0) {\r

diff --git a/out_gp2x/readme.txt b/out_gp2x/readme.txt
index 6fe6845..ab085ee 100644 (file)
--- a/out_gp2x/readme.txt
+++ b/out_gp2x/readme.txt
@@ -175,11 +175,12 @@ with additional .fcm extension added. Examples:
 \r
 \r
 ver 0.4 (by notaz)\r
-  rev 154\r
+  rev 15x\r
           - Fixed savestate subsections (were causing some mapper data not\r
             to be saved).\r
           - Fixed an issue of MapIRQHook getting lost after loading a savestate\r
             (glitched Akumajou Densetsu and other games after savestate load).\r
+          - A bug, which prevented configuring multiple USB pads fixed.\r
   rev 153\r
           - Lots of work on the asm core. Timing fixed for some instructions.\r
             Some missing undocumented instruction handlers added. Lots of\r