From f227338297de002d8a76dc5e411dde8743751028 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sat, 2 Apr 2016 18:36:52 +0200 Subject: [PATCH] Rename 'ft2232h' driver to 'ftdi-la'. The driver already supports more than just the FT2232H chip. --- Makefile.am | 8 ++++---- configure.ac | 2 +- src/drivers.c | 8 ++++---- src/hardware/{ft2232h => ftdi-la}/api.c | 14 +++++++------- src/hardware/{ft2232h => ftdi-la}/protocol.c | 2 +- src/hardware/{ft2232h => ftdi-la}/protocol.h | 8 ++++---- 6 files changed, 21 insertions(+), 21 deletions(-) rename src/hardware/{ft2232h => ftdi-la}/api.c (97%) rename src/hardware/{ft2232h => ftdi-la}/protocol.c (97%) rename src/hardware/{ft2232h => ftdi-la}/protocol.h (87%) diff --git a/Makefile.am b/Makefile.am index 1038b31f..13489627 100644 --- a/Makefile.am +++ b/Makefile.am @@ -269,11 +269,11 @@ libsigrok_la_SOURCES += \ src/hardware/fluke-dmm/fluke.c \ src/hardware/fluke-dmm/api.c endif -if HW_FT2232H +if HW_FTDI_LA libsigrok_la_SOURCES += \ - src/hardware/ft2232h/protocol.h \ - src/hardware/ft2232h/protocol.c \ - src/hardware/ft2232h/api.c + src/hardware/ftdi-la/protocol.h \ + src/hardware/ftdi-la/protocol.c \ + src/hardware/ftdi-la/api.c endif if HW_FX2LAFW libsigrok_la_SOURCES += \ diff --git a/configure.ac b/configure.ac index f1fc9a8a..8a41a28c 100644 --- a/configure.ac +++ b/configure.ac @@ -232,7 +232,7 @@ SR_DRIVER([Conrad DIGI 35 CPU], [conrad-digi-35-cpu], [libserialport]) SR_DRIVER([DER EE DE-5000], [deree-de5000], [libserialport]) SR_DRIVER([demo], [demo]) SR_DRIVER([Fluke DMM], [fluke-dmm], [libserialport]) -SR_DRIVER([FTDI FT2232H], [ft2232h], [libusb libftdi]) +SR_DRIVER([FTDI LA], [ftdi-la], [libusb libftdi]) SR_DRIVER([fx2lafw], [fx2lafw], [libusb]) SR_DRIVER([GMC MH 1x/2x], [gmc-mh-1x-2x], [libserialport]) SR_DRIVER([GW Instek GDS-800], [gwinstek-gds-800], [libserialport]) diff --git a/src/drivers.c b/src/drivers.c index cfcbd9f9..1f553257 100644 --- a/src/drivers.c +++ b/src/drivers.c @@ -74,8 +74,8 @@ extern SR_PRIV struct sr_dev_driver deree_de5000_driver_info; #ifdef HAVE_HW_FLUKE_DMM extern SR_PRIV struct sr_dev_driver flukedmm_driver_info; #endif -#ifdef HAVE_HW_FT2232H -extern SR_PRIV struct sr_dev_driver ft2232h_driver_info; +#ifdef HAVE_HW_FTDI_LA +extern SR_PRIV struct sr_dev_driver ftdi_la_driver_info; #endif #ifdef HAVE_HW_FX2LAFW extern SR_PRIV struct sr_dev_driver fx2lafw_driver_info; @@ -247,8 +247,8 @@ SR_PRIV struct sr_dev_driver **drivers_lists[] = { #ifdef HAVE_HW_FLUKE_DMM (DRVS) {&flukedmm_driver_info, NULL}, #endif -#ifdef HAVE_HW_FT2232H - (DRVS) {&ft2232h_driver_info, NULL}, +#ifdef HAVE_HW_FTDI_LA + (DRVS) {&ftdi_la_driver_info, NULL}, #endif #ifdef HAVE_HW_FX2LAFW (DRVS) {&fx2lafw_driver_info, NULL}, diff --git a/src/hardware/ft2232h/api.c b/src/hardware/ftdi-la/api.c similarity index 97% rename from src/hardware/ft2232h/api.c rename to src/hardware/ftdi-la/api.c index d2cd3ff3..a4309774 100644 --- a/src/hardware/ft2232h/api.c +++ b/src/hardware/ftdi-la/api.c @@ -21,7 +21,7 @@ #include #include "protocol.h" -SR_PRIV struct sr_dev_driver ft2232h_driver_info; +SR_PRIV struct sr_dev_driver ftdi_la_driver_info; static const uint32_t scanopts[] = { /* TODO: SR_CONF_CONN to be able to specify the USB address. */ @@ -298,7 +298,7 @@ static int config_get(uint32_t key, GVariant **data, return ret; } -static int ft2232h_set_samplerate(struct dev_context *devc) +static int ftdi_la_set_samplerate(struct dev_context *devc) { int ret; @@ -343,7 +343,7 @@ static int config_set(uint32_t key, GVariant *data, if (value < 3600) return SR_ERR_SAMPLERATE; devc->cur_samplerate = value; - return ft2232h_set_samplerate(devc); + return ftdi_la_set_samplerate(devc); default: ret = SR_ERR_NA; } @@ -412,7 +412,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) /* Hook up a dummy handler to receive data from the device. */ sr_session_source_add(sdi->session, -1, G_IO_IN, 0, - ft2232h_receive_data, (void *)sdi); + ftdi_la_receive_data, (void *)sdi); return SR_OK; } @@ -437,9 +437,9 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) return SR_OK; } -SR_PRIV struct sr_dev_driver ft2232h_driver_info = { - .name = "ft2232h", - .longname = "FT2232H", +SR_PRIV struct sr_dev_driver ftdi_la_driver_info = { + .name = "ftdi-la", + .longname = "FTDI LA", .api_version = 1, .init = init, .cleanup = cleanup, diff --git a/src/hardware/ft2232h/protocol.c b/src/hardware/ftdi-la/protocol.c similarity index 97% rename from src/hardware/ft2232h/protocol.c rename to src/hardware/ftdi-la/protocol.c index 0b9f339e..0d71bcb3 100644 --- a/src/hardware/ft2232h/protocol.c +++ b/src/hardware/ftdi-la/protocol.c @@ -38,7 +38,7 @@ static void send_samples(struct dev_context *devc, uint64_t samples_to_send) devc->bytes_received -= samples_to_send; } -SR_PRIV int ft2232h_receive_data(int fd, int revents, void *cb_data) +SR_PRIV int ftdi_la_receive_data(int fd, int revents, void *cb_data) { struct sr_dev_inst *sdi; struct dev_context *devc; diff --git a/src/hardware/ft2232h/protocol.h b/src/hardware/ftdi-la/protocol.h similarity index 87% rename from src/hardware/ft2232h/protocol.h rename to src/hardware/ftdi-la/protocol.h index 49174d0d..4c440eaa 100644 --- a/src/hardware/ft2232h/protocol.h +++ b/src/hardware/ftdi-la/protocol.h @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -#ifndef LIBSIGROK_HARDWARE_FT2232H_PROTOCOL_H -#define LIBSIGROK_HARDWARE_FT2232H_PROTOCOL_H +#ifndef LIBSIGROK_HARDWARE_FTID_LA_PROTOCOL_H +#define LIBSIGROK_HARDWARE_FTID_LA_PROTOCOL_H #include #include #include #include "libsigrok-internal.h" -#define LOG_PREFIX "ft2232h" +#define LOG_PREFIX "ftdi-la" #define DATA_BUF_SIZE (16 * 1024) @@ -51,6 +51,6 @@ struct dev_context { void *cb_data; }; -SR_PRIV int ft2232h_receive_data(int fd, int revents, void *cb_data); +SR_PRIV int ftdi_la_receive_data(int fd, int revents, void *cb_data); #endif