X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flink-mso19%2Flink-mso19.c;h=91e60f670be0743531014f5b2b9aeec6d9aa552c;hb=5097b0d0912165429aceddb5febbf68467b623f5;hp=ba50a8ac8306b6a13f2ed2897316b1632bce422b;hpb=8a839354c122b533181fe02da82d0110a44911cf;p=libsigrok.git diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c index ba50a8ac..91e60f67 100644 --- a/hardware/link-mso19/link-mso19.c +++ b/hardware/link-mso19/link-mso19.c @@ -2,6 +2,7 @@ * This file is part of the sigrok project. * * Copyright (C) 2011 Daniel Ribeiro + * Copyright (C) 2012 Renato Caldas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,50 +27,89 @@ #include #include #include -#include #include -#include "config.h" +#include "sigrok.h" +#include "sigrok-internal.h" #include "link-mso19.h" #define USB_VENDOR "3195" #define USB_PRODUCT "f190" -static int capabilities[] = { - HWCAP_LOGIC_ANALYZER, -// HWCAP_OSCILLOSCOPE, -// HWCAP_PAT_GENERATOR, +#define NUM_PROBES 8 - HWCAP_SAMPLERATE, -// HWCAP_CAPTURE_RATIO, - HWCAP_LIMIT_SAMPLES, +static int hwcaps[] = { + SR_HWCAP_LOGIC_ANALYZER, +// SR_HWCAP_OSCILLOSCOPE, +// SR_HWCAP_PAT_GENERATOR, + + SR_HWCAP_SAMPLERATE, +// SR_HWCAP_CAPTURE_RATIO, + SR_HWCAP_LIMIT_SAMPLES, 0, }; +static const char *probe_names[NUM_PROBES + 1] = { + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + NULL, +}; + static uint64_t supported_samplerates[] = { - 100, 200, 500, KHZ(1), KHZ(2), KHZ(5), KHZ(10), KHZ(20), - KHZ(50), KHZ(100), KHZ(200), KHZ(500), MHZ(1), MHZ(2), MHZ(5), - MHZ(10), MHZ(20), MHZ(50), MHZ(100), MHZ(200), 0 + SR_HZ(100), + SR_HZ(200), + SR_HZ(500), + SR_KHZ(1), + SR_KHZ(2), + SR_KHZ(5), + SR_KHZ(10), + SR_KHZ(20), + SR_KHZ(50), + SR_KHZ(100), + SR_KHZ(200), + SR_KHZ(500), + SR_MHZ(1), + SR_MHZ(2), + SR_MHZ(5), + SR_MHZ(10), + SR_MHZ(20), + SR_MHZ(50), + SR_MHZ(100), + SR_MHZ(200), + 0, }; -static struct samplerates samplerates = { - 100, MHZ(200), 0, supported_samplerates, +static struct sr_samplerates samplerates = { + SR_HZ(100), + SR_MHZ(200), + SR_HZ(0), + supported_samplerates, }; -static GSList *device_instances = NULL; +static GSList *dev_insts = NULL; -static int mso_send_control_message(struct sigrok_device_instance *sdi, - uint16_t payload[], int n) +static int mso_send_control_message(struct sr_dev_inst *sdi, + uint16_t payload[], int n) { int fd = sdi->serial->fd; int i, w, ret, s = n * 2 + sizeof(mso_head) + sizeof(mso_foot); char *p, *buf; + ret = SR_ERR; + if (fd < 0) goto ret; - buf = malloc(s); - if (!buf) + if (!(buf = g_try_malloc(s))) { + sr_err("mso19: %s: buf malloc failed", __func__); + ret = SR_ERR_MALLOC; goto ret; + } p = buf; memcpy(p, mso_head, sizeof(mso_head)); @@ -83,139 +123,147 @@ static int mso_send_control_message(struct sigrok_device_instance *sdi, w = 0; while (w < s) { - ret = write(fd, buf + w, s - w); + ret = serial_write(fd, buf + w, s - w); if (ret < 0) { - ret = SIGROK_ERR; + ret = SR_ERR; goto free; } w += ret; } - ret = SIGROK_OK; + ret = SR_OK; free: - free(buf); + g_free(buf); ret: return ret; } -static int mso_reset_adc(struct sigrok_device_instance *sdi) +static int mso_reset_adc(struct sr_dev_inst *sdi) { struct mso *mso = sdi->priv; uint16_t ops[2]; - ops[0] = mso_trans(REG_CTL, (mso->ctlbase | BIT_CTL_RESETADC)); - ops[1] = mso_trans(REG_CTL, mso->ctlbase); - mso->ctlbase |= BIT_CTL_ADC_UNKNOWN4; + ops[0] = mso_trans(REG_CTL1, (mso->ctlbase1 | BIT_CTL1_RESETADC)); + ops[1] = mso_trans(REG_CTL1, mso->ctlbase1); + mso->ctlbase1 |= BIT_CTL1_ADC_UNKNOWN4; + sr_dbg("mso19: Requesting ADC reset"); return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops)); } -static int mso_reset_fsm(struct sigrok_device_instance *sdi) +static int mso_reset_fsm(struct sr_dev_inst *sdi) { struct mso *mso = sdi->priv; uint16_t ops[1]; - mso->ctlbase |= BIT_CTL_RESETFSM; - ops[0] = mso_trans(REG_CTL, mso->ctlbase); + mso->ctlbase1 |= BIT_CTL1_RESETFSM; + ops[0] = mso_trans(REG_CTL1, mso->ctlbase1); + sr_dbg("mso19: Requesting ADC reset"); return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops)); } -static int mso_toggle_led(struct sigrok_device_instance *sdi, int state) +static int mso_toggle_led(struct sr_dev_inst *sdi, int state) { struct mso *mso = sdi->priv; uint16_t ops[1]; - mso->ctlbase &= BIT_CTL_LED; + mso->ctlbase1 &= ~BIT_CTL1_LED; if (state) - mso->ctlbase |= BIT_CTL_LED; - ops[0] = mso_trans(REG_CTL, mso->ctlbase); + mso->ctlbase1 |= BIT_CTL1_LED; + ops[0] = mso_trans(REG_CTL1, mso->ctlbase1); + sr_dbg("mso19: Requesting LED toggle"); return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops)); } -static int mso_check_trigger(struct sigrok_device_instance *sdi, - uint8_t *info) +static int mso_check_trigger(struct sr_dev_inst *sdi, uint8_t *info) { uint16_t ops[] = { mso_trans(REG_TRIGGER, 0) }; char buf[1]; int ret; + sr_dbg("mso19: Requesting trigger state"); ret = mso_send_control_message(sdi, ARRAY_AND_SIZE(ops)); - if (info == NULL || ret != SIGROK_OK) + if (info == NULL || ret != SR_OK) return ret; buf[0] = 0; - if (read(sdi->serial->fd, buf, 1) != 1) /* FIXME: Need timeout */ - ret = SIGROK_ERR; + if (serial_read(sdi->serial->fd, buf, 1) != 1) /* FIXME: Need timeout */ + ret = SR_ERR; *info = buf[0]; + sr_dbg("mso19: Trigger state is: 0x%x", *info); return ret; } -static int mso_read_buffer(struct sigrok_device_instance *sdi) +static int mso_read_buffer(struct sr_dev_inst *sdi) { uint16_t ops[] = { mso_trans(REG_BUFFER, 0) }; + sr_dbg("mso19: Requesting buffer dump"); return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops)); } -static int mso_arm(struct sigrok_device_instance *sdi) +static int mso_arm(struct sr_dev_inst *sdi) { struct mso *mso = sdi->priv; uint16_t ops[] = { - mso_trans(REG_CTL, mso->ctlbase | BIT_CTL_RESETFSM), - mso_trans(REG_CTL, mso->ctlbase | BIT_CTL_ARM), - mso_trans(REG_CTL, mso->ctlbase), + mso_trans(REG_CTL1, mso->ctlbase1 | BIT_CTL1_RESETFSM), + mso_trans(REG_CTL1, mso->ctlbase1 | BIT_CTL1_ARM), + mso_trans(REG_CTL1, mso->ctlbase1), }; + sr_dbg("mso19: Requesting trigger arm"); return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops)); } -static int mso_force_capture(struct sigrok_device_instance *sdi) +static int mso_force_capture(struct sr_dev_inst *sdi) { struct mso *mso = sdi->priv; uint16_t ops[] = { - mso_trans(REG_CTL, mso->ctlbase | 8), - mso_trans(REG_CTL, mso->ctlbase), + mso_trans(REG_CTL1, mso->ctlbase1 | 8), + mso_trans(REG_CTL1, mso->ctlbase1), }; + sr_dbg("mso19: Requesting forced capture"); return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops)); } -static int mso_dac_out(struct sigrok_device_instance *sdi, uint16_t val) +static int mso_dac_out(struct sr_dev_inst *sdi, uint16_t val) { struct mso *mso = sdi->priv; uint16_t ops[] = { mso_trans(REG_DAC1, (val >> 8) & 0xff), mso_trans(REG_DAC2, val & 0xff), - mso_trans(REG_CTL, mso->ctlbase | BIT_CTL_RESETADC), + mso_trans(REG_CTL1, mso->ctlbase1 | BIT_CTL1_RESETADC), }; + sr_dbg("mso19: Setting dac word to 0x%x", val); return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops)); } -static int mso_clkrate_out(struct sigrok_device_instance *sdi, uint16_t val) +static int mso_clkrate_out(struct sr_dev_inst *sdi, uint16_t val) { uint16_t ops[] = { mso_trans(REG_CLKRATE1, (val >> 8) & 0xff), mso_trans(REG_CLKRATE2, val & 0xff), }; + sr_dbg("mso19: Setting clkrate word to 0x%x", val); return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops)); } -static int mso_configure_rate(struct sigrok_device_instance *sdi, - uint32_t rate) +static int mso_configure_rate(struct sr_dev_inst *sdi, uint32_t rate) { struct mso *mso = sdi->priv; unsigned int i; - int ret = SIGROK_ERR; + int ret = SR_ERR; for (i = 0; i < ARRAY_SIZE(rate_map); i++) { if (rate_map[i].rate == rate) { - mso->slowmode = rate_map[i].slowmode; + mso->ctlbase2 = rate_map[i].slowmode; ret = mso_clkrate_out(sdi, rate_map[i].val); - if (ret == SIGROK_OK) + if (ret == SR_OK) mso->cur_rate = rate; return ret; } @@ -223,7 +271,6 @@ static int mso_configure_rate(struct sigrok_device_instance *sdi, return ret; } - static inline uint16_t mso_calc_raw_from_mv(struct mso *mso) { return (uint16_t) (0x200 - @@ -231,7 +278,7 @@ static inline uint16_t mso_calc_raw_from_mv(struct mso *mso) mso->vbit)); } -static int mso_configure_trigger(struct sigrok_device_instance *sdi) +static int mso_configure_trigger(struct sr_dev_inst *sdi) { struct mso *mso = sdi->priv; uint16_t ops[16]; @@ -283,25 +330,27 @@ static int mso_configure_trigger(struct sigrok_device_instance *sdi) ops[2] = mso_trans(3, dso_trigger & 0xff); ops[3] = mso_trans(4, (dso_trigger >> 8) & 0xff); ops[4] = mso_trans(11, - mso->dso_trigger_width / HZ_TO_NS(mso->cur_rate)); - ops[5] = mso_trans(15, (2 | mso->slowmode)); - - /* FIXME SPI/I2C Triggers */ - ops[6] = mso_trans(0, 0); - ops[7] = mso_trans(1, 0); - ops[8] = mso_trans(2, 0); - ops[9] = mso_trans(3, 0); - ops[10] = mso_trans(4, 0xff); - ops[11] = mso_trans(5, 0xff); - ops[12] = mso_trans(6, 0xff); - ops[13] = mso_trans(7, 0xff); - ops[14] = mso_trans(8, mso->trigger_spimode); - ops[15] = mso_trans(15, mso->slowmode); + mso->dso_trigger_width / SR_HZ_TO_NS(mso->cur_rate)); + + /* Select the SPI/I2C trigger config bank */ + ops[5] = mso_trans(REG_CTL2, (mso->ctlbase2 | BITS_CTL2_BANK(2))); + /* Configure the SPI/I2C protocol trigger */ + ops[6] = mso_trans(REG_PT_WORD(0), mso->protocol_trigger.word[0]); + ops[7] = mso_trans(REG_PT_WORD(1), mso->protocol_trigger.word[1]); + ops[8] = mso_trans(REG_PT_WORD(2), mso->protocol_trigger.word[2]); + ops[9] = mso_trans(REG_PT_WORD(3), mso->protocol_trigger.word[3]); + ops[10] = mso_trans(REG_PT_MASK(0), mso->protocol_trigger.mask[0]); + ops[11] = mso_trans(REG_PT_MASK(1), mso->protocol_trigger.mask[1]); + ops[12] = mso_trans(REG_PT_MASK(2), mso->protocol_trigger.mask[2]); + ops[13] = mso_trans(REG_PT_MASK(3), mso->protocol_trigger.mask[3]); + ops[14] = mso_trans(REG_PT_SPIMODE, mso->protocol_trigger.spimode); + /* Select the default config bank */ + ops[15] = mso_trans(REG_CTL2, mso->ctlbase2); return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops)); } -static int mso_configure_threshold_level(struct sigrok_device_instance *sdi) +static int mso_configure_threshold_level(struct sr_dev_inst *sdi) { struct mso *mso = sdi->priv; @@ -309,7 +358,7 @@ static int mso_configure_threshold_level(struct sigrok_device_instance *sdi) } static int mso_parse_serial(const char *iSerial, const char *iProduct, - struct mso *mso) + struct mso *mso) { unsigned int u1, u2, u3, u4, u5, u6; @@ -324,7 +373,7 @@ static int mso_parse_serial(const char *iSerial, const char *iProduct, /* parse iSerial */ if (iSerial[0] != '4' || sscanf(iSerial, "%5u%3u%3u%1u%1u%6u", &u1, &u2, &u3, &u4, &u5, &u6) != 6) - return SIGROK_ERR; + return SR_ERR; mso->hwmodel = u4; mso->hwrev = u5; mso->serial = u6; @@ -344,19 +393,19 @@ static int mso_parse_serial(const char *iSerial, const char *iProduct, * I will not implement it yet */ - return SIGROK_OK; + return SR_OK; } -static int hw_init(char *deviceinfo) +static int hw_init(const char *devinfo) { - struct sigrok_device_instance *sdi; + struct sr_dev_inst *sdi; int devcnt = 0; struct udev *udev; struct udev_enumerate *enumerate; - struct udev_list_entry *devices, *dev_list_entry; + struct udev_list_entry *devs, *dev_list_entry; struct mso *mso; - deviceinfo = deviceinfo; + devinfo = devinfo; /* It's easier to map usb<->serial using udev */ /* @@ -365,14 +414,14 @@ static int hw_init(char *deviceinfo) */ udev = udev_new(); if (!udev) { - g_warning("Failed to initialize udev."); + sr_err("mso19: Failed to initialize udev."); goto ret; } enumerate = udev_enumerate_new(udev); udev_enumerate_add_match_subsystem(enumerate, "usb-serial"); udev_enumerate_scan_devices(enumerate); - devices = udev_enumerate_get_list_entry(enumerate); - udev_list_entry_foreach(dev_list_entry, devices) { + devs = udev_enumerate_get_list_entry(enumerate); + udev_list_entry_foreach(dev_list_entry, devs) { const char *syspath, *sysname, *idVendor, *idProduct, *iSerial, *iProduct; char path[32], manufacturer[32], product[32], hwrev[32]; @@ -385,8 +434,8 @@ static int hw_init(char *deviceinfo) parent = udev_device_get_parent_with_subsystem_devtype( dev, "usb", "usb_device"); if (!parent) { - g_warning("Unable to find parent usb device for %s", - sysname); + sr_err("mso19: Unable to find parent usb device for %s", + sysname); continue; } @@ -404,49 +453,59 @@ static int hw_init(char *deviceinfo) s = strcspn(iProduct, " "); if (s > sizeof(product) || strlen(iProduct) - s > sizeof(manufacturer)) { - g_warning("Could not parse iProduct: %s", iProduct); + sr_err("mso19: Could not parse iProduct: %s", iProduct); continue; } strncpy(product, iProduct, s); product[s] = 0; strcpy(manufacturer, iProduct + s); - sprintf(hwrev, "r%d", mso->hwrev); - mso = malloc(sizeof(struct mso)); - if (!mso) - continue; - memset(mso, 0, sizeof(struct mso)); + if (!(mso = g_try_malloc0(sizeof(struct mso)))) { + sr_err("mso19: %s: mso malloc failed", __func__); + continue; /* TODO: Errors handled correctly? */ + } - if (mso_parse_serial(iSerial, iProduct, mso) != SIGROK_OK) { - g_warning("Invalid iSerial: %s", iSerial); + if (mso_parse_serial(iSerial, iProduct, mso) != SR_OK) { + sr_err("mso19: Invalid iSerial: %s", iSerial); goto err_free_mso; } + sprintf(hwrev, "r%d", mso->hwrev); + /* hardware initial state */ - mso->ctlbase = 0; + mso->ctlbase1 = 0; + { + /* Initialize the protocol trigger configuration */ + int i; + for (i = 0; i < 4; i++) { + mso->protocol_trigger.word[i] = 0; + mso->protocol_trigger.mask[i] = 0xff; + } + mso->protocol_trigger.spimode = 0; + } - sdi = sigrok_device_instance_new(devcnt, ST_INITIALIZING, - manufacturer, product, hwrev); + sdi = sr_dev_inst_new(devcnt, SR_ST_INITIALIZING, + manufacturer, product, hwrev); if (!sdi) { - g_warning("Unable to create device instance for %s", - sysname); + sr_err("mso19: Unable to create device instance for %s", + sysname); goto err_free_mso; } /* save a pointer to our private instance data */ sdi->priv = mso; - sdi->serial = serial_device_instance_new(path, -1); + sdi->serial = sr_serial_dev_inst_new(path, -1); if (!sdi->serial) - goto err_device_instance_free; + goto err_dev_inst_free; - device_instances = g_slist_append(device_instances, sdi); + dev_insts = g_slist_append(dev_insts, sdi); devcnt++; continue; -err_device_instance_free: - sigrok_device_instance_free(sdi); +err_dev_inst_free: + sr_dev_inst_free(sdi); err_free_mso: - free(mso); + g_free(mso); } udev_enumerate_unref(enumerate); @@ -456,31 +515,38 @@ ret: return devcnt; } -static void hw_cleanup(void) +static int hw_cleanup(void) { GSList *l; - struct sigrok_device_instance *sdi; + struct sr_dev_inst *sdi; + int ret; + ret = SR_OK; /* Properly close all devices. */ - for (l = device_instances; l; l = l->next) { - sdi = l->data; + for (l = dev_insts; l; l = l->next) { + if (!(sdi = l->data)) { + /* Log error, but continue cleaning up the rest. */ + sr_err("mso19: %s: sdi was NULL, continuing", __func__); + ret = SR_ERR_BUG; + continue; + } if (sdi->serial->fd != -1) serial_close(sdi->serial->fd); - if (sdi->priv != NULL) - free(sdi->priv); - sigrok_device_instance_free(sdi); + sr_dev_inst_free(sdi); } - g_slist_free(device_instances); - device_instances = NULL; + g_slist_free(dev_insts); + dev_insts = NULL; + + return ret; } -static int hw_opendev(int device_index) +static int hw_opendev(int dev_index) { - struct sigrok_device_instance *sdi; + struct sr_dev_inst *sdi; struct mso *mso; - int ret = SIGROK_ERR; + int ret = SR_ERR; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) + if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) return ret; mso = sdi->priv; @@ -489,106 +555,116 @@ static int hw_opendev(int device_index) return ret; ret = serial_set_params(sdi->serial->fd, 460800, 8, 0, 1, 2); - if (ret != SIGROK_OK) + if (ret != SR_OK) return ret; - sdi->status = ST_ACTIVE; + sdi->status = SR_ST_ACTIVE; /* FIXME: discard serial buffer */ mso_check_trigger(sdi, &mso->trigger_state); -// g_warning("trigger state: %c", mso->trigger_state); + sr_dbg("mso19: trigger state: 0x%x", mso->trigger_state); ret = mso_reset_adc(sdi); - if (ret != SIGROK_OK) + if (ret != SR_OK) return ret; mso_check_trigger(sdi, &mso->trigger_state); -// g_warning("trigger state: %c", mso->trigger_state); + sr_dbg("mso19: trigger state: 0x%x", mso->trigger_state); // ret = mso_reset_fsm(sdi); -// if (ret != SIGROK_OK) +// if (ret != SR_OK) // return ret; -// return SIGROK_ERR; - return SIGROK_OK; + sr_dbg("mso19: Finished %s", __func__); + +// return SR_ERR; + return SR_OK; } -static void hw_closedev(int device_index) +static int hw_closedev(int dev_index) { - struct sigrok_device_instance *sdi; + struct sr_dev_inst *sdi; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) - return; + if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) { + sr_err("mso19: %s: sdi was NULL", __func__); + return SR_ERR; /* TODO: SR_ERR_ARG? */ + } + /* TODO */ if (sdi->serial->fd != -1) { serial_close(sdi->serial->fd); sdi->serial->fd = -1; - sdi->status = ST_INACTIVE; + sdi->status = SR_ST_INACTIVE; } + + sr_dbg("mso19: finished %s", __func__); + return SR_OK; } -static void *hw_get_device_info(int device_index, int device_info_id) +static void *hw_dev_info_get(int dev_index, int dev_info_id) { - struct sigrok_device_instance *sdi; + struct sr_dev_inst *sdi; struct mso *mso; void *info = NULL; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) + if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) return NULL; mso = sdi->priv; - switch (device_info_id) { - case DI_INSTANCE: + switch (dev_info_id) { + case SR_DI_INST: info = sdi; break; - case DI_NUM_PROBES: /* FIXME: How to report analog probe? */ - info = GINT_TO_POINTER(8); + case SR_DI_NUM_PROBES: /* FIXME: How to report analog probe? */ + info = GINT_TO_POINTER(NUM_PROBES); break; - case DI_SAMPLERATES: + case SR_DI_PROBE_NAMES: + info = probe_names; + break; + case SR_DI_SAMPLERATES: info = &samplerates; break; - case DI_TRIGGER_TYPES: + case SR_DI_TRIGGER_TYPES: info = "01"; /* FIXME */ break; - case DI_CUR_SAMPLERATE: + case SR_DI_CUR_SAMPLERATE: info = &mso->cur_rate; break; } return info; } -static int hw_get_status(int device_index) +static int hw_get_status(int dev_index) { - struct sigrok_device_instance *sdi; + struct sr_dev_inst *sdi; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) - return ST_NOT_FOUND; + if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) + return SR_ST_NOT_FOUND; return sdi->status; } -static int *hw_get_capabilities(void) +static int *hw_hwcap_get_all(void) { - return capabilities; + return hwcaps; } -static int hw_set_configuration(int device_index, int capability, void *value) +static int hw_config_set(int dev_index, int hwcap, void *value) { - struct sigrok_device_instance *sdi; + struct sr_dev_inst *sdi; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) - return SIGROK_ERR; + if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) + return SR_ERR; - switch (capability) { - case HWCAP_SAMPLERATE: + switch (hwcap) { + case SR_HWCAP_SAMPLERATE: return mso_configure_rate(sdi, *(uint64_t *) value); - case HWCAP_PROBECONFIG: - case HWCAP_LIMIT_SAMPLES: + case SR_HWCAP_PROBECONFIG: + case SR_HWCAP_LIMIT_SAMPLES: default: - return SIGROK_OK; /* FIXME */ + return SR_OK; /* FIXME */ } - } #define MSO_TRIGGER_UNKNOWN '!' @@ -602,16 +678,17 @@ static int hw_set_configuration(int device_index, int capability, void *value) /* FIXME: Pass errors? */ static int receive_data(int fd, int revents, void *user_data) { - struct sigrok_device_instance *sdi = user_data; + struct sr_dev_inst *sdi = user_data; struct mso *mso = sdi->priv; - struct datafeed_packet packet; + struct sr_datafeed_packet packet; + struct sr_datafeed_logic logic; uint8_t in[1024], logic_out[1024]; double analog_out[1024]; size_t i, s; revents = revents; - s = read(fd, in, sizeof(in)); + s = serial_read(fd, in, sizeof(in)); if (s <= 0) return FALSE; @@ -644,61 +721,64 @@ static int receive_data(int fd, int revents, void *user_data) ((mso->buffer[i * 3 + 2] & 0x3f) << 2); } - packet.type = DF_LOGIC; - packet.length = 1024; - packet.unitsize = 1; - packet.payload = logic_out; - session_bus(mso->session_id, &packet); - + packet.type = SR_DF_LOGIC; + packet.payload = &logic; + logic.length = 1024; + logic.unitsize = 1; + logic.data = logic_out; + sr_session_bus(mso->session_id, &packet); - packet.type = DF_ANALOG; + // Dont bother fixing this yet, keep it "old style" + /* + packet.type = SR_DF_ANALOG; packet.length = 1024; packet.unitsize = sizeof(double); packet.payload = analog_out; - session_bus(mso->session_id, &packet); + sr_session_bus(mso->session_id, &packet); + */ - packet.type = DF_END; - session_bus(mso->session_id, &packet); + packet.type = SR_DF_END; + sr_session_bus(mso->session_id, &packet); return TRUE; } -static int hw_start_acquisition(int device_index, gpointer session_device_id) +static int hw_start_acquisition(int dev_index, gpointer session_dev_id) { - struct sigrok_device_instance *sdi; + struct sr_dev_inst *sdi; struct mso *mso; - struct datafeed_packet packet; - struct datafeed_header header; - int ret = SIGROK_ERR; + struct sr_datafeed_packet packet; + struct sr_datafeed_header header; + int ret = SR_ERR; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) + if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) return ret; mso = sdi->priv; /* FIXME: No need to do full reconfigure every time */ // ret = mso_reset_fsm(sdi); -// if (ret != SIGROK_OK) +// if (ret != SR_OK) // return ret; /* FIXME: ACDC Mode */ - mso->ctlbase &= 0x7f; -// mso->ctlbase |= mso->acdcmode; + mso->ctlbase1 &= 0x7f; +// mso->ctlbase1 |= mso->acdcmode; ret = mso_configure_rate(sdi, mso->cur_rate); - if (ret != SIGROK_OK) + if (ret != SR_OK) return ret; /* set dac offset */ ret = mso_dac_out(sdi, mso->dac_offset); - if (ret != SIGROK_OK) + if (ret != SR_OK) return ret; ret = mso_configure_threshold_level(sdi); - if (ret != SIGROK_OK) + if (ret != SR_OK) return ret; ret = mso_configure_trigger(sdi); - if (ret != SIGROK_OK) + if (ret != SR_OK) return ret; /* FIXME: trigger_position */ @@ -708,59 +788,59 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) /* with trigger */ ret = mso_arm(sdi); - if (ret != SIGROK_OK) + if (ret != SR_OK) return ret; /* without trigger */ // ret = mso_force_capture(sdi); -// if (ret != SIGROK_OK) +// if (ret != SR_OK) // return ret; mso_check_trigger(sdi, &mso->trigger_state); ret = mso_check_trigger(sdi, NULL); - if (ret != SIGROK_OK) + if (ret != SR_OK) return ret; - mso->session_id = session_device_id; - source_add(sdi->serial->fd, G_IO_IN, -1, receive_data, sdi); + mso->session_id = session_dev_id; + sr_source_add(sdi->serial->fd, G_IO_IN, -1, receive_data, sdi); - packet.type = DF_HEADER; - packet.length = sizeof(struct datafeed_header); + packet.type = SR_DF_HEADER; packet.payload = (unsigned char *) &header; header.feed_version = 1; gettimeofday(&header.starttime, NULL); header.samplerate = mso->cur_rate; - header.num_analog_probes = 1; + // header.num_analog_probes = 1; header.num_logic_probes = 8; - header.protocol_id = PROTO_RAW; - session_bus(session_device_id, &packet); + sr_session_bus(session_dev_id, &packet); return ret; } /* FIXME */ -static void hw_stop_acquisition(int device_index, gpointer session_device_id) +static int hw_stop_acquisition(int dev_index, gpointer session_dev_id) { - struct datafeed_packet packet; + struct sr_datafeed_packet packet; + + dev_index = dev_index; - device_index = device_index; + packet.type = SR_DF_END; + sr_session_bus(session_dev_id, &packet); - packet.type = DF_END; - session_bus(session_device_id, &packet); + return SR_OK; } -struct device_plugin link_mso19_plugin_info = { +SR_PRIV struct sr_dev_plugin link_mso19_plugin_info = { .name = "link-mso19", + .longname = "Link Instruments MSO-19", .api_version = 1, .init = hw_init, .cleanup = hw_cleanup, - - .open = hw_opendev, - .close = hw_closedev, - .get_device_info = hw_get_device_info, + .opendev = hw_opendev, + .closedev = hw_closedev, + .dev_info_get = hw_dev_info_get, .get_status = hw_get_status, - .get_capabilities = hw_get_capabilities, - .set_configuration = hw_set_configuration, + .hwcap_get_all = hw_hwcap_get_all, + .config_set = hw_config_set, .start_acquisition = hw_start_acquisition, .stop_acquisition = hw_stop_acquisition, };