Get rid of obsolete SR_DI_NUM_PROBES and SR_DI_PROBE_NAMES.

[libsigrok.git] / hardware / zeroplus-logic-cube / zeroplus.c

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 56b020228bbf2251308a797b17b663df86f7679f..f2fcac63c182a54ba38b1c4ca60c7d631b20c0b3 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -85,28 +85,14 @@ static const int hwcaps[] = {
  * We currently ignore other untested/unsupported devices here.
  */
 static const char *probe_names[NUM_PROBES + 1] = {
-       "A0",
-       "A1",
-       "A2",
-       "A3",
-       "A4",
-       "A5",
-       "A6",
-       "A7",
-       "B0",
-       "B1",
-       "B2",
-       "B3",
-       "B4",
-       "B5",
-       "B6",
-       "B7",
+       "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7",
+       "B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7",
        NULL,
 };
 
 /* List of struct sr_dev_inst, maintained by dev_open()/dev_close(). */
 SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info;
-static struct sr_dev_driver *zdi = &zeroplus_logic_cube_driver_info;
+static struct sr_dev_driver *di = &zeroplus_logic_cube_driver_info;
 
 /*
  * The hardware supports more samplerates than these, but these are the
@@ -277,7 +263,7 @@ static int clear_instances(void)
        struct drv_context *drvc;
        struct dev_context *devc;
 
-       drvc = zdi->priv;
+       drvc = di->priv;
        for (l = drvc->instances; l; l = l->next) {
                sdi = l->data;
                if (!(devc = sdi->priv)) {
@@ -310,7 +296,7 @@ static int hw_init(struct sr_context *sr_ctx)
                return SR_ERR_MALLOC;
        }
        drvc->sr_ctx = sr_ctx;
-       zdi->priv = drvc;
+       di->priv = drvc;
 
        return SR_OK;
 }
@@ -329,7 +315,7 @@ static GSList *hw_scan(GSList *options)
 
        (void)options;
 
-       drvc = zdi->priv;
+       drvc = di->priv;
        devices = NULL;
 
        clear_instances();
@@ -364,7 +350,7 @@ static GSList *hw_scan(GSList *options)
                        sr_err("zp: %s: sr_dev_inst_new failed", __func__);
                        return NULL;
                }
-               sdi->driver = zdi;
+               sdi->driver = di;
 
                /* Allocate memory for our private driver context. */
                if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
@@ -409,7 +395,7 @@ static GSList *hw_dev_list(void)
 {
        struct drv_context *drvc;
 
-       drvc = zdi->priv;
+       drvc = di->priv;
 
        return drvc->instances;
 }
@@ -417,7 +403,7 @@ static GSList *hw_dev_list(void)
 static int hw_dev_open(struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
-       struct drv_context *drvc = zdi->priv;
+       struct drv_context *drvc = di->priv;
        libusb_device **devlist, *dev;
        struct libusb_device_descriptor des;
        int device_count, ret, i;
@@ -535,7 +521,7 @@ static int hw_cleanup(void)
 {
        struct drv_context *drvc;
 
-       if (!(drvc = zdi->priv))
+       if (!(drvc = di->priv))
                return SR_OK;
 
        clear_instances();
@@ -552,19 +538,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->num_channels);
-                       sr_spew("zp: %s: Returning number of channels: %d.",
-                                       __func__, devc->num_channels);
-               } else
-                       return SR_ERR;
-               break;
-       case SR_DI_PROBE_NAMES:
-               *data = probe_names;
-               sr_spew("zp: %s: Returning probenames.", __func__);
-               break;
        case SR_DI_SAMPLERATES:
                *data = &samplerates;
                sr_spew("zp: %s: Returning samplerates.", __func__);