From ee9336983ca1d86c7852f7df4e84d8a7d7467fa9 Mon Sep 17 00:00:00 2001
From: Fabian Dill <fabian.dill@web.de>
Date: Wed, 11 Nov 2020 12:21:37 +0100
Subject: [PATCH] Remove SD2SNES special handling Requires QUSB2SNES 0.7.19

---
 MultiClient.py | 49 ++++++++-----------------------------------------
 1 file changed, 8 insertions(+), 41 deletions(-)

diff --git a/MultiClient.py b/MultiClient.py
index 22134dc9..9acbdf87 100644
--- a/MultiClient.py
+++ b/MultiClient.py
@@ -73,7 +73,6 @@ class Context():
         self.snes_reconnect_address = None
         self.snes_recv_queue = asyncio.Queue()
         self.snes_request_lock = asyncio.Lock()
-        self.is_sd2snes = False
         self.snes_write_buffer = []
 
         self.server_task = None
@@ -522,15 +521,6 @@ async def snes_connect(ctx: Context, address):
         ctx.snes_attached_device = (devices.index(device), device)
         ctx.ui_node.send_connection_status(ctx)
 
-        if 'sd2snes' in device.lower() or (len(device) == 4 and device[:3] == 'COM'):
-            ctx.ui_node.log_info("SD2SNES Detected")
-            ctx.is_sd2snes = True
-            await ctx.snes_socket.send(json.dumps({"Opcode" : "Info", "Space" : "SNES"}))
-            reply = json.loads(await ctx.snes_socket.recv())
-            if reply and 'Results' in reply:
-                ctx.ui_node.log_info(reply['Results'])
-        else:
-            ctx.is_sd2snes = False
 
         ctx.snes_reconnect_address = address
         recv_task = asyncio.create_task(snes_recv_loop(ctx))
@@ -650,42 +640,19 @@ async def snes_write(ctx : Context, write_list):
             "Operands" : []
         }
 
-        if ctx.is_sd2snes:
-            cmd = b'\x00\xE2\x20\x48\xEB\x48'
 
+        PutAddress_Request['Space'] = 'SNES'
+        try:
+            #will pack those requests as soon as qusb2snes actually supports that for real
             for address, data in write_list:
-                if (address < WRAM_START) or ((address + len(data)) > (WRAM_START + WRAM_SIZE)):
-                    ctx.ui_node.log_error("SD2SNES: Write out of range %s (%d)" % (hex(address), len(data)))
-                    return False
-                for ptr, byte in enumerate(data, address + 0x7E0000 - WRAM_START):
-                    cmd += b'\xA9' # LDA
-                    cmd += bytes([byte])
-                    cmd += b'\x8F' # STA.l
-                    cmd += bytes([ptr & 0xFF, (ptr >> 8) & 0xFF, (ptr >> 16) & 0xFF])
-
-            cmd += b'\xA9\x00\x8F\x00\x2C\x00\x68\xEB\x68\x28\x6C\xEA\xFF\x08'
-
-            PutAddress_Request['Space'] = 'CMD'
-            PutAddress_Request['Operands'] = ["2C00", hex(len(cmd)-1)[2:], "2C00", "1"]
-            try:
+                PutAddress_Request['Operands'] = [hex(address)[2:], hex(len(data))[2:]]
                 if ctx.snes_socket is not None:
                     await ctx.snes_socket.send(json.dumps(PutAddress_Request))
                 if ctx.snes_socket is not None:
-                    await ctx.snes_socket.send(cmd)
-            except websockets.ConnectionClosed:
-                return False
-        else:
-            PutAddress_Request['Space'] = 'SNES'
-            try:
-                #will pack those requests as soon as qusb2snes actually supports that for real
-                for address, data in write_list:
-                    PutAddress_Request['Operands'] = [hex(address)[2:], hex(len(data))[2:]]
-                    if ctx.snes_socket is not None:
-                        await ctx.snes_socket.send(json.dumps(PutAddress_Request))
-                    if ctx.snes_socket is not None:
-                        await ctx.snes_socket.send(data)
-            except websockets.ConnectionClosed:
-                return False
+                    await ctx.snes_socket.send(data)
+        except websockets.ConnectionClosed:
+            logging.warning("Could not write data to SNES")
+            return False
 
         return True
     finally: