X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flink-mso19%2Flink-mso19.c;h=63b910318615002dfc653225232898ce5e50e464;hb=e48846b1d211ce88e5ad427c034e0a2fb43bbe37;hp=1c371cac06b2775c1ea025e982f669730b7c1d2b;hpb=b9c735a275512ce82da7f66275c7cb62eaf66b60;p=libsigrok.git diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c index 1c371cac..63b91031 100644 --- a/hardware/link-mso19/link-mso19.c +++ b/hardware/link-mso19/link-mso19.c @@ -36,24 +36,45 @@ #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; @@ -65,12 +86,16 @@ static int mso_send_control_message(struct sr_device_instance *sdi, 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)); @@ -93,7 +118,7 @@ static int mso_send_control_message(struct sr_device_instance *sdi, } ret = SR_OK; free: - free(buf); + g_free(buf); ret: return ret; } @@ -224,7 +249,6 @@ static int mso_configure_rate(struct sr_device_instance *sdi, return ret; } - static inline uint16_t mso_calc_raw_from_mv(struct mso *mso) { return (uint16_t) (0x200 - @@ -284,7 +308,7 @@ static int mso_configure_trigger(struct sr_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 */ @@ -348,7 +372,7 @@ static int mso_parse_serial(const char *iSerial, const char *iProduct, return SR_OK; } -static int hw_init(char *deviceinfo) +static int hw_init(const char *deviceinfo) { struct sr_device_instance *sdi; int devcnt = 0; @@ -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) != SR_OK) { - g_warning("Invalid iSerial: %s", iSerial); + sr_warn("Invalid iSerial: %s", iSerial); goto err_free_mso; } /* hardware initial state */ mso->ctlbase = 0; - sdi = sr_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; @@ -493,19 +517,19 @@ static int hw_opendev(int device_index) 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 != 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 != SR_OK) @@ -515,18 +539,23 @@ static int hw_opendev(int device_index) return SR_OK; } -static void hw_closedev(int device_index) +static int hw_closedev(int device_index) { struct sr_device_instance *sdi; - if (!(sdi = sr_get_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) @@ -540,19 +569,19 @@ static void *hw_get_device_info(int device_index, int device_info_id) 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; } @@ -564,7 +593,7 @@ static int hw_get_status(int device_index) struct sr_device_instance *sdi; if (!(sdi = sr_get_device_instance(device_instances, device_index))) - return ST_NOT_FOUND; + return SR_ST_NOT_FOUND; return sdi->status; } @@ -582,14 +611,13 @@ static int hw_set_configuration(int device_index, int capability, void *value) 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 SR_OK; /* FIXME */ } - } #define MSO_TRIGGER_UNKNOWN '!' @@ -645,21 +673,21 @@ 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; } @@ -723,9 +751,9 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) 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.type = SR_DF_HEADER; packet.length = sizeof(struct sr_datafeed_header); packet.payload = (unsigned char *) &header; header.feed_version = 1; @@ -733,8 +761,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) 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; } @@ -746,18 +774,18 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id) 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,