The branch, master has been updated
via 50ea690440f9a0d083d115183db723c03766ddac (commit)
via 5484786d5fb2f1020e5c78f5c0f08afdf69056c4 (commit)
via fd282db3b22aabd064d99bacd6390144b345584b (commit)
from 418aaa72029f42b4054336067d5874e79992a426 (commit)
- Log -----------------------------------------------------------------
commit 50ea690440f9a0d083d115183db723c03766ddac
Author: Gerd v. Egidy <gerd.von.egidy@xxxxxxxxxxxxx>
Date: Sun Dec 13 02:26:39 2009 +0100
deprecated bitbang_enable in C++ wrapper too
commit 5484786d5fb2f1020e5c78f5c0f08afdf69056c4
Author: Gerd v. Egidy <gerd.von.egidy@xxxxxxxxxxxxx>
Date: Sun Dec 13 02:17:19 2009 +0100
don't use deprecated functions in examples anymore
commit fd282db3b22aabd064d99bacd6390144b345584b
Author: Gerd v. Egidy <gerd.von.egidy@xxxxxxxxxxxxx>
Date: Sun Dec 13 02:10:07 2009 +0100
deprecate ftdi_enable_bitbang()
- it's superseded for a long time by ftdi_set_bitmode()
- it reads the mode to set from ftdi->bitbang_mode which is an unexpected
interface and can lead to wrong results
-----------------------------------------------------------------------
Summary of changes:
examples/bitbang.c | 2 +-
examples/bitbang2.c | 2 +-
examples/bitbang_ft2232.c | 4 ++--
ftdipp/ftdi.hpp | 2 +-
src/ftdi.c | 4 ++--
src/ftdi.h | 12 +++++++++++-
6 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/examples/bitbang.c b/examples/bitbang.c
index 2326605..e78142e 100644
--- a/examples/bitbang.c
+++ b/examples/bitbang.c
@@ -30,7 +30,7 @@ int main(int argc, char **argv)
printf("ftdi open succeeded: %d\n",f);
printf("enabling bitbang mode\n");
- ftdi_enable_bitbang(&ftdic, 0xFF);
+ ftdi_set_bitmode(&ftdic, 0xFF, BITMODE_BITBANG);
sleep(3);
diff --git a/examples/bitbang2.c b/examples/bitbang2.c
index d9ba439..1e86f23 100644
--- a/examples/bitbang2.c
+++ b/examples/bitbang2.c
@@ -69,7 +69,7 @@ int main(int argc, char **argv)
if (ftdi_usb_open(&ftdic, 0x0403, 0x6001) < 0)
ftdi_fatal (&ftdic, "Can't open ftdi device");
- if (ftdi_enable_bitbang(&ftdic, 0xFF) < 0)
+ if (ftdi_set_bitmode(&ftdic, 0xFF, BITMODE_BITBANG) < 0)
ftdi_fatal (&ftdic, "Can't enable bitbang");
for (i=optind; i < argc ; i++)
diff --git a/examples/bitbang_ft2232.c b/examples/bitbang_ft2232.c
index 9d62ac0..04b5c80 100644
--- a/examples/bitbang_ft2232.c
+++ b/examples/bitbang_ft2232.c
@@ -38,7 +38,7 @@ int main(int argc, char **argv)
printf("ftdi open succeeded(channel 1): %d\n",f);
printf("enabling bitbang mode(channel 1)\n");
- ftdi_enable_bitbang(&ftdic, 0xFF);
+ ftdi_set_bitmode(&ftdic, 0xFF, BITMODE_BITBANG);
// Init 2. channel
if (ftdi_init(&ftdic2) < 0)
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
printf("ftdi open succeeded(channel 2): %d\n",f);
printf("enabling bitbang mode (channel 2)\n");
- ftdi_enable_bitbang(&ftdic2, 0xFF);
+ ftdi_set_bitmode(&ftdic2, 0xFF, BITMODE_BITBANG);
// Write data
printf("startloop\n");
diff --git a/ftdipp/ftdi.hpp b/ftdipp/ftdi.hpp
index b074785..76868c3 100644
--- a/ftdipp/ftdi.hpp
+++ b/ftdipp/ftdi.hpp
@@ -120,7 +120,7 @@ public:
/* BitBang mode */
int set_bitmode(unsigned char bitmask, unsigned char mode);
- int bitbang_enable(unsigned char bitmask);
+ int DEPRECATED(bitbang_enable(unsigned char bitmask));
int bitbang_disable();
int read_pins(unsigned char *pins);
diff --git a/src/ftdi.c b/src/ftdi.c
index 9630bfe..6068e7e 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -1599,7 +1599,7 @@ int ftdi_read_data_get_chunksize(struct ftdi_context
*ftdi, unsigned int *chunks
/**
Enable bitbang mode.
- For advanced bitbang modes of the FT2232C chip use ftdi_set_bitmode().
+ \deprecated use \ref ftdi_set_bitmode with mode BITMODE_BITBANG instead
\param ftdi pointer to ftdi_context
\param bitmask Bitmask to configure lines.
@@ -1648,7 +1648,7 @@ int ftdi_disable_bitbang(struct ftdi_context *ftdi)
\param ftdi pointer to ftdi_context
\param bitmask Bitmask to configure lines.
HIGH/ON value configures a line as output.
- \param mode Bitbang mode: use the values defined in \ref ftdi_mpsse_mode,
use BITMODE_RESET to switch off bitbang
+ \param mode Bitbang mode: use the values defined in \ref ftdi_mpsse_mode
\retval 0: all fine
\retval -1: can't enable bitbang mode
diff --git a/src/ftdi.h b/src/ftdi.h
index b518f96..810e074 100644
--- a/src/ftdi.h
+++ b/src/ftdi.h
@@ -148,6 +148,16 @@ enum ftdi_interface
(taken from libusb) */
#define FTDI_URB_USERCONTEXT_COOKIE ((void *)0x1)
+#ifdef __GNUC__
+ #define DEPRECATED(func) func __attribute__ ((deprecated))
+#elif defined(_MSC_VER)
+ #define DEPRECATED(func) __declspec(deprecated) func
+#else
+ #pragma message("WARNING: You need to implement DEPRECATED for this
compiler")
+ #define DEPRECATED(func) func
+#endif
+
+
/**
\brief Main context structure for all libftdi functions.
@@ -318,7 +328,7 @@ extern "C"
int ftdi_write_data_async(struct ftdi_context *ftdi, unsigned char *buf,
int size);
void ftdi_async_complete(struct ftdi_context *ftdi, int wait_for_more);
- int ftdi_enable_bitbang(struct ftdi_context *ftdi, unsigned char bitmask);
+ int DEPRECATED(ftdi_enable_bitbang(struct ftdi_context *ftdi, unsigned
char bitmask));
int ftdi_disable_bitbang(struct ftdi_context *ftdi);
int ftdi_set_bitmode(struct ftdi_context *ftdi, unsigned char bitmask,
unsigned char mode);
int ftdi_read_pins(struct ftdi_context *ftdi, unsigned char *pins);
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
|
