Fix declaration shadow in ftdi.c

[libftdi] / src / ftdi.c

diff --git a/src/ftdi.c b/src/ftdi.c
index add6dc2..ad9e20e 100644 (file)
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -3065,6 +3065,7 @@ int ftdi_eeprom_build(struct ftdi_context *ftdi)
             {
                 output[0x1a + j] = eeprom->cbus_function[j];
             }
+            output[0x0b] = eeprom->rs232_inversion;
             break;
     }
 
@@ -3136,7 +3137,7 @@ static unsigned char bit2type(unsigned char bits)
 */
 int ftdi_eeprom_decode(struct ftdi_context *ftdi, int verbose)
 {
-    unsigned char i, j;
+    int i, j;
     unsigned short checksum, eeprom_checksum, value;
     unsigned char manufacturer_size = 0, product_size = 0, serial_size = 0;
     int eeprom_size;
@@ -3356,8 +3357,6 @@ int ftdi_eeprom_decode(struct ftdi_context *ftdi, int verbose)
     }
     else if (ftdi->type == TYPE_232H)
     {
-        int i;
-
         eeprom->channel_a_type   = buf[0x00] & 0xf;
         eeprom->channel_a_driver = (buf[0x00] & DRIVER_VCPH)?DRIVER_VCP:0;
         eeprom->clock_polarity =  buf[0x01]       & FT1284_CLK_IDLE_STATE;
@@ -3391,6 +3390,8 @@ int ftdi_eeprom_decode(struct ftdi_context *ftdi, int verbose)
         eeprom->group1_drive   = (buf[0x0c] >> 4) & 0x03;
         eeprom->group1_schmitt = (buf[0x0c] >> 4) & IS_SCHMITT;
         eeprom->group1_slew    = (buf[0x0c] >> 4) & SLOW_SLEW;
+
+        eeprom->rs232_inversion = buf[0xb];
     }
 
     if (verbose)
@@ -3474,7 +3475,6 @@ int ftdi_eeprom_decode(struct ftdi_context *ftdi, int verbose)
         }
         else if (ftdi->type == TYPE_232H)
         {
-            int i;
             char *cbush_mux[] = {"TRISTATE","RXLED","TXLED", "TXRXLED","PWREN",
                                  "SLEEP","DRIVE_0","DRIVE_1","IOMODE","TXDEN",
                                  "CLK30","CLK15","CLK7_5"
@@ -3496,7 +3496,6 @@ int ftdi_eeprom_decode(struct ftdi_context *ftdi, int verbose)
         }
         else if (ftdi->type == TYPE_230X)
         {
-            int i;
             char *cbush_mux[] = {"TRISTATE","RXLED","TXLED", "TXRXLED","PWREN",
                                  "SLEEP","DRIVE_0","DRIVE_1","IOMODE","TXDEN",
                                  "CLK24","CLK12","CLK6","BAT_DETECT","BAT_DETECT#",
@@ -3516,6 +3515,33 @@ int ftdi_eeprom_decode(struct ftdi_context *ftdi, int verbose)
                 if (eeprom->cbus_function[i]<= CBUSH_AWAKE)
                     fprintf(stdout,"CBUS%d Function: %s\n", i, cbush_mux[eeprom->cbus_function[i]]);
             }
+            if(eeprom->rs232_inversion ) {
+                struct bitnames {
+                    int mask;
+                    char *name;
+                };
+
+                struct bitnames invbitlist[] = {
+                    {INVERT_TXD, "TXD"},
+                    {INVERT_RXD, "RXD"},
+                    {INVERT_RTS, "RTS"},
+                    {INVERT_CTS, "CTS"},
+                    {INVERT_DTR, "DTR"},
+                    {INVERT_DSR, "DSR"},
+                    {INVERT_DCD, "DCD"},
+                    {INVERT_RI, "RI"},
+                    {0, NULL},
+                };
+                int n = 0;
+                printf("Inversion on ");
+                for (i=0; invbitlist[i].mask;i++) {
+                    if(eeprom->rs232_inversion & invbitlist[i].mask) {
+                        if (n++) printf (",");
+                        printf (" %s", invbitlist[i].name);
+                    }
+                }
+                printf (" Pin%s\n",(n==1)?"":"s");
+            }
         }
 
         if (ftdi->type == TYPE_R)
@@ -3738,6 +3764,9 @@ int ftdi_get_eeprom_value(struct ftdi_context *ftdi, enum ftdi_eeprom_value valu
         case CHIP_SIZE:
             *value = ftdi->eeprom->size;
             break;
+        case RS232_INVERSION:
+            *value = ftdi->eeprom->rs232_inversion;
+            break;
         default:
             ftdi_error_return(-1, "Request for unknown EEPROM value");
     }
@@ -3927,6 +3956,11 @@ int ftdi_set_eeprom_value(struct ftdi_context *ftdi, enum ftdi_eeprom_value valu
             break;
         case CHIP_SIZE:
             ftdi_error_return(-2, "EEPROM Value can't be changed");
+            break;
+        case RS232_INVERSION:
+            ftdi->eeprom->rs232_inversion = value;
+            break;
+
         default :
             ftdi_error_return(-1, "Request to unknown EEPROM value");
     }