salfter/infnoise
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

finally renamed constants...

Browse Source
This commit is contained in:
Manuel Domke
2017-08-29 18:56:09 +02:00
parent 3d9a5494b7
commit fe1d217296
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
software/infnoise.c
View File

@@ -3,8 +3,9 @@
// Required to include clock_gettime // Required to include clock_gettime
#define _POSIX_C_SOURCE 200809L #define _POSIX_C_SOURCE 200809L
#define VENDOR_ID 0x0403 #define INFNOISE_INFNOISE_VENDOR_ID 0x0403
#define PRODUCT_ID 0x6015 #define INFNOISE_INFNOISE_PRODUCT_ID 0x6015
#define INFNOISE_DESCRIPTION "FT240X USB FIFO"
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
@@ -129,7 +130,7 @@ static bool listUSBDevices(struct ftdi_context *ftdic) {
int i=0; int i=0;
// search devices // search devices
int rc = ftdi_usb_find_all(ftdic, &devlist, VENDOR_ID, PRODUCT_ID); int rc = ftdi_usb_find_all(ftdic, &devlist, INFNOISE_VENDOR_ID, INFNOISE_PRODUCT_ID);
if (rc < 0) { if (rc < 0) {
if(!isSuperUser()) { if(!isSuperUser()) {
fprintf(stderr, "Can't find Infinite Noise Multiplier. Try running as super user?\n"); fprintf(stderr, "Can't find Infinite Noise Multiplier. Try running as super user?\n");
@@ -158,7 +159,7 @@ static bool initializeUSB(struct ftdi_context *ftdic, char **message, char *seri
// search devices // search devices
int rc = 0; int rc = 0;
if ((rc = ftdi_usb_find_all(ftdic, &devlist, VENDOR_ID, PRODUCT_ID)) < 0) { if ((rc = ftdi_usb_find_all(ftdic, &devlist, INFNOISE_VENDOR_ID, INFNOISE_PRODUCT_ID)) < 0) {
*message = "Can't find Infinite Noise Multiplier\n"; *message = "Can't find Infinite Noise Multiplier\n";
return false; return false;
} }
@@ -170,7 +171,7 @@ static bool initializeUSB(struct ftdi_context *ftdic, char **message, char *seri
if (rc >= 1) { if (rc >= 1) {
fprintf(stderr,"Multiple Infnoise TRNGs found. No serial specfified, so using the first one"); fprintf(stderr,"Multiple Infnoise TRNGs found. No serial specfified, so using the first one");
} }
if (ftdi_usb_open(ftdic, VENDOR_ID, PRODUCT_ID) < 0) { if (ftdi_usb_open(ftdic, INFNOISE_VENDOR_ID, INFNOISE_PRODUCT_ID) < 0) {
if(!isSuperUser()) { if(!isSuperUser()) {
*message = "Can't open Infinite Noise Multiplier. Try running as super user?\n"; *message = "Can't open Infinite Noise Multiplier. Try running as super user?\n";
} else { } else {
@@ -180,7 +181,7 @@ static bool initializeUSB(struct ftdi_context *ftdic, char **message, char *seri
} }
} else { } else {
// serial specified // serial specified
rc = ftdi_usb_open_desc(ftdic, VENDOR_ID, PRODUCT_ID, "FT240X USB FIFO", serial); rc = ftdi_usb_open_desc(ftdic, INFNOISE_VENDOR_ID, INFNOISE_PRODUCT_ID, INFNOISE_DESCRIPTION, serial);
if (rc < 0) { if (rc < 0) {
if(!isSuperUser()) { if(!isSuperUser()) {
*message = "Can't find Infinite Noise Multiplier. Try running as super user?\n"; *message = "Can't find Infinite Noise Multiplier. Try running as super user?\n";