A library to talk to FTDI chips branch, master, updated. v1.1-14-g34b79ac

[libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx]

The branch, master has been updated
       via  34b79ac71e43a07e5bd929592cba212c9f780672 (commit)
      from  84a46e0a15e704cf3b7140ecd5d9821c37ad3eca (commit)


- Log -----------------------------------------------------------------
commit 34b79ac71e43a07e5bd929592cba212c9f780672
Author: Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date:   Tue Sep 2 13:50:32 2014 +0200

    FT230X: Read out, decode and encode the RS232 inversion configuration bits

-----------------------------------------------------------------------

Summary of changes:
 src/ftdi.c   |   38 ++++++++++++++++++++++++++++++++++++++
 src/ftdi.h   |    1 +
 src/ftdi_i.h |    5 +++++
 3 files changed, 44 insertions(+), 0 deletions(-)

diff --git a/src/ftdi.c b/src/ftdi.c
index c62428d..08130c2 100644
--- 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;
     }
 
@@ -3389,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)
@@ -3512,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 i, n;
+                printf("Inversion on ");
+                for (i=0, n=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)
@@ -3734,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");
     }
@@ -3923,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");
     }
diff --git a/src/ftdi.h b/src/ftdi.h
index 07fcd71..e192a66 100644
--- a/src/ftdi.h
+++ b/src/ftdi.h
@@ -332,6 +332,7 @@ enum ftdi_eeprom_value
     CHANNEL_C_RS485    = 53,
     CHANNEL_D_RS485    = 54,
     RELEASE_NUMBER     = 55,
+    RS232_INVERSION    = 56,
 };
 
 /**
diff --git a/src/ftdi_i.h b/src/ftdi_i.h
index 19d8dd5..066790b 100644
--- a/src/ftdi_i.h
+++ b/src/ftdi_i.h
@@ -123,6 +123,11 @@ struct ftdi_eeprom
     int data_order;
     int flow_control;
 
+    /* FT-X Device and Peripheral control
+     * Fixme: Decode byte[0xa]
+     */
+    int rs232_inversion;
+
     /** eeprom size in bytes. This doesn't get stored in the eeprom
         but is the only way to pass it to ftdi_eeprom_build. */
     int size;


hooks/post-receive
-- 
A library to talk to FTDI chips

--
libftdi-git - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx