Add support for the upcoming 3.5.x adapter firmware

Author: raphnet

RELEASE

@@ -1,6 +1,11 @@
 # Raphnet raw Input plugin for Mupen64Plus
 --------------------------------
 
+## v1.0.1 - November 22, 2017
+
+* Add support for the upcoming 3.5.x adapter firmware
+  (2-player adapters won't work properly otherwise)
+
 ## v1.0.0 - January 15, 2017
 
 * Support for multiple adapters

src/gcn64.c

@@ -1,5 +1,5 @@
 /*	gc_n64_usb : Gamecube or N64 controller to USB adapter firmware
-	Copyright (C) 2007-2015  Raphael Assenat <raph@raphnet.net>
+	Copyright (C) 2007-2017  Raphael Assenat <raph@raphnet.net>
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -53,15 +53,13 @@ static struct supported_adapter supported_adapters[] = {
 	{ OUR_VENDOR_ID, 0x0036, 1, { 2, 1 } }, // GC/N64 USB v3.4.x (2x N64-only mode)
 	{ OUR_VENDOR_ID, 0x0037, 1, { 2, 1 } }, // GC/N64 USB v3.4.x (2x GC-only mode)
 
-	// For future use...
-	{ OUR_VENDOR_ID, 0x0038, 1, { 2, 1 } },
-	{ OUR_VENDOR_ID, 0x0039, 1, { 2, 1 } },
-	{ OUR_VENDOR_ID, 0x003A, 1, { 2, 1 } },
-	{ OUR_VENDOR_ID, 0x003B, 1, { 2, 1 } },
-	{ OUR_VENDOR_ID, 0x003C, 1, { 2, 1 } },
-	{ OUR_VENDOR_ID, 0x003D, 1, { 2, 1 } },
-	{ OUR_VENDOR_ID, 0x003E, 1, { 2, 1 } },
-	{ OUR_VENDOR_ID, 0x003F, 1, { 2, 1 } },
+	// GC/N64 USB v3.5.x flavours
+	{ OUR_VENDOR_ID, 0x0038, 1, { 1, 1 } }, // (GC/N64 mode)
+	{ OUR_VENDOR_ID, 0x0039, 1, { 1, 1 } }, // (N64 mode)
+	{ OUR_VENDOR_ID, 0x003A, 1, { 1, 1 } }, // (GC mode)
+	{ OUR_VENDOR_ID, 0x003B, 2, { 2, 1 } }, // (2x GC/N64 mode)
+	{ OUR_VENDOR_ID, 0x003C, 2, { 2, 1 } }, // (2x N64-only mode)
+	{ OUR_VENDOR_ID, 0x003D, 2, { 2, 1 } }, // (2x GC-only mode)
 
 	{ }, // terminator
 };

src/plugin_back.c

@@ -58,7 +58,6 @@
 // Filter
 #define EXTENSION_RW_ONLY 0
 
-
 #define MAX_ADAPTERS	4
 #define MAX_CHANNELS	4
 
@@ -302,6 +301,7 @@ static int pb_performIo(void)
 	struct adapter *adap;
 	struct blockio_op *biops;
 	int j, i, res;
+	int op_was_extio[MAX_OPS] = { };
 
 	for (j=0; j<g_n_channels; j++)
 	{
@@ -316,6 +316,7 @@ static int pb_performIo(void)
 		for (i=0; i<adap->n_ops; i++) {
 			if (EXTENSION_RW_ONLY && (biops[i].tx_data[0] < 0x02))
 				continue;
+			op_was_extio[i] = 1;
 			printf("Before blockIO: op %d, chn: %d, : tx: 0x%02x, rx: 0x%02x, data: ", i, biops[i].chn,
 						biops[i].tx_len, biops[i].rx_len);
 			printHexBuf(biops[i].tx_data, biops[i].tx_len);
@@ -340,7 +341,7 @@ static int pb_performIo(void)
 				biops[i].tx_data[-1] = biops[i].rx_len;
 
 #ifdef TRACE_BLOCK_IO
-				if (EXTENSION_RW_ONLY && (biops[i].tx_data[0] < 0x02))
+				if (EXTENSION_RW_ONLY && (!op_was_extio[i])) // Read
 					continue;
 
 				printf("After blockIO: op %d, chn: %d, : tx: 0x%02x, rx: 0x%02x, data: ", i, biops[i].chn,

src/version.h

@@ -27,7 +27,7 @@
 #define VERSION_H
 
 #define PLUGIN_NAME    "Mupen64Plus raphnetraw Input Plugin"
-#define PLUGIN_VERSION           0x010000
+#define PLUGIN_VERSION           0x010001
 #define INPUT_PLUGIN_API_VERSION 0x020000
 #define CONFIG_API_VERSION       0x020100