Commit cca950c1 authored by Robert Sprowson's avatar Robert Sprowson

Revert interface/alternate muddle

In glue.c revision 1.4 the interface and alternate were swapped round when generating the USB device special string. Presumably this was to work around DeviceFS not parsing them properly? DeviceFS does now, so this was tripping up any mass storage devices whose interface and alternate weren't the same.

Version 0.17. Tagged as 'SCSISoftUSB-0_17'
parent b935ae8d
/* (0.16) /* (0.17)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1. * Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 0.16 #define Module_MajorVersion_CMHG 0.17
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 03 Jun 2012 #define Module_Date_CMHG 26 Jun 2013
#define Module_MajorVersion "0.16" #define Module_MajorVersion "0.17"
#define Module_Version 16 #define Module_Version 17
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "03 Jun 2012" #define Module_Date "26 Jun 2013"
#define Module_ApplicationDate "03-Jun-12" #define Module_ApplicationDate "26-Jun-13"
#define Module_ComponentName "SCSISoftUSB" #define Module_ComponentName "SCSISoftUSB"
#define Module_ComponentPath "mixed/RiscOS/Sources/HWSupport/SCSI/SCSISoftUSB" #define Module_ComponentPath "mixed/RiscOS/Sources/HWSupport/SCSI/SCSISoftUSB"
#define Module_FullVersion "0.16" #define Module_FullVersion "0.17"
#define Module_HelpVersion "0.16 (03 Jun 2012)" #define Module_HelpVersion "0.17 (26 Jun 2013)"
#define Module_LibraryVersionInfo "0:16" #define Module_LibraryVersionInfo "0:17"
...@@ -1136,7 +1136,7 @@ usbd_status usbd_open_pipe(usbd_interface_handle iface, u_int8_t address, u_int8 ...@@ -1136,7 +1136,7 @@ usbd_status usbd_open_pipe(usbd_interface_handle iface, u_int8_t address, u_int8
char filename[sizeof "USBxxxxxxxxxxxxxxxx#interfacexxx;alternatexxx;endpointxxx;bulk;sizexxxxxx:" + 1]; char filename[sizeof "USBxxxxxxxxxxxxxxxx#interfacexxx;alternatexxx;endpointxxx;bulk;sizexxxxxx:" + 1];
if (pipe) *pipe = 0; /* in case of error */ if (pipe) *pipe = 0; /* in case of error */
sprintf(filename, "%s#alternate%d;interface%d;endpoint%d;bulk;size%d:", sprintf(filename, "%s#interface%d;alternate%d;endpoint%d;bulk;size%d:",
device->devicefs_name, device->devicefs_name,
device->interface, device->interface,
device->alternate, device->alternate,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment