The branch, master has been updated
via 418aaa72029f42b4054336067d5874e79992a426 (commit)
from c7f06bd4d72e78415046992276fec7aa801407f2 (commit)
- Log -----------------------------------------------------------------
commit 418aaa72029f42b4054336067d5874e79992a426
Author: Gerd v. Egidy <gerd.von.egidy@xxxxxxxxxxxxx>
Date: Sun Dec 13 02:02:09 2009 +0100
documentation improvements, small fix setting bitbang_enabled on all
bitbang modes
-----------------------------------------------------------------------
Summary of changes:
src/ftdi.c | 21 ++++++++++-----------
src/ftdi.h | 20 ++++++++++----------
2 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/src/ftdi.c b/src/ftdi.c
index 4a2e3f7..9630bfe 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -50,6 +50,7 @@
return code; \
} while(0);
+
/**
Internal function to close usb device pointer.
Sets ftdi->usb_dev to NULL.
@@ -92,7 +93,7 @@ int ftdi_init(struct ftdi_context *ftdi)
ftdi->type = TYPE_BM; /* chip type */
ftdi->baudrate = -1;
- ftdi->bitbang_enabled = 0;
+ ftdi->bitbang_enabled = 0; /* 0: normal mode 1: any of the bitbang modes
enabled */
ftdi->readbuffer = NULL;
ftdi->readbuffer_offset = 0;
@@ -104,7 +105,7 @@ int ftdi_init(struct ftdi_context *ftdi)
ftdi->index = 0;
ftdi->in_ep = 0x02;
ftdi->out_ep = 0x81;
- ftdi->bitbang_mode = 1; /* 1: Normal bitbang mode, 2: SPI bitbang mode */
+ ftdi->bitbang_mode = 1; /* when bitbang is enabled this holds the number
of the mode */
ftdi->error_str = NULL;
@@ -425,7 +426,7 @@ static unsigned int _ftdi_determine_max_packet_size(struct
ftdi_context *ftdi, s
}
/**
- Opens a ftdi device given by a usb_device.
+ Opens a ftdi device given by an usb_device.
\param ftdi pointer to ftdi_context
\param dev libusb usb_dev to use
@@ -899,7 +900,7 @@ int ftdi_usb_close(struct ftdi_context *ftdi)
return rtn;
}
-/*
+/**
ftdi_convert_baudrate returns nearest supported baud rate to that
requested.
Function is only used internally
\internal
@@ -1442,8 +1443,6 @@ int ftdi_write_data_get_chunksize(struct ftdi_context
*ftdi, unsigned int *chunk
\retval 0: no data was available
\retval >0: number of bytes read
- \remark This function is not useful in bitbang mode.
- Use ftdi_read_pins() to get the current state of the pins.
*/
int ftdi_read_data(struct ftdi_context *ftdi, unsigned char *buf, int size)
{
@@ -1644,12 +1643,12 @@ int ftdi_disable_bitbang(struct ftdi_context *ftdi)
}
/**
- Enable advanced bitbang mode for FT2232C chips.
+ Enable/disable bitbang modes.
\param ftdi pointer to ftdi_context
\param bitmask Bitmask to configure lines.
HIGH/ON value configures a line as output.
- \param mode Bitbang mode: 1 for normal mode, 2 for SPI mode
+ \param mode Bitbang mode: use the values defined in \ref ftdi_mpsse_mode,
use BITMODE_RESET to switch off bitbang
\retval 0: all fine
\retval -1: can't enable bitbang mode
@@ -1661,15 +1660,15 @@ int ftdi_set_bitmode(struct ftdi_context *ftdi,
unsigned char bitmask, unsigned
usb_val = bitmask; // low byte: bitmask
usb_val |= (mode << 8);
if (usb_control_msg(ftdi->usb_dev, FTDI_DEVICE_OUT_REQTYPE,
SIO_SET_BITMODE_REQUEST, usb_val, ftdi->index, NULL, 0,
ftdi->usb_write_timeout) != 0)
- ftdi_error_return(-1, "unable to configure bitbang mode. Perhaps not a
2232C type chip?");
+ ftdi_error_return(-1, "unable to configure bitbang mode. Perhaps
selected mode not supported on your chip?");
ftdi->bitbang_mode = mode;
- ftdi->bitbang_enabled = (mode == BITMODE_BITBANG || mode ==
BITMODE_SYNCBB)?1:0;
+ ftdi->bitbang_enabled = (mode == BITMODE_RESET) ? 0 : 1;
return 0;
}
/**
- Directly read pin state. Useful for bitbang mode.
+ Directly read pin state, circumventing the read buffer. Useful for bitbang
mode.
\param ftdi pointer to ftdi_context
\param pins Pointer to store pins into
diff --git a/src/ftdi.h b/src/ftdi.h
index bee3c2d..b518f96 100644
--- a/src/ftdi.h
+++ b/src/ftdi.h
@@ -35,18 +35,18 @@ enum ftdi_break_type { BREAK_OFF=0, BREAK_ON=1 };
/** MPSSE bitbang modes */
enum ftdi_mpsse_mode
{
- BITMODE_RESET = 0x00,
- BITMODE_BITBANG= 0x01,
- BITMODE_MPSSE = 0x02,
- BITMODE_SYNCBB = 0x04,
- BITMODE_MCU = 0x08,
- /* CPU-style fifo mode gets set via EEPROM */
- BITMODE_OPTO = 0x10,
- BITMODE_CBUS = 0x20,
- BITMODE_SYNCFF = 0x40
+ BITMODE_RESET = 0x00, /**< switch off bitbang mode, back to regular
serial/FIFO */
+ BITMODE_BITBANG= 0x01, /**< classical asynchronous bitbang mode,
introduced with B-type chips */
+ BITMODE_MPSSE = 0x02, /**< MPSSE mode, available on 2232x chips */
+ BITMODE_SYNCBB = 0x04, /**< synchronous bitbang mode, available on
2232x and R-type chips */
+ BITMODE_MCU = 0x08, /**< MCU Host Bus Emulation mode, available on
2232x chips */
+ /* CPU-style fifo mode gets set via EEPROM */
+ BITMODE_OPTO = 0x10, /**< Fast Opto-Isolated Serial Interface Mode,
available on 2232x chips */
+ BITMODE_CBUS = 0x20, /**< Bitbang on CBUS pins of R-type chips,
configure in EEPROM before */
+ BITMODE_SYNCFF = 0x40, /**< Single Channel Synchronous FIFO mode,
available on 2232H chips */
};
-/** Port interface for FT2232C */
+/** Port interface for chips with multiple interfaces */
enum ftdi_interface
{
INTERFACE_ANY = 0,
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
|
