actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add port detection through lsusb

Browse Source
This commit is contained in:
Chris Danford
2004-06-28 05:23:55 +00:00
parent afd89f7fef
commit 1296cd775d
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
+14 -2
View File
@@ -406,11 +406,14 @@ void GetNewStorageDevices( vector<UsbStorageDeviceEx>& vDevicesOut )
{ {
// Bus 002 Device 001: ID 0000:0000 // Bus 002 Device 001: ID 0000:0000
// Port 4
// iSerial 3 1125198948886 // iSerial 3 1125198948886
// bInterfaceClass 8 Mass Storage // bInterfaceClass 8 Mass Storage
CString sCommand = "/usr/sbin/lsusb"; // Don't include a path. The usbutils installer script installs
char *szParams[] = { "/usr/sbin/lsusb", "-v", NULL }; // to /usr/local/sbin and the Debian package installs to /usr/sbin/.
CString sCommand = "lsusb";
char *szParams[] = { "lsusb", "-v", NULL };
CString sOutput; CString sOutput;
RunProgram( sCommand, szParams, sOutput ); RunProgram( sCommand, szParams, sOutput );
@@ -433,6 +436,15 @@ void GetNewStorageDevices( vector<UsbStorageDeviceEx>& vDevicesOut )
continue; // stop processing this line continue; // stop processing this line
} }
// Port 4
int iPort;
iRet = sscanf( sLine.c_str(), "Port %d", &iPort );
if( iRet == 1 )
{
usbd.iPort = iPort;
continue; // stop processing this line
}
// iSerial 3 1125198948886 // iSerial 3 1125198948886
char szSerial[1024]; char szSerial[1024];
iRet = sscanf( sLine.c_str(), " iSerial %d %[^\n]", &iThrowAway, szSerial ); iRet = sscanf( sLine.c_str(), " iSerial %d %[^\n]", &iThrowAway, szSerial );