X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fasix-sigma%2Fasix-sigma.c;h=eaade4bf8077ea9081c619867c1092fdfffba575;hp=d1bca4ef5bab95576357f2feeba3c7dad02c4f1f;hb=c1aae90038456a61d0f9313d34e6107c3440d3e7;hpb=382cb19f29f9fe973199ebaf906264bd2eee5818 diff --git a/src/hardware/asix-sigma/asix-sigma.c b/src/hardware/asix-sigma/asix-sigma.c index d1bca4ef..eaade4bf 100644 --- a/src/hardware/asix-sigma/asix-sigma.c +++ b/src/hardware/asix-sigma/asix-sigma.c @@ -28,7 +28,7 @@ #include #include #include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" #include "asix-sigma.h" @@ -39,7 +39,6 @@ #define USB_MODEL_NAME "SIGMA" SR_PRIV struct sr_dev_driver asix_sigma_driver_info; -static struct sr_dev_driver *di = &asix_sigma_driver_info; static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); /* @@ -71,8 +70,11 @@ static const char *channel_names[] = { "9", "10", "11", "12", "13", "14", "15", "16", }; -static const uint32_t devopts[] = { +static const uint32_t drvopts[] = { SR_CONF_LOGIC_ANALYZER, +}; + +static const uint32_t devopts[] = { SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, SR_CONF_LIMIT_SAMPLES | SR_CONF_SET, SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, @@ -128,13 +130,23 @@ static int sigma_write(void *buf, size_t size, struct dev_context *devc) return ret; } +/* + * NOTE: We chose the buffer size to be large enough to hold any write to the + * device. We still print a message just in case. + */ static int sigma_write_register(uint8_t reg, uint8_t *data, size_t len, struct dev_context *devc) { size_t i; - uint8_t buf[len + 2]; + uint8_t buf[80]; int idx = 0; + if ((len + 2) > sizeof(buf)) { + sr_err("Attempted to write %zu bytes, but buffer is too small.", + len + 2); + return SR_ERR_BUG; + } + buf[idx++] = REG_ADDR_LOW | (reg & 0xf); buf[idx++] = REG_ADDR_HIGH | (reg >> 4); @@ -309,20 +321,19 @@ static void clear_helper(void *priv) ftdi_deinit(&devc->ftdic); } -static int dev_clear(void) +static int dev_clear(const struct sr_dev_driver *di) { return std_dev_clear(di, clear_helper); } -static int init(struct sr_context *sr_ctx) +static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) { return std_init(sr_ctx, di, LOG_PREFIX); } -static GSList *scan(GSList *options) +static GSList *scan(struct sr_dev_driver *di, GSList *options) { struct sr_dev_inst *sdi; - struct sr_channel *ch; struct drv_context *drvc; struct dev_context *devc; GSList *devices; @@ -334,14 +345,11 @@ static GSList *scan(GSList *options) (void)options; - drvc = di->priv; + drvc = di->context; devices = NULL; - if (!(devc = g_try_malloc(sizeof(struct dev_context)))) { - sr_err("%s: devc malloc failed", __func__); - return NULL; - } + devc = g_malloc0(sizeof(struct dev_context)); ftdi_init(&devc->ftdic); @@ -377,20 +385,14 @@ static GSList *scan(GSList *options) devc->use_triggers = 0; /* Register SIGMA device. */ - if (!(sdi = sr_dev_inst_new(SR_ST_INITIALIZING, USB_VENDOR_NAME, - USB_MODEL_NAME, NULL))) { - sr_err("%s: sdi was NULL", __func__); - goto free; - } + sdi = g_malloc0(sizeof(struct sr_dev_inst)); + sdi->status = SR_ST_INITIALIZING; + sdi->vendor = g_strdup(USB_VENDOR_NAME); + sdi->model = g_strdup(USB_MODEL_NAME); sdi->driver = di; - for (i = 0; i < ARRAY_SIZE(channel_names); i++) { - ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, - channel_names[i]); - if (!ch) - return NULL; - sdi->channels = g_slist_append(sdi->channels, ch); - } + for (i = 0; i < ARRAY_SIZE(channel_names); i++) + sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_names[i]); devices = g_slist_append(devices, sdi); drvc->instances = g_slist_append(drvc->instances, sdi); @@ -407,9 +409,9 @@ free: return NULL; } -static GSList *dev_list(void) +static GSList *dev_list(const struct sr_dev_driver *di) { - return ((struct drv_context *)(di->priv))->instances; + return ((struct drv_context *)(di->context))->instances; } /* @@ -427,7 +429,7 @@ static int sigma_fpga_init_bitbang(struct dev_context *devc) 0x01, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, }; - int i, ret, timeout = 10000; + int i, ret, timeout = (10 * 1000); uint8_t data; /* Section 2. part 1), do the FPGA suicide. */ @@ -449,7 +451,7 @@ static int sigma_fpga_init_bitbang(struct dev_context *devc) if (data & (1 << 5)) return 0; /* The D6 was not asserted yet, wait a bit. */ - usleep(10000); + g_usleep(10 * 1000); } return SR_ERR_TIMEOUT; @@ -598,7 +600,7 @@ static int upload_firmware(int firmware_idx, struct dev_context *devc) } /* Four times the speed of sigmalogan - Works well. */ - ret = ftdi_set_baudrate(ftdic, 750000); + ret = ftdi_set_baudrate(ftdic, 750 * 1000); if (ret < 0) { sr_err("ftdi_set_baudrate failed: %s", ftdi_get_error_string(ftdic)); @@ -613,12 +615,12 @@ static int upload_firmware(int firmware_idx, struct dev_context *devc) /* Prepare firmware. */ ret = sigma_fw_2_bitbang(firmware, &buf, &buf_size); if (ret != SR_OK) { - sr_err("An error occured while reading the firmware: %s", + sr_err("An error occurred while reading the firmware: %s", firmware); return ret; } - /* Upload firmare. */ + /* Upload firmware. */ sr_info("Uploading firmware file '%s'.", firmware); sigma_write(buf, buf_size, devc); @@ -790,7 +792,6 @@ static int convert_trigger(const struct sr_dev_inst *sdi) } } - return SR_OK; } @@ -809,9 +810,9 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int cleanup(void) +static int cleanup(const struct sr_dev_driver *di) { - return dev_clear(); + return dev_clear(di); } static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, @@ -892,13 +893,16 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * GVariant *gvar; GVariantBuilder gvb; - (void)sdi; (void)cg; switch (key) { case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); + if (!sdi) + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t)); + else + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); break; case SR_CONF_SAMPLERATE: g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); @@ -952,7 +956,6 @@ static int get_trigger_offset(uint8_t *samples, uint16_t last_sample, return i & 0x7; } - /* * Return the timestamp of "DRAM cluster". */ @@ -1087,7 +1090,7 @@ static int decode_chunk_ts(struct sigma_dram_line *dram_line, trigger_event); } - /* Find in which cluster the trigger occured. */ + /* Find in which cluster the trigger occurred. */ trigger_cluster = trigger_event / EVENTS_PER_CLUSTER; } @@ -1372,7 +1375,7 @@ static int build_basic_trigger(struct triggerlut *lut, struct dev_context *devc) memset(lut, 0, sizeof(struct triggerlut)); - /* Contant for simple triggers. */ + /* Constant for simple triggers. */ lut->m4 = 0xa000; /* Value/mask trigger support. */ @@ -1551,5 +1554,5 @@ SR_PRIV struct sr_dev_driver asix_sigma_driver_info = { .dev_close = dev_close, .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = dev_acquisition_stop, - .priv = NULL, + .context = NULL, };