X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flink-mso19%2Flink-mso19.c;h=63b910318615002dfc653225232898ce5e50e464;hb=e48846b1d211ce88e5ad427c034e0a2fb43bbe37;hp=05729556495d0265204ead4aba3ce36a1b043dc4;hpb=1483577eed7ac27b8107b1b76e1adc5369745c29;p=libsigrok.git diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c index 05729556..63b91031 100644 --- a/hardware/link-mso19/link-mso19.c +++ b/hardware/link-mso19/link-mso19.c @@ -36,41 +36,66 @@ #define USB_PRODUCT "f190" static int capabilities[] = { - HWCAP_LOGIC_ANALYZER, -// HWCAP_OSCILLOSCOPE, -// HWCAP_PAT_GENERATOR, + SR_HWCAP_LOGIC_ANALYZER, +// SR_HWCAP_OSCILLOSCOPE, +// SR_HWCAP_PAT_GENERATOR, - HWCAP_SAMPLERATE, -// HWCAP_CAPTURE_RATIO, - HWCAP_LIMIT_SAMPLES, + SR_HWCAP_SAMPLERATE, +// SR_HWCAP_CAPTURE_RATIO, + SR_HWCAP_LIMIT_SAMPLES, 0, }; 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 int mso_send_control_message(struct sigrok_device_instance *sdi, +static int mso_send_control_message(struct sr_device_instance *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)); @@ -86,19 +111,19 @@ static int mso_send_control_message(struct sigrok_device_instance *sdi, while (w < s) { 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_device_instance *sdi) { struct mso *mso = sdi->priv; uint16_t ops[2]; @@ -110,7 +135,7 @@ static int mso_reset_adc(struct sigrok_device_instance *sdi) 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_device_instance *sdi) { struct mso *mso = sdi->priv; uint16_t ops[1]; @@ -121,7 +146,7 @@ static int mso_reset_fsm(struct sigrok_device_instance *sdi) 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_device_instance *sdi, int state) { struct mso *mso = sdi->priv; uint16_t ops[1]; @@ -134,7 +159,7 @@ static int mso_toggle_led(struct sigrok_device_instance *sdi, int state) return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops)); } -static int mso_check_trigger(struct sigrok_device_instance *sdi, +static int mso_check_trigger(struct sr_device_instance *sdi, uint8_t *info) { uint16_t ops[] = { mso_trans(REG_TRIGGER, 0) }; @@ -142,25 +167,25 @@ static int mso_check_trigger(struct sigrok_device_instance *sdi, int ret; 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 (serial_read(sdi->serial->fd, buf, 1) != 1) /* FIXME: Need timeout */ - ret = SIGROK_ERR; + ret = SR_ERR; *info = buf[0]; return ret; } -static int mso_read_buffer(struct sigrok_device_instance *sdi) +static int mso_read_buffer(struct sr_device_instance *sdi) { uint16_t ops[] = { mso_trans(REG_BUFFER, 0) }; 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_device_instance *sdi) { struct mso *mso = sdi->priv; uint16_t ops[] = { @@ -172,7 +197,7 @@ static int mso_arm(struct sigrok_device_instance *sdi) 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_device_instance *sdi) { struct mso *mso = sdi->priv; uint16_t ops[] = { @@ -183,7 +208,7 @@ static int mso_force_capture(struct sigrok_device_instance *sdi) 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_device_instance *sdi, uint16_t val) { struct mso *mso = sdi->priv; uint16_t ops[] = { @@ -195,7 +220,7 @@ static int mso_dac_out(struct sigrok_device_instance *sdi, uint16_t 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_device_instance *sdi, uint16_t val) { uint16_t ops[] = { mso_trans(REG_CLKRATE1, (val >> 8) & 0xff), @@ -205,18 +230,18 @@ static int mso_clkrate_out(struct sigrok_device_instance *sdi, uint16_t val) return mso_send_control_message(sdi, ARRAY_AND_SIZE(ops)); } -static int mso_configure_rate(struct sigrok_device_instance *sdi, +static int mso_configure_rate(struct sr_device_instance *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; ret = mso_clkrate_out(sdi, rate_map[i].val); - if (ret == SIGROK_OK) + if (ret == SR_OK) mso->cur_rate = rate; return ret; } @@ -224,7 +249,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 - @@ -232,7 +256,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_device_instance *sdi) { struct mso *mso = sdi->priv; uint16_t ops[16]; @@ -284,7 +308,7 @@ 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)); + mso->dso_trigger_width / SR_HZ_TO_NS(mso->cur_rate)); ops[5] = mso_trans(15, (2 | mso->slowmode)); /* FIXME SPI/I2C Triggers */ @@ -302,7 +326,7 @@ static int mso_configure_trigger(struct sigrok_device_instance *sdi) 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_device_instance *sdi) { struct mso *mso = sdi->priv; @@ -325,7 +349,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; @@ -345,12 +369,12 @@ 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 *deviceinfo) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; int devcnt = 0; struct udev *udev; struct udev_enumerate *enumerate; @@ -366,7 +390,7 @@ static int hw_init(char *deviceinfo) */ udev = udev_new(); if (!udev) { - g_warning("Failed to initialize udev."); + sr_warn("Failed to initialize udev."); goto ret; } enumerate = udev_enumerate_new(udev); @@ -386,8 +410,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_warn("Unable to find parent usb device for %s", + sysname); continue; } @@ -405,7 +429,7 @@ 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_warn("Could not parse iProduct: %s", iProduct); continue; } strncpy(product, iProduct, s); @@ -413,30 +437,30 @@ static int hw_init(char *deviceinfo) 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_warn("Invalid iSerial: %s", iSerial); goto err_free_mso; } /* hardware initial state */ mso->ctlbase = 0; - sdi = sigrok_device_instance_new(devcnt, ST_INITIALIZING, + sdi = sr_device_instance_new(devcnt, SR_ST_INITIALIZING, manufacturer, product, hwrev); if (!sdi) { - g_warning("Unable to create device instance for %s", - sysname); + sr_warn("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_device_instance_new(path, -1); if (!sdi->serial) goto err_device_instance_free; @@ -445,7 +469,7 @@ static int hw_init(char *deviceinfo) continue; err_device_instance_free: - sigrok_device_instance_free(sdi); + sr_device_instance_free(sdi); err_free_mso: free(mso); } @@ -460,7 +484,7 @@ ret: static void hw_cleanup(void) { GSList *l; - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; /* Properly close all devices. */ for (l = device_instances; l; l = l->next) { @@ -469,7 +493,7 @@ static void hw_cleanup(void) serial_close(sdi->serial->fd); if (sdi->priv != NULL) free(sdi->priv); - sigrok_device_instance_free(sdi); + sr_device_instance_free(sdi); } g_slist_free(device_instances); device_instances = NULL; @@ -477,11 +501,11 @@ static void hw_cleanup(void) static int hw_opendev(int device_index) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *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_get_device_instance(device_instances, device_index))) return ret; mso = sdi->priv; @@ -490,69 +514,74 @@ 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_warn("trigger state: %c", 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_warn("trigger state: %c", mso->trigger_state); // ret = mso_reset_fsm(sdi); -// if (ret != SIGROK_OK) +// if (ret != SR_OK) // return ret; -// return SIGROK_ERR; - return SIGROK_OK; +// return SR_ERR; + return SR_OK; } -static void hw_closedev(int device_index) +static int hw_closedev(int device_index) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) - return; + if (!(sdi = sr_get_device_instance(device_instances, device_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; } + + return SR_OK; } static void *hw_get_device_info(int device_index, int device_info_id) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; struct mso *mso; void *info = NULL; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) + if (!(sdi = sr_get_device_instance(device_instances, device_index))) return NULL; mso = sdi->priv; switch (device_info_id) { - case DI_INSTANCE: + case SR_DI_INSTANCE: info = sdi; break; - case DI_NUM_PROBES: /* FIXME: How to report analog probe? */ + case SR_DI_NUM_PROBES: /* FIXME: How to report analog probe? */ info = GINT_TO_POINTER(8); break; - case DI_SAMPLERATES: + 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; } @@ -561,10 +590,10 @@ static void *hw_get_device_info(int device_index, int device_info_id) static int hw_get_status(int device_index) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) - return ST_NOT_FOUND; + if (!(sdi = sr_get_device_instance(device_instances, device_index))) + return SR_ST_NOT_FOUND; return sdi->status; } @@ -576,20 +605,19 @@ static int *hw_get_capabilities(void) static int hw_set_configuration(int device_index, int capability, void *value) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *sdi; - if (!(sdi = get_sigrok_device_instance(device_instances, device_index))) - return SIGROK_ERR; + if (!(sdi = sr_get_device_instance(device_instances, device_index))) + return SR_ERR; switch (capability) { - case HWCAP_SAMPLERATE: + 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 '!' @@ -603,9 +631,9 @@ 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_device_instance *sdi = user_data; struct mso *mso = sdi->priv; - struct datafeed_packet packet; + struct sr_datafeed_packet packet; uint8_t in[1024], logic_out[1024]; double analog_out[1024]; size_t i, s; @@ -645,40 +673,40 @@ static int receive_data(int fd, int revents, void *user_data) ((mso->buffer[i * 3 + 2] & 0x3f) << 2); } - packet.type = DF_LOGIC; + packet.type = SR_DF_LOGIC; packet.length = 1024; packet.unitsize = 1; packet.payload = logic_out; - session_bus(mso->session_id, &packet); + sr_session_bus(mso->session_id, &packet); - packet.type = DF_ANALOG; + 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) { - struct sigrok_device_instance *sdi; + struct sr_device_instance *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_get_device_instance(device_instances, device_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 */ @@ -686,20 +714,20 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) // mso->ctlbase |= 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 */ @@ -709,32 +737,32 @@ 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); + 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.length = sizeof(struct sr_datafeed_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_logic_probes = 8; - header.protocol_id = PROTO_RAW; - session_bus(session_device_id, &packet); + header.protocol_id = SR_PROTO_RAW; + sr_session_bus(session_device_id, &packet); return ret; } @@ -742,22 +770,22 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) /* FIXME */ static void hw_stop_acquisition(int device_index, gpointer session_device_id) { - struct datafeed_packet packet; + struct sr_datafeed_packet packet; device_index = device_index; - packet.type = DF_END; - session_bus(session_device_id, &packet); + packet.type = SR_DF_END; + sr_session_bus(session_device_id, &packet); } -struct device_plugin link_mso19_plugin_info = { +struct sr_device_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, + .opendev = hw_opendev, + .closedev = hw_closedev, .get_device_info = hw_get_device_info, .get_status = hw_get_status, .get_capabilities = hw_get_capabilities,