X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flink-mso19%2Flink-mso19.c;h=fdcc0a48da48837a3dac14cde01a73164c014e29;hb=e42ef08dba163e8c9ef933347732d9e8c58ab399;hp=3c2be11dc717620493b289673097630465261337;hpb=59df0c77e2906323290544ea62801831818ec096;p=libsigrok.git diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c index 3c2be11d..fdcc0a48 100644 --- a/hardware/link-mso19/link-mso19.c +++ b/hardware/link-mso19/link-mso19.c @@ -26,15 +26,17 @@ #include #include #include -#include #include -#include +#include "sigrok.h" +#include "sigrok-internal.h" #include "config.h" #include "link-mso19.h" #define USB_VENDOR "3195" #define USB_PRODUCT "f190" +#define NUM_PROBES 8 + static int capabilities[] = { SR_HWCAP_LOGIC_ANALYZER, // SR_HWCAP_OSCILLOSCOPE, @@ -46,10 +48,22 @@ static int capabilities[] = { 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, + SR_HZ(100), + SR_HZ(200), + SR_HZ(500), SR_KHZ(1), SR_KHZ(2), SR_KHZ(5), @@ -71,9 +85,9 @@ static uint64_t supported_samplerates[] = { }; static struct sr_samplerates samplerates = { - 100, + SR_HZ(100), SR_MHZ(200), - 0, + SR_HZ(0), supported_samplerates, }; @@ -86,12 +100,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)); @@ -114,7 +132,7 @@ static int mso_send_control_message(struct sr_device_instance *sdi, } ret = SR_OK; free: - free(buf); + g_free(buf); ret: return ret; } @@ -386,7 +404,7 @@ static int hw_init(const 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); @@ -406,8 +424,8 @@ static int hw_init(const 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; } @@ -425,7 +443,7 @@ static int hw_init(const 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); @@ -433,13 +451,13 @@ static int hw_init(const 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 */ @@ -448,8 +466,8 @@ static int hw_init(const char *deviceinfo) 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; } @@ -518,14 +536,14 @@ static int hw_opendev(int device_index) /* 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) @@ -535,18 +553,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 = SR_ST_INACTIVE; } + + return SR_OK; } static void *hw_get_device_info(int device_index, int device_info_id) @@ -564,7 +587,10 @@ static void *hw_get_device_info(int device_index, int device_info_id) info = sdi; break; case SR_DI_NUM_PROBES: /* FIXME: How to report analog probe? */ - info = GINT_TO_POINTER(8); + info = GINT_TO_POINTER(NUM_PROBES); + break; + case SR_DI_PROBE_NAMES: + info = probe_names; break; case SR_DI_SAMPLERATES: info = &samplerates; @@ -625,6 +651,7 @@ static int receive_data(int fd, int revents, void *user_data) struct sr_device_instance *sdi = user_data; struct mso *mso = sdi->priv; 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; @@ -665,17 +692,20 @@ static int receive_data(int fd, int revents, void *user_data) } packet.type = SR_DF_LOGIC; - packet.length = 1024; - packet.unitsize = 1; - packet.payload = logic_out; + packet.payload = &logic; + logic.length = 1024; + logic.unitsize = 1; + logic.data = logic_out; sr_session_bus(mso->session_id, &packet); + // 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; - sr_session_bus(mso->session_id, &packet); + sr_session_bus(mso->session_id, &packet); */ packet.type = SR_DF_END; sr_session_bus(mso->session_id, &packet); @@ -745,14 +775,12 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id) sr_source_add(sdi->serial->fd, G_IO_IN, -1, receive_data, sdi); 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 = SR_PROTO_RAW; sr_session_bus(session_device_id, &packet); return ret; @@ -775,8 +803,8 @@ struct sr_device_plugin link_mso19_plugin_info = { .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,