From fe1d21729667fe15bb31422bf03d4a783b4d782b Mon Sep 17 00:00:00 2001
From: Manuel Domke <manuel-domke@gmx.org>
Date: Tue, 29 Aug 2017 18:56:09 +0200
Subject: [PATCH] finally renamed constants...

---
 software/infnoise.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/software/infnoise.c b/software/infnoise.c
index 76f149c..76ecb6f 100644
--- a/software/infnoise.c
+++ b/software/infnoise.c
@@ -3,8 +3,9 @@
 // Required to include clock_gettime
 #define _POSIX_C_SOURCE 200809L
 
-#define VENDOR_ID 0x0403
-#define PRODUCT_ID 0x6015
+#define INFNOISE_INFNOISE_VENDOR_ID 0x0403
+#define INFNOISE_INFNOISE_PRODUCT_ID 0x6015
+#define INFNOISE_DESCRIPTION "FT240X USB FIFO"
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -129,7 +130,7 @@ static bool listUSBDevices(struct ftdi_context *ftdic) {
     int i=0;
 
     // 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(!isSuperUser()) {
             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
     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";
         return false;
     }
@@ -170,7 +171,7 @@ static bool initializeUSB(struct ftdi_context *ftdic, char **message, char *seri
             if (rc >= 1) {
 		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()) {
                     *message = "Can't open Infinite Noise Multiplier. Try running as super user?\n";
                 } else {
@@ -180,7 +181,7 @@ static bool initializeUSB(struct ftdi_context *ftdic, char **message, char *seri
 	    }
         } else {
             // 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(!isSuperUser()) {
                     *message = "Can't find Infinite Noise Multiplier. Try running as super user?\n";