X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fchronovu-la8%2Fapi.c;h=5b5d3c7bdfd841463041ceab0fa342568f4faad7;hb=afc88319384053b3f2ca4b17706c10ded9c7174b;hp=e1f32acafd0ed5911e4260672c43da854001cc89;hpb=6a2761fd9921830f3724f3d153eee4ad98dbc6b1;p=libsigrok.git diff --git a/hardware/chronovu-la8/api.c b/hardware/chronovu-la8/api.c index e1f32aca..5b5d3c7b 100644 --- a/hardware/chronovu-la8/api.c +++ b/hardware/chronovu-la8/api.c @@ -38,82 +38,95 @@ static const uint16_t usb_pids[] = { }; /* Function prototypes. */ -static int hw_dev_acquisition_stop(int dev_index, void *cb_data); +static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi, + void *cb_data); static void clear_instances(void) { GSList *l; struct sr_dev_inst *sdi; - struct context *ctx; + struct drv_context *drvc; + struct dev_context *devc; + + drvc = cdi->priv; /* Properly close all devices. */ - for (l = cdi->instances; l; l = l->next) { + for (l = drvc->instances; l; l = l->next) { if (!(sdi = l->data)) { /* Log error, but continue cleaning up the rest. */ sr_err("la8: %s: sdi was NULL, continuing", __func__); continue; } if (sdi->priv) { - ctx = sdi->priv; - ftdi_free(ctx->ftdic); - g_free(ctx); + devc = sdi->priv; + ftdi_free(devc->ftdic); + g_free(devc); } sr_dev_inst_free(sdi); } - g_slist_free(cdi->instances); - cdi->instances = NULL; + g_slist_free(drvc->instances); + drvc->instances = NULL; } static int hw_init(void) { + struct drv_context *drvc; - /* Nothing to do. */ + if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) { + sr_err("chronovu-la8: driver context malloc failed."); + return SR_ERR; + } + cdi->priv = drvc; return SR_OK; } static GSList *hw_scan(GSList *options) { - int ret; struct sr_dev_inst *sdi; - struct context *ctx; + struct sr_probe *probe; + struct drv_context *drvc; + struct dev_context *devc; GSList *devices; + unsigned int i; + int ret; (void)options; + drvc = cdi->priv; devices = NULL; - /* Allocate memory for our private driver context. */ - if (!(ctx = g_try_malloc(sizeof(struct context)))) { + /* Allocate memory for our private device context. */ + if (!(devc = g_try_malloc(sizeof(struct dev_context)))) { sr_err("la8: %s: struct context malloc failed", __func__); goto err_free_nothing; } /* Set some sane defaults. */ - ctx->ftdic = NULL; - ctx->cur_samplerate = SR_MHZ(100); /* 100MHz == max. samplerate */ - ctx->limit_msec = 0; - ctx->limit_samples = 0; - ctx->session_dev_id = NULL; - memset(ctx->mangled_buf, 0, BS); - ctx->final_buf = NULL; - ctx->trigger_pattern = 0x00; /* Value irrelevant, see trigger_mask. */ - ctx->trigger_mask = 0x00; /* All probes are "don't care". */ - ctx->trigger_timeout = 10; /* Default to 10s trigger timeout. */ - ctx->trigger_found = 0; - ctx->done = 0; - ctx->block_counter = 0; - ctx->divcount = 0; /* 10ns sample period == 100MHz samplerate */ - ctx->usb_pid = 0; + devc->ftdic = NULL; + devc->cur_samplerate = SR_MHZ(100); /* 100MHz == max. samplerate */ + devc->limit_msec = 0; + devc->limit_samples = 0; + devc->session_dev_id = NULL; + memset(devc->mangled_buf, 0, BS); + devc->final_buf = NULL; + devc->trigger_pattern = 0x00; /* Value irrelevant, see trigger_mask. */ + devc->trigger_mask = 0x00; /* All probes are "don't care". */ + devc->trigger_timeout = 10; /* Default to 10s trigger timeout. */ + devc->trigger_found = 0; + devc->done = 0; + devc->block_counter = 0; + devc->divcount = 0; /* 10ns sample period == 100MHz samplerate */ + devc->usb_pid = 0; /* Allocate memory where we'll store the de-mangled data. */ - if (!(ctx->final_buf = g_try_malloc(SDRAM_SIZE))) { + if (!(devc->final_buf = g_try_malloc(SDRAM_SIZE))) { sr_err("la8: %s: final_buf malloc failed", __func__); - goto err_free_ctx; + goto err_free_devc; } /* Allocate memory for the FTDI context (ftdic) and initialize it. */ - if (!(ctx->ftdic = ftdi_new())) { + if (!(devc->ftdic = ftdi_new())) { sr_err("la8: %s: ftdi_new failed", __func__); goto err_free_final_buf; } @@ -122,16 +135,16 @@ static GSList *hw_scan(GSList *options) for (i = 0; i < ARRAY_SIZE(usb_pids); i++) { sr_dbg("la8: Probing for VID/PID %04x:%04x.", USB_VENDOR_ID, usb_pids[i]); - ret = ftdi_usb_open_desc(ctx->ftdic, USB_VENDOR_ID, + ret = ftdi_usb_open_desc(devc->ftdic, USB_VENDOR_ID, usb_pids[i], USB_DESCRIPTION, NULL); if (ret == 0) { sr_dbg("la8: Found LA8 device (%04x:%04x).", USB_VENDOR_ID, usb_pids[i]); - ctx->usb_pid = usb_pids[i]; + devc->usb_pid = usb_pids[i]; } } - if (ctx->usb_pid == 0) + if (devc->usb_pid == 0) goto err_free_ftdic; /* Register the device with libsigrok. */ @@ -141,75 +154,76 @@ static GSList *hw_scan(GSList *options) sr_err("la8: %s: sr_dev_inst_new failed", __func__); goto err_close_ftdic; } - - sdi->priv = ctx; + sdi->driver = cdi; + sdi->priv = devc; + + for (i = 0; probe_names[i]; i++) { + if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, + probe_names[i]))) + return NULL; + sdi->probes = g_slist_append(sdi->probes, probe); + } devices = g_slist_append(devices, sdi); - cdi->instances = g_slist_append(cdi->instances, sdi); + drvc->instances = g_slist_append(drvc->instances, sdi); sr_spew("la8: Device init successful."); /* Close device. We'll reopen it again when we need it. */ - (void) la8_close(ctx); /* Log, but ignore errors. */ + (void) la8_close(devc); /* Log, but ignore errors. */ return devices; err_close_ftdic: - (void) la8_close(ctx); /* Log, but ignore errors. */ + (void) la8_close(devc); /* Log, but ignore errors. */ err_free_ftdic: - free(ctx->ftdic); /* NOT g_free()! */ + free(devc->ftdic); /* NOT g_free()! */ err_free_final_buf: - g_free(ctx->final_buf); -err_free_ctx: - g_free(ctx); + g_free(devc->final_buf); +err_free_devc: + g_free(devc); err_free_nothing: return NULL; } -static int hw_dev_open(int dev_index) +static int hw_dev_open(struct sr_dev_inst *sdi) { + struct dev_context *devc; int ret; - struct sr_dev_inst *sdi; - struct context *ctx; - - if (!(sdi = sr_dev_inst_get(cdi->instances, dev_index))) { - sr_err("la8: %s: sdi was NULL", __func__); - return SR_ERR_BUG; - } - if (!(ctx = sdi->priv)) { + if (!(devc = sdi->priv)) { sr_err("la8: %s: sdi->priv was NULL", __func__); return SR_ERR_BUG; } sr_dbg("la8: Opening LA8 device (%04x:%04x).", USB_VENDOR_ID, - ctx->usb_pid); + devc->usb_pid); /* Open the device. */ - if ((ret = ftdi_usb_open_desc(ctx->ftdic, USB_VENDOR_ID, - ctx->usb_pid, USB_DESCRIPTION, NULL)) < 0) { + if ((ret = ftdi_usb_open_desc(devc->ftdic, USB_VENDOR_ID, + devc->usb_pid, USB_DESCRIPTION, NULL)) < 0) { sr_err("la8: %s: ftdi_usb_open_desc: (%d) %s", - __func__, ret, ftdi_get_error_string(ctx->ftdic)); - (void) la8_close_usb_reset_sequencer(ctx); /* Ignore errors. */ + __func__, ret, ftdi_get_error_string(devc->ftdic)); + (void) la8_close_usb_reset_sequencer(devc); /* Ignore errors. */ return SR_ERR; } sr_dbg("la8: Device opened successfully."); /* Purge RX/TX buffers in the FTDI chip. */ - if ((ret = ftdi_usb_purge_buffers(ctx->ftdic)) < 0) { + if ((ret = ftdi_usb_purge_buffers(devc->ftdic)) < 0) { sr_err("la8: %s: ftdi_usb_purge_buffers: (%d) %s", - __func__, ret, ftdi_get_error_string(ctx->ftdic)); - (void) la8_close_usb_reset_sequencer(ctx); /* Ignore errors. */ + __func__, ret, ftdi_get_error_string(devc->ftdic)); + (void) la8_close_usb_reset_sequencer(devc); /* Ignore errors. */ goto err_dev_open_close_ftdic; } sr_dbg("la8: FTDI buffers purged successfully."); /* Enable flow control in the FTDI chip. */ - if ((ret = ftdi_setflowctrl(ctx->ftdic, SIO_RTS_CTS_HS)) < 0) { + if ((ret = ftdi_setflowctrl(devc->ftdic, SIO_RTS_CTS_HS)) < 0) { sr_err("la8: %s: ftdi_setflowcontrol: (%d) %s", - __func__, ret, ftdi_get_error_string(ctx->ftdic)); - (void) la8_close_usb_reset_sequencer(ctx); /* Ignore errors. */ + __func__, ret, ftdi_get_error_string(devc->ftdic)); + (void) la8_close_usb_reset_sequencer(devc); /* Ignore errors. */ goto err_dev_open_close_ftdic; } sr_dbg("la8: FTDI flow control enabled successfully."); @@ -222,21 +236,15 @@ static int hw_dev_open(int dev_index) return SR_OK; err_dev_open_close_ftdic: - (void) la8_close(ctx); /* Log, but ignore errors. */ + (void) la8_close(devc); /* Log, but ignore errors. */ return SR_ERR; } -static int hw_dev_close(int dev_index) +static int hw_dev_close(struct sr_dev_inst *sdi) { - struct sr_dev_inst *sdi; - struct context *ctx; + struct dev_context *devc; - if (!(sdi = sr_dev_inst_get(cdi->instances, dev_index))) { - sr_err("la8: %s: sdi was NULL", __func__); - return SR_ERR_BUG; - } - - if (!(ctx = sdi->priv)) { + if (!(devc = sdi->priv)) { sr_err("la8: %s: sdi->priv was NULL", __func__); return SR_ERR_BUG; } @@ -245,8 +253,7 @@ static int hw_dev_close(int dev_index) if (sdi->status == SR_ST_ACTIVE) { sr_dbg("la8: Status ACTIVE, closing device."); - /* TODO: Really ignore errors here, or return SR_ERR? */ - (void) la8_close_usb_reset_sequencer(ctx); /* Ignore errors. */ + (void) la8_close_usb_reset_sequencer(devc); /* Ignore errors. */ } else { sr_spew("la8: Status not ACTIVE, nothing to do."); } @@ -254,7 +261,7 @@ static int hw_dev_close(int dev_index) sdi->status = SR_ST_INACTIVE; sr_dbg("la8: Freeing sample buffer."); - g_free(ctx->final_buf); + g_free(devc->final_buf); return SR_OK; } @@ -262,6 +269,9 @@ static int hw_dev_close(int dev_index) static int hw_cleanup(void) { + if (!cdi->priv) + return SR_OK; + clear_instances(); return SR_OK; @@ -270,12 +280,11 @@ static int hw_cleanup(void) static int hw_info_get(int info_id, const void **data, const struct sr_dev_inst *sdi) { - struct context *ctx; + struct dev_context *devc; switch (info_id) { - case SR_DI_INST: - *data = sdi; - sr_spew("la8: %s: Returning sdi.", __func__); + case SR_DI_HWCAPS: + *data = hwcaps; break; case SR_DI_NUM_PROBES: *data = GINT_TO_POINTER(NUM_PROBES); @@ -298,66 +307,40 @@ static int hw_info_get(int info_id, const void **data, break; case SR_DI_CUR_SAMPLERATE: if (sdi) { - ctx = sdi->priv; - *data = &ctx->cur_samplerate; + devc = sdi->priv; + *data = &devc->cur_samplerate; sr_spew("la8: %s: Returning samplerate: %" PRIu64 "Hz.", - __func__, ctx->cur_samplerate); + __func__, devc->cur_samplerate); } else return SR_ERR; break; + default: + return SR_ERR_ARG; } return SR_OK; } -static int hw_dev_status_get(int dev_index) -{ - struct sr_dev_inst *sdi; - - if (!(sdi = sr_dev_inst_get(cdi->instances, dev_index))) { - sr_err("la8: %s: sdi was NULL, device not found", __func__); - return SR_ST_NOT_FOUND; - } - - sr_dbg("la8: Returning status: %d.", sdi->status); - - return sdi->status; -} - -static const int *hw_hwcap_get_all(void) -{ - sr_spew("la8: Returning list of device capabilities."); - - return hwcaps; -} - -static int hw_dev_config_set(int dev_index, int hwcap, const void *value) +static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, + const void *value) { - struct sr_dev_inst *sdi; - struct context *ctx; + struct dev_context *devc; - if (!(sdi = sr_dev_inst_get(cdi->instances, dev_index))) { - sr_err("la8: %s: sdi was NULL", __func__); - return SR_ERR_BUG; - } - - if (!(ctx = sdi->priv)) { + if (!(devc = sdi->priv)) { sr_err("la8: %s: sdi->priv was NULL", __func__); return SR_ERR_BUG; } - sr_spew("la8: %s: dev_index %d, hwcap %d", __func__, dev_index, hwcap); - switch (hwcap) { case SR_HWCAP_SAMPLERATE: if (set_samplerate(sdi, *(const uint64_t *)value) == SR_ERR) { sr_err("la8: %s: setting samplerate failed.", __func__); return SR_ERR; } - sr_dbg("la8: SAMPLERATE = %" PRIu64, ctx->cur_samplerate); + sr_dbg("la8: SAMPLERATE = %" PRIu64, devc->cur_samplerate); break; case SR_HWCAP_PROBECONFIG: - if (configure_probes(ctx, (const GSList *)value) != SR_OK) { + if (configure_probes(devc, (const GSList *)value) != SR_OK) { sr_err("la8: %s: probe config failed.", __func__); return SR_ERR; } @@ -367,16 +350,16 @@ static int hw_dev_config_set(int dev_index, int hwcap, const void *value) sr_err("la8: %s: LIMIT_MSEC can't be 0.", __func__); return SR_ERR; } - ctx->limit_msec = *(const uint64_t *)value; - sr_dbg("la8: LIMIT_MSEC = %" PRIu64, ctx->limit_msec); + devc->limit_msec = *(const uint64_t *)value; + sr_dbg("la8: LIMIT_MSEC = %" PRIu64, devc->limit_msec); break; case SR_HWCAP_LIMIT_SAMPLES: if (*(const uint64_t *)value < MIN_NUM_SAMPLES) { sr_err("la8: %s: LIMIT_SAMPLES too small.", __func__); return SR_ERR; } - ctx->limit_samples = *(const uint64_t *)value; - sr_dbg("la8: LIMIT_SAMPLES = %" PRIu64, ctx->limit_samples); + devc->limit_samples = *(const uint64_t *)value; + sr_dbg("la8: LIMIT_SAMPLES = %" PRIu64, devc->limit_samples); break; default: /* Unknown capability, return SR_ERR. */ @@ -392,7 +375,7 @@ static int receive_data(int fd, int revents, void *cb_data) { int i, ret; struct sr_dev_inst *sdi; - struct context *ctx; + struct dev_context *devc; /* Avoid compiler errors. */ (void)fd; @@ -403,26 +386,26 @@ static int receive_data(int fd, int revents, void *cb_data) return FALSE; } - if (!(ctx = sdi->priv)) { + if (!(devc = sdi->priv)) { sr_err("la8: %s: sdi->priv was NULL", __func__); return FALSE; } - if (!ctx->ftdic) { - sr_err("la8: %s: ctx->ftdic was NULL", __func__); + if (!devc->ftdic) { + sr_err("la8: %s: devc->ftdic was NULL", __func__); return FALSE; } /* Get one block of data. */ - if ((ret = la8_read_block(ctx)) < 0) { + if ((ret = la8_read_block(devc)) < 0) { sr_err("la8: %s: la8_read_block error: %d", __func__, ret); - hw_dev_acquisition_stop(sdi->index, sdi); + hw_dev_acquisition_stop(sdi, sdi); return FALSE; } /* We need to get exactly NUM_BLOCKS blocks (i.e. 8MB) of data. */ - if (ctx->block_counter != (NUM_BLOCKS - 1)) { - ctx->block_counter++; + if (devc->block_counter != (NUM_BLOCKS - 1)) { + devc->block_counter++; return TRUE; } @@ -430,41 +413,35 @@ static int receive_data(int fd, int revents, void *cb_data) /* All data was received and demangled, send it to the session bus. */ for (i = 0; i < NUM_BLOCKS; i++) - send_block_to_session_bus(ctx, i); + send_block_to_session_bus(devc, i); - hw_dev_acquisition_stop(sdi->index, sdi); + hw_dev_acquisition_stop(sdi, sdi); - // return FALSE; /* FIXME? */ return TRUE; } -static int hw_dev_acquisition_start(int dev_index, void *cb_data) +static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, + void *cb_data) { - struct sr_dev_inst *sdi; - struct context *ctx; + struct dev_context *devc; struct sr_datafeed_packet packet; struct sr_datafeed_header header; struct sr_datafeed_meta_logic meta; uint8_t buf[4]; int bytes_written; - if (!(sdi = sr_dev_inst_get(cdi->instances, dev_index))) { - sr_err("la8: %s: sdi was NULL", __func__); - return SR_ERR_BUG; - } - - if (!(ctx = sdi->priv)) { + if (!(devc = sdi->priv)) { sr_err("la8: %s: sdi->priv was NULL", __func__); return SR_ERR_BUG; } - if (!ctx->ftdic) { - sr_err("la8: %s: ctx->ftdic was NULL", __func__); + if (!devc->ftdic) { + sr_err("la8: %s: devc->ftdic was NULL", __func__); return SR_ERR_BUG; } - ctx->divcount = samplerate_to_divcount(ctx->cur_samplerate); - if (ctx->divcount == 0xff) { + devc->divcount = samplerate_to_divcount(devc->cur_samplerate); + if (devc->divcount == 0xff) { sr_err("la8: %s: invalid divcount/samplerate", __func__); return SR_ERR; } @@ -472,25 +449,25 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data) sr_dbg("la8: Starting acquisition."); /* Fill acquisition parameters into buf[]. */ - buf[0] = ctx->divcount; + buf[0] = devc->divcount; buf[1] = 0xff; /* This byte must always be 0xff. */ - buf[2] = ctx->trigger_pattern; - buf[3] = ctx->trigger_mask; + buf[2] = devc->trigger_pattern; + buf[3] = devc->trigger_mask; /* Start acquisition. */ - bytes_written = la8_write(ctx, buf, 4); + bytes_written = la8_write(devc, buf, 4); if (bytes_written < 0) { sr_err("la8: Acquisition failed to start."); return SR_ERR; } else if (bytes_written != 4) { sr_err("la8: Acquisition failed to start."); - return SR_ERR; /* TODO: Other error and return code? */ + return SR_ERR; } sr_dbg("la8: Acquisition started successfully."); - ctx->session_dev_id = cb_data; + devc->session_dev_id = cb_data; /* Send header packet to the session bus. */ sr_dbg("la8: Sending SR_DF_HEADER."); @@ -498,44 +475,36 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data) packet.payload = &header; header.feed_version = 1; gettimeofday(&header.starttime, NULL); - sr_session_send(ctx->session_dev_id, &packet); + sr_session_send(devc->session_dev_id, &packet); /* Send metadata about the SR_DF_LOGIC packets to come. */ packet.type = SR_DF_META_LOGIC; packet.payload = &meta; - meta.samplerate = ctx->cur_samplerate; + meta.samplerate = devc->cur_samplerate; meta.num_probes = NUM_PROBES; - sr_session_send(ctx->session_dev_id, &packet); + sr_session_send(devc->session_dev_id, &packet); /* Time when we should be done (for detecting trigger timeouts). */ - ctx->done = (ctx->divcount + 1) * 0.08388608 + time(NULL) - + ctx->trigger_timeout; - ctx->block_counter = 0; - ctx->trigger_found = 0; + devc->done = (devc->divcount + 1) * 0.08388608 + time(NULL) + + devc->trigger_timeout; + devc->block_counter = 0; + devc->trigger_found = 0; /* Hook up a dummy handler to receive data from the LA8. */ - sr_source_add(-1, G_IO_IN, 0, receive_data, sdi); + sr_source_add(-1, G_IO_IN, 0, receive_data, (void *)sdi); return SR_OK; } -static int hw_dev_acquisition_stop(int dev_index, void *cb_data) +static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi, + void *cb_data) { - struct sr_dev_inst *sdi; - struct context *ctx; struct sr_datafeed_packet packet; - sr_dbg("la8: Stopping acquisition."); - - if (!(sdi = sr_dev_inst_get(cdi->instances, dev_index))) { - sr_err("la8: %s: sdi was NULL", __func__); - return SR_ERR_BUG; - } + (void)sdi; - if (!(ctx = sdi->priv)) { - sr_err("la8: %s: sdi->priv was NULL", __func__); - return SR_ERR_BUG; - } + sr_dbg("la8: Stopping acquisition."); + sr_source_remove(-1); /* Send end packet to the session bus. */ sr_dbg("la8: Sending SR_DF_END."); @@ -555,10 +524,8 @@ SR_PRIV struct sr_dev_driver chronovu_la8_driver_info = { .dev_open = hw_dev_open, .dev_close = hw_dev_close, .info_get = hw_info_get, - .dev_status_get = hw_dev_status_get, -// .hwcap_get_all = hw_hwcap_get_all, .dev_config_set = hw_dev_config_set, .dev_acquisition_start = hw_dev_acquisition_start, .dev_acquisition_stop = hw_dev_acquisition_stop, - .instances = NULL, + .priv = NULL, };