* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include <math.h>
#include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
+#include "scpi.h"
#include "protocol.h"
static const uint32_t scanopts[] = {
}
for (i = 0; i < ARRAY_SIZE(supported_models); i++) {
- if (!strcasecmp(hw_info->manufacturer,
+ if (!g_ascii_strcasecmp(hw_info->manufacturer,
supported_models[i].series->vendor->full_name) &&
!strcmp(hw_info->model, supported_models[i].name)) {
model = &supported_models[i];
}
if (i != 3)
break;
- if (n[0] != 0 || n[1] > 2)
- break;
- if (n[1] == 2 && n[2] > 3)
- break;
- sr_dbg("Found DS1000 firmware < 0.2.4, using raw data format.");
- devc->format = FORMAT_RAW;
- } while(0);
+ scpi->firmware_version = n[0] * 100 + n[1] * 10 + n[2];
+ if (scpi->firmware_version < 24) {
+ sr_dbg("Found DS1000 firmware < 0.2.4, using raw data format.");
+ devc->format = FORMAT_RAW;
+ }
+ break;
+ } while (0);
g_strfreev(version);
}
model->analog_channels);
for (i = 0; i < model->analog_channels; i++) {
- if (!(channel_name = g_strdup_printf("CH%d", i + 1)))
- return NULL;
+ channel_name = g_strdup_printf("CH%d", i + 1);
ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel_name);
devc->analog_groups[i] = g_malloc0(sizeof(struct sr_channel_group));
devc->digital_group = g_malloc0(sizeof(struct sr_channel_group));
for (i = 0; i < ARRAY_SIZE(devc->digital_channels); i++) {
- if (!(channel_name = g_strdup_printf("D%d", i)))
- return NULL;
+ channel_name = g_strdup_printf("D%d", i);
ch = sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_name);
g_free(channel_name);
devc->digital_group->channels = g_slist_append(
devc->num_timebases = &timebases[i] - devc->timebases + 1;
}
- for (i = 0; i < NUM_VDIV; i++)
- if (!memcmp(&devc->model->series->min_vdiv, &vdivs[i], sizeof(uint64_t[2]))) {
+ for (i = 0; i < NUM_VDIV; i++) {
+ if (!memcmp(&devc->model->series->min_vdiv,
+ &vdivs[i], sizeof(uint64_t[2]))) {
devc->vdivs = &vdivs[i];
devc->num_vdivs = NUM_VDIV - i;
}
+ }
- if (!(devc->buffer = g_try_malloc(ACQ_BUFFER_SIZE)))
- return NULL;
- if (!(devc->data = g_try_malloc(ACQ_BUFFER_SIZE * sizeof(float))))
- return NULL;
+ devc->buffer = g_malloc(ACQ_BUFFER_SIZE);
+ devc->data = g_malloc(ACQ_BUFFER_SIZE * sizeof(float));
devc->data_source = DATA_SOURCE_LIVE;
static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
- return sr_scpi_scan(di->priv, options, probe_device);
+ return sr_scpi_scan(di->context, options, probe_device);
}
static GSList *dev_list(const struct sr_dev_driver *di)
{
- return ((struct drv_context *)(di->priv))->instances;
+ return ((struct drv_context *)(di->context))->instances;
}
static int dev_open(struct sr_dev_inst *sdi)
unsigned int i;
struct dev_context *devc = NULL;
- if (sdi)
- devc = sdi->priv;
-
if (key == SR_CONF_SCAN_OPTIONS) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
return SR_OK;
- } else if (key == SR_CONF_DEVICE_OPTIONS && cg == NULL) {
+ } else if (key == SR_CONF_DEVICE_OPTIONS && !cg) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
return SR_OK;
.dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};