drivers: use new sr_config struct

[libsigrok.git] / hardware / fx2lafw / fx2lafw.c

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index da72399c2230786d99a89ee68733da0846e9cba4..304873ae9f3a8f9b6b8ac7a4ab7bd93d325768d1 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -267,9 +267,12 @@ static int fx2lafw_dev_open(struct sr_dev_inst *sdi)
 
                sdi->status = SR_ST_ACTIVE;
                sr_info("Opened device %d on %d.%d, "
-                       "interface %d, firmware %d.%d, REVID %d.",
+                       "interface %d, firmware %d.%d.",
                        sdi->index, devc->usb->bus, devc->usb->address,
-                       USB_INTERFACE, vi.major, vi.minor, revid);
+                       USB_INTERFACE, vi.major, vi.minor);
+
+               sr_info("Detected REVID=%d, it's a Cypress CY7C68013%s.",
+                       revid, (revid != 1) ? " (FX2)" : "A (FX2LP)");
 
                break;
        }
@@ -609,18 +612,6 @@ static int hw_info_get(int info_id, const void **data,
        case SR_DI_HWCAPS:
                *data = hwcaps;
                break;
-       case SR_DI_NUM_PROBES:
-               if (sdi) {
-                       devc = sdi->priv;
-                       *data = GINT_TO_POINTER(
-                               (devc->profile->dev_caps & DEV_CAPS_16BIT) ?
-                               16 : 8);
-               } else
-                       return SR_ERR;
-               break;
-       case SR_DI_PROBE_NAMES:
-               *data = probe_names;
-               break;
        case SR_DI_SAMPLERATES:
                *data = &samplerates;
                break;
@@ -937,7 +928,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 {
        struct sr_datafeed_packet packet;
        struct sr_datafeed_header header;
-       struct sr_datafeed_meta_logic meta;
        struct dev_context *devc;
        struct drv_context *drvc;
        struct libusb_transfer *transfer;
@@ -1007,13 +997,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        gettimeofday(&header.starttime, NULL);
        sr_session_send(cb_data, &packet);
 
-       /* Send metadata about the SR_DF_LOGIC packets to come. */
-       packet.type = SR_DF_META_LOGIC;
-       packet.payload = &meta;
-       meta.samplerate = devc->cur_samplerate;
-       meta.num_probes = devc->sample_wide ? 16 : 8;
-       sr_session_send(cb_data, &packet);
-
        if ((ret = command_start_acquisition(devc->usb->devhdl,
                devc->cur_samplerate, devc->sample_wide)) != SR_OK) {
                abort_acquisition(devc);