From 81afb3e30358bb9f815fd4998d2067d8f9da04f3 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Wed, 5 Oct 2022 16:18:09 -0700
Subject: [PATCH] Need to swap endianness when extracting the CRC from game
controller mappings
---
src/joystick/sort_controllers.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/joystick/sort_controllers.py b/src/joystick/sort_controllers.py
index af2421f592c3..f550df2826d3 100755
--- a/src/joystick/sort_controllers.py
+++ b/src/joystick/sort_controllers.py
@@ -13,7 +13,7 @@
controller_guids = {}
conditionals = []
split_pattern = re.compile(r'([^"]*")([^,]*,)([^,]*,)([^"]*)(".*)')
-guid_crc_pattern = re.compile(r'^([0-9a-zA-Z]{4})([0-9a-zA-Z]{4})([0-9a-zA-Z]{24},)$')
+guid_crc_pattern = re.compile(r'^([0-9a-zA-Z]{4})([0-9a-zA-Z]{2})([0-9a-zA-Z]{2})([0-9a-zA-Z]{24},)$')
def find_element(prefix, bindings):
i=0
@@ -40,10 +40,10 @@ def save_controller(line):
# Look for CRC embedded in the GUID and convert to crc element
crc_match = guid_crc_pattern.match(entry[1])
- if crc_match and crc_match.group(2) != '0000':
+ if crc_match and crc_match.group(2) != '00' and crc_match.group(3) != '00':
print("Extracting CRC from GUID of " + entry[2])
- entry[1] = crc_match.group(1) + '0000' + crc_match.group(3)
- crc = "crc:" + crc_match.group(2) + ","
+ entry[1] = crc_match.group(1) + '0000' + crc_match.group(4)
+ crc = "crc:" + crc_match.group(3) + crc_match.group(2) + ","
pos = find_element("sdk", bindings)
if pos >= 0: