Browse Source

FTDI autodetect: Enable populating USB product and serial number

Luke Dashjr 12 years ago
parent
commit
fabde9932a
1 changed files with 0 additions and 6 deletions
  1. 0 6
      fpgautils.c

+ 0 - 6
fpgautils.c

@@ -361,7 +361,6 @@ int _serial_autodetect_sysfs(detectone_func_t detectone, va_list needles)
 	}  \
 	}  \
 } while(0)
 } while(0)
 
 
-#ifdef UNTESTED_FTDI_DETECTONE_META_INFO
 static
 static
 char *_ftdi_get_string(char *buf, int i, DWORD flags)
 char *_ftdi_get_string(char *buf, int i, DWORD flags)
 {
 {
@@ -369,7 +368,6 @@ char *_ftdi_get_string(char *buf, int i, DWORD flags)
 		return NULL;
 		return NULL;
 	return buf[0] ? buf : NULL;
 	return buf[0] ? buf : NULL;
 }
 }
-#endif
 
 
 static
 static
 int _serial_autodetect_ftdi(detectone_func_t detectone, va_list needles)
 int _serial_autodetect_ftdi(detectone_func_t detectone, va_list needles)
@@ -378,9 +376,7 @@ int _serial_autodetect_ftdi(detectone_func_t detectone, va_list needles)
 	char *devpathnum = &devpath[7];
 	char *devpathnum = &devpath[7];
 	char **bufptrs;
 	char **bufptrs;
 	char *buf;
 	char *buf;
-#ifdef UNTESTED_FTDI_DETECTONE_META_INFO
 	char serial[64];
 	char serial[64];
-#endif
 	int found = 0;
 	int found = 0;
 	DWORD i;
 	DWORD i;
 
 
@@ -433,12 +429,10 @@ int _serial_autodetect_ftdi(detectone_func_t detectone, va_list needles)
 			continue;
 			continue;
 		
 		
 		applog(LOG_ERR, "FT_GetComPortNumber(%p (%ld), %ld)", ftHandle, (long)i, (long)lComPortNumber);
 		applog(LOG_ERR, "FT_GetComPortNumber(%p (%ld), %ld)", ftHandle, (long)i, (long)lComPortNumber);
-#ifdef UNTESTED_FTDI_DETECTONE_META_INFO
 		detectone_meta_info = (struct detectone_meta_info_t){
 		detectone_meta_info = (struct detectone_meta_info_t){
 			.product = bufptrs[i],
 			.product = bufptrs[i],
 			.serial = _ftdi_get_string(serial, i, FT_OPEN_BY_SERIAL_NUMBER),
 			.serial = _ftdi_get_string(serial, i, FT_OPEN_BY_SERIAL_NUMBER),
 		};
 		};
-#endif
 		
 		
 		sprintf(devpathnum, "%d", (int)lComPortNumber);
 		sprintf(devpathnum, "%d", (int)lComPortNumber);