From 1ad9e4cc95b76fa304f6e21723eaf2fb457e0006 Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Sat, 15 Nov 2014 18:42:29 +0100 Subject: [PATCH] Remove print_inverted_bits() helper function from public API Also fix minor code style issues. Found during diff session to the previous release. --- src/ftdi.c | 33 +++++++++++++++++++-------------- src/ftdi.h | 2 -- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/ftdi.c b/src/ftdi.c index 32b3817..fe146b7 100644 --- a/src/ftdi.c +++ b/src/ftdi.c @@ -3121,6 +3121,21 @@ static unsigned char bit2type(unsigned char bits) } return 0; } +/* Decode 230X / 232R type chips invert bits + * Prints directly to stdout. +*/ +static void print_inverted_bits(int invert) +{ + char *r_bits[] = {"TXD","RXD","RTS","CTS","DTR","DSR","DCD","RI"}; + int i; + + fprintf(stdout,"Inverted bits:"); + for (i=0; i<8; i++) + if ((invert & (1<cbus_function[i]<= CBUSH_AWAKE) fprintf(stdout,"CBUS%d Function: %s\n", i, cbush_mux[eeprom->cbus_function[i]]); } - if(eeprom->invert ) - print_inverted_bits(eeprom->invert); + + if (eeprom->invert) + print_inverted_bits(eeprom->invert); } if (ftdi->type == TYPE_R) @@ -3528,7 +3544,7 @@ int ftdi_eeprom_decode(struct ftdi_context *ftdi, int verbose) char *cbus_BB[] = {"RXF","TXE","RD", "WR"}; if (eeprom->invert) - print_inverted_bits(eeprom->invert); + print_inverted_bits(eeprom->invert); for (i=0; i<5; i++) { @@ -4290,15 +4306,4 @@ char *ftdi_get_error_string (struct ftdi_context *ftdi) return ftdi->error_str; } -void print_inverted_bits(int invert) -{ - int i; - char *r_bits[] = {"TXD","RXD","RTS","CTS","DTR","DSR","DCD","RI"}; - fprintf(stdout,"Inverted bits:"); - for (i=0; i<8; i++) - if ((invert & (1<