From 4faefa0babc2f1de9dd3b36bbabd9553c4a6a3ea Mon Sep 17 00:00:00 2001
From: Garrett Brown <themagnificentmrb@gmail.com>
Date: Tue, 11 Oct 2016 17:40:00 -0700
Subject: [PATCH] [buttonmaps] Fix default genesis controller mapping

---
 .../xml/linux/PLAYSTATION_R_3_Controller.xml     | 14 --------------
 .../linux/PLAYSTATION_R_3_Controller_17b_29a.xml | 14 --------------
 .../Sony_PLAYSTATION_R_3_Controller_19b_27a.xml  | 16 +---------------
 3 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/peripheral.joystick/resources/buttonmaps/xml/linux/PLAYSTATION_R_3_Controller.xml b/peripheral.joystick/resources/buttonmaps/xml/linux/PLAYSTATION_R_3_Controller.xml
index 14ea2cec..3e95a17f 100644
--- a/peripheral.joystick/resources/buttonmaps/xml/linux/PLAYSTATION_R_3_Controller.xml
+++ b/peripheral.joystick/resources/buttonmaps/xml/linux/PLAYSTATION_R_3_Controller.xml
@@ -45,20 +45,6 @@
             <feature name="start" button="3" />
             <feature name="up" button="4" />
         </controller>
-        <controller id="game.controller.genesis">
-            <feature name="a" button="15" />
-            <feature name="b" button="14" />
-            <feature name="c" button="13" />
-            <feature name="down" button="14" />
-            <feature name="left" button="11" />
-            <feature name="mode" button="0" />
-            <feature name="right" button="12" />
-            <feature name="start" button="3" />
-            <feature name="up" button="13" />
-            <feature name="x" button="10" />
-            <feature name="y" button="12" />
-            <feature name="z" button="11" />
-        </controller>
         <controller id="game.controller.n64">
             <feature name="a" button="14" />
             <feature name="b" button="15" />
diff --git a/peripheral.joystick/resources/buttonmaps/xml/linux/PLAYSTATION_R_3_Controller_17b_29a.xml b/peripheral.joystick/resources/buttonmaps/xml/linux/PLAYSTATION_R_3_Controller_17b_29a.xml
index 4c74e415..79b18473 100644
--- a/peripheral.joystick/resources/buttonmaps/xml/linux/PLAYSTATION_R_3_Controller_17b_29a.xml
+++ b/peripheral.joystick/resources/buttonmaps/xml/linux/PLAYSTATION_R_3_Controller_17b_29a.xml
@@ -45,20 +45,6 @@
             <feature name="start" button="3" />
             <feature name="up" button="4" />
         </controller>
-        <controller id="game.controller.genesis">
-            <feature name="a" button="15" />
-            <feature name="b" button="14" />
-            <feature name="c" button="13" />
-            <feature name="down" button="14" />
-            <feature name="left" button="11" />
-            <feature name="mode" button="0" />
-            <feature name="right" button="12" />
-            <feature name="start" button="3" />
-            <feature name="up" button="13" />
-            <feature name="x" button="10" />
-            <feature name="y" button="12" />
-            <feature name="z" button="11" />
-        </controller>
         <controller id="game.controller.n64">
             <feature name="a" button="14" />
             <feature name="b" button="15" />
diff --git a/peripheral.joystick/resources/buttonmaps/xml/linux/Sony_PLAYSTATION_R_3_Controller_19b_27a.xml b/peripheral.joystick/resources/buttonmaps/xml/linux/Sony_PLAYSTATION_R_3_Controller_19b_27a.xml
index c87f9927..aa6affca 100644
--- a/peripheral.joystick/resources/buttonmaps/xml/linux/Sony_PLAYSTATION_R_3_Controller_19b_27a.xml
+++ b/peripheral.joystick/resources/buttonmaps/xml/linux/Sony_PLAYSTATION_R_3_Controller_19b_27a.xml
@@ -37,27 +37,13 @@
             <feature name="b" button="15" />
             <feature name="down" button="6" />
             <feature name="left" button="7" />
-            <feature name="leftbumper" axis="10" />
+            <feature name="leftbumper" button="10" />
             <feature name="right" button="5" />
             <feature name="rightbumper" button="11" />
             <feature name="select" button="0" />
             <feature name="start" button="3" />
             <feature name="up" button="4" />
         </controller>
-        <controller id="game.controller.genesis">
-            <feature name="a" button="15" />
-            <feature name="b" button="14" />
-            <feature name="c" button="13" />
-            <feature name="down" button="14" />
-            <feature name="left" button="11" />
-            <feature name="mode" button="0" />
-            <feature name="right" button="12" />
-            <feature name="start" button="3" />
-            <feature name="up" button="13" />
-            <feature name="x" button="10" />
-            <feature name="y" button="12" />
-            <feature name="z" button="11" />
-        </controller>
         <controller id="game.controller.n64">
             <feature name="a" button="14" />
             <feature name="b" button="15" />