From 1189b11aff1b36510367f17a0aedf2abccb66ec7 Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Tue, 4 Mar 2008 09:34:42 +0000 Subject: [PATCH] libftdi: (tomj) applied modem status functions patch, increased version --- ChangeLog | 7 +++ configure.in | 2 +- src/Makefile.am | 2 +- src/ftdi.c | 147 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- src/ftdi.h | 7 +++ 5 files changed, 158 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6bdd3f5..be9e5f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +New in 0.12 +----------- +* Ability to purge RX/TX buffers separately (Arnim Läuger) +* Setting of event and error character (Arnim Läuger) +* Poll modem status function (Arnim Läuger and Intra2net) +* Updated documentation + New in 0.11 ----------- * Vala bindings helper functions (ftdi_new, ftdi_free, ftdi_list_free2) (Even Nermerson) diff --git a/configure.in b/configure.in index d49b77f..229a8b0 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ AC_INIT(configure.in) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libftdi, 0.11) +AM_INIT_AUTOMAKE(libftdi, 0.12) AC_LANG_C AC_PROG_CC diff --git a/src/Makefile.am b/src/Makefile.am index 8d25a23..57032ef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,4 +10,4 @@ include_HEADERS = ftdi.h # Note: If you specify a:b:c as the version in the next line, # the library that is made has version (a-c).c.b. In this # example, the version is 2.1.2. (3:2:1) -libftdi_la_LDFLAGS = -version-info 12:0:11 $(all_libraries) +libftdi_la_LDFLAGS = -version-info 13:0:12 $(all_libraries) diff --git a/src/ftdi.c b/src/ftdi.c index 9a80d7f..b17e898 100644 --- a/src/ftdi.c +++ b/src/ftdi.c @@ -508,15 +508,14 @@ int ftdi_usb_reset(struct ftdi_context *ftdi) } /** - Clears the buffers on the chip. + Clears the read buffer on the chip and the internal read buffer. \param ftdi pointer to ftdi_context \retval 0: all fine - \retval -1: write buffer purge failed - \retval -2: read buffer purge failed + \retval -1: read buffer purge failed */ -int ftdi_usb_purge_buffers(struct ftdi_context *ftdi) +int ftdi_usb_purge_rx_buffer(struct ftdi_context *ftdi) { if (usb_control_msg(ftdi->usb_dev, 0x40, 0, 1, ftdi->index, NULL, 0, ftdi->usb_write_timeout) != 0) ftdi_error_return(-1, "FTDI purge of RX buffer failed"); @@ -525,8 +524,45 @@ int ftdi_usb_purge_buffers(struct ftdi_context *ftdi) ftdi->readbuffer_offset = 0; ftdi->readbuffer_remaining = 0; + return 0; +} + +/** + Clears the write buffer on the chip. + + \param ftdi pointer to ftdi_context + + \retval 0: all fine + \retval -1: write buffer purge failed +*/ +int ftdi_usb_purge_tx_buffer(struct ftdi_context *ftdi) +{ if (usb_control_msg(ftdi->usb_dev, 0x40, 0, 2, ftdi->index, NULL, 0, ftdi->usb_write_timeout) != 0) - ftdi_error_return(-2, "FTDI purge of TX buffer failed"); + ftdi_error_return(-1, "FTDI purge of TX buffer failed"); + + return 0; +} + +/** + Clears the buffers on the chip and the internal read buffer. + + \param ftdi pointer to ftdi_context + + \retval 0: all fine + \retval -1: read buffer purge failed + \retval -2: write buffer purge failed +*/ +int ftdi_usb_purge_buffers(struct ftdi_context *ftdi) +{ + int result; + + result = ftdi_usb_purge_rx_buffer(ftdi); + if (!result) + return -1; + + result = ftdi_usb_purge_tx_buffer(ftdi); + if (!result) + return -2; return 0; } @@ -1291,6 +1327,107 @@ int ftdi_get_latency_timer(struct ftdi_context *ftdi, unsigned char *latency) } /** + Poll modem status information + + This function allows the retrieve the two status bytes of the device. + The device sends these bytes also as a header for each read access + where they are discarded by ftdi_read_data(). The chip generates + the two stripped status bytes in the absence of data every 40 ms. + + Layout of the first byte: + - B0..B3 - must be 0 + - B4 Clear to send (CTS) + 0 = inactive + 1 = active + - B5 Data set ready (DTS) + 0 = inactive + 1 = active + - B6 Ring indicator (RI) + 0 = inactive + 1 = active + - B7 Receive line signal detect (RLSD) + 0 = inactive + 1 = active + + Layout of the second byte: + - B0 Data ready (DR) + - B1 Overrun error (OE) + - B2 Parity error (PE) + - B3 Framing error (FE) + - B4 Break interrupt (BI) + - B5 Transmitter holding register (THRE) + - B6 Transmitter empty (TEMT) + - B7 Error in RCVR FIFO + + \param ftdi pointer to ftdi_context + \param status Pointer to store status information in. Must be two bytes. + + \retval 0: all fine + \retval -1: unable to retrieve status information +*/ +int ftdi_poll_modem_status(struct ftdi_context *ftdi, unsigned short *status) +{ + char usb_val[2]; + + if (usb_control_msg(ftdi->usb_dev, 0xC0, 0x05, 0, ftdi->index, usb_val, 2, ftdi->usb_read_timeout) != 2) + ftdi_error_return(-1, "getting modem status failed"); + + *status = (usb_val[1] << 8) | usb_val[0]; + + return 0; +} + +/** + Set the special event character + + \param ftdi pointer to ftdi_context + \param eventch Event character + \param enable 0 to disable the event character, non-zero otherwise + + \retval 0: all fine + \retval -1: unable to set event character +*/ +int ftdi_set_event_char(struct ftdi_context *ftdi, + unsigned char eventch, unsigned char enable) +{ + unsigned short usb_val; + + usb_val = eventch; + if (enable) + usb_val |= 1 << 8; + + if (usb_control_msg(ftdi->usb_dev, 0x40, 0x06, usb_val, ftdi->index, NULL, 0, ftdi->usb_write_timeout) != 0) + ftdi_error_return(-1, "setting event character failed"); + + return 0; +} + +/** + Set error character + + \param ftdi pointer to ftdi_context + \param errorch Error character + \param enable 0 to disable the error character, non-zero otherwise + + \retval 0: all fine + \retval -1: unable to set error character +*/ +int ftdi_set_error_char(struct ftdi_context *ftdi, + unsigned char errorch, unsigned char enable) +{ + unsigned short usb_val; + + usb_val = errorch; + if (enable) + usb_val |= 1 << 8; + + if (usb_control_msg(ftdi->usb_dev, 0x40, 0x07, usb_val, ftdi->index, NULL, 0, ftdi->usb_write_timeout) != 0) + ftdi_error_return(-1, "setting error character failed"); + + return 0; +} + +/** Set the eeprom size \param ftdi pointer to ftdi_context diff --git a/src/ftdi.h b/src/ftdi.h index e72cad2..e476044 100644 --- a/src/ftdi.h +++ b/src/ftdi.h @@ -258,6 +258,8 @@ extern "C" { int ftdi_usb_close(struct ftdi_context *ftdi); int ftdi_usb_reset(struct ftdi_context *ftdi); + int ftdi_usb_purge_rx_buffer(struct ftdi_context *ftdi); + int ftdi_usb_purge_tx_buffer(struct ftdi_context *ftdi); int ftdi_usb_purge_buffers(struct ftdi_context *ftdi); int ftdi_set_baudrate(struct ftdi_context *ftdi, int baudrate); @@ -283,6 +285,11 @@ extern "C" { int ftdi_set_latency_timer(struct ftdi_context *ftdi, unsigned char latency); int ftdi_get_latency_timer(struct ftdi_context *ftdi, unsigned char *latency); + int ftdi_poll_modem_status(struct ftdi_context *ftdi, unsigned short *status); + + int ftdi_set_event_char(struct ftdi_context *ftdi, unsigned char eventch, unsigned char enable); + int ftdi_set_error_char(struct ftdi_context *ftdi, unsigned char errorch, unsigned char enable); + // set eeprom size void ftdi_eeprom_setsize(struct ftdi_context *ftdi, struct ftdi_eeprom *eeprom, int size); -- 1.7.1