#include <arpa/inet.h>
#endif
#include <glib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
#include "ols.h"
#ifdef _WIN32
};
/* default supported samplerates, can be overridden by device metadata */
-static struct sr_samplerates samplerates = {
+static const struct sr_samplerates samplerates = {
SR_HZ(10),
SR_MHZ(200),
SR_HZ(1),
NULL,
};
-/* List of struct sr_serial_dev_inst */
-static GSList *dev_insts = NULL;
+SR_PRIV struct sr_dev_driver ols_driver_info;
+static struct sr_dev_driver *odi = &ols_driver_info;
static int send_shortcommand(int fd, uint8_t command)
{
{
struct sr_dev_inst *sdi;
struct context *ctx;
- uint32_t tmp_int;
+ struct sr_probe *probe;
+ uint32_t tmp_int, ui;
uint8_t key, type, token;
GString *tmp_str, *devname, *version;
- gchar tmp_c;
+ guchar tmp_c;
sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, NULL, NULL, NULL);
+ sdi->driver = odi;
ctx = ols_dev_new();
sdi->priv = ctx;
switch (token) {
case 0x00:
/* Number of usable probes */
- ctx->num_probes = tmp_int;
+ for (ui = 0; ui < tmp_int; ui++) {
+ if (!(probe = sr_probe_new(ui, SR_PROBE_LOGIC, TRUE,
+ probe_names[ui])))
+ return 0;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ }
break;
case 0x01:
/* Amount of sample memory available (bytes) */
switch (token) {
case 0x00:
/* Number of usable probes */
- ctx->num_probes = tmp_c;
+ for (ui = 0; ui < tmp_c; ui++) {
+ if (!(probe = sr_probe_new(ui, SR_PROBE_LOGIC, TRUE,
+ probe_names[ui])))
+ return 0;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ }
break;
case 0x01:
/* protocol version */
return sdi;
}
-static int hw_init(const char *devinfo)
+static int hw_init(void)
+{
+
+ /* Nothing to do. */
+
+ return SR_OK;
+}
+
+static GSList *hw_scan(GSList *options)
{
struct sr_dev_inst *sdi;
struct context *ctx;
- GSList *ports, *l;
+ struct sr_probe *probe;
+ GSList *devices, *ports, *l;
GPollFD *fds, probefd;
- int devcnt, final_devcnt, num_ports, fd, ret, i;
+ int devcnt, final_devcnt, num_ports, fd, ret, i, j;
char buf[8], **dev_names, **serial_params;
+ (void)options;
final_devcnt = 0;
+ devices = NULL;
- if (devinfo)
- ports = g_slist_append(NULL, g_strdup(devinfo));
- else
- /* No specific device given, so scan all serial ports. */
- ports = list_serial_ports();
-
+ /* Scan all serial ports. */
+ ports = list_serial_ports();
num_ports = g_slist_length(ports);
if (!(fds = g_try_malloc0(num_ports * sizeof(GPollFD)))) {
fd = serial_open(l->data, O_RDWR | O_NONBLOCK);
if (fd != -1) {
serial_params[devcnt] = serial_backup_params(fd);
- serial_set_params(fd, 115200, 8, 0, 1, 2);
+ serial_set_params(fd, 115200, 8, SERIAL_PARITY_NONE, 1, 2);
ret = SR_OK;
for (i = 0; i < 5; i++) {
if ((ret = send_shortcommand(fd,
/* not an OLS -- some other board that uses the sump protocol */
sdi = sr_dev_inst_new(final_devcnt, SR_ST_INACTIVE,
"Sump", "Logic Analyzer", "v1.0");
+ sdi->driver = odi;
ctx = ols_dev_new();
- ctx->num_probes = 32;
+ for (j = 0; j < 32; j++) {
+ if (!(probe = sr_probe_new(j, SR_PROBE_LOGIC, TRUE,
+ probe_names[j])))
+ return 0;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+ }
sdi->priv = ctx;
}
ctx->serial = sr_serial_dev_inst_new(dev_names[i], -1);
- dev_insts = g_slist_append(dev_insts, sdi);
+ odi->instances = g_slist_append(odi->instances, sdi);
+ devices = g_slist_append(devices, sdi);
+
final_devcnt++;
serial_close(fds[i].fd);
fds[i].fd = 0;
hw_init_free_ports:
g_slist_free(ports);
- return final_devcnt;
+ return devices;
}
-static int hw_dev_open(int dev_index)
+static int hw_dev_open(struct sr_dev_inst *sdi)
{
- struct sr_dev_inst *sdi;
struct context *ctx;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
- return SR_ERR;
-
ctx = sdi->priv;
ctx->serial->fd = serial_open(ctx->serial->port, O_RDWR);
return SR_OK;
}
-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;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index))) {
- sr_err("ols: %s: sdi was NULL", __func__);
- return SR_ERR_BUG;
- }
-
ctx = sdi->priv;
- /* TODO */
if (ctx->serial->fd != -1) {
serial_close(ctx->serial->fd);
ctx->serial->fd = -1;
int ret = SR_OK;
/* Properly close and free all devices. */
- for (l = dev_insts; l; l = l->next) {
+ for (l = odi->instances; l; l = l->next) {
if (!(sdi = l->data)) {
/* Log error, but continue cleaning up the rest. */
sr_err("ols: %s: sdi was NULL, continuing", __func__);
sr_serial_dev_inst_free(ctx->serial);
sr_dev_inst_free(sdi);
}
- g_slist_free(dev_insts);
- dev_insts = NULL;
+ g_slist_free(odi->instances);
+ odi->instances = NULL;
return ret;
}
-static const void *hw_dev_info_get(int dev_index, int dev_info_id)
+static int hw_info_get(int info_id, const void **data,
+ const struct sr_dev_inst *sdi)
{
- struct sr_dev_inst *sdi;
struct context *ctx;
- const void *info;
-
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
- return NULL;
- ctx = sdi->priv;
- info = NULL;
- switch (dev_info_id) {
+ switch (info_id) {
case SR_DI_INST:
- info = sdi;
+ *data = sdi;
+ break;
+ case SR_DI_HWCAPS:
+ *data = hwcaps;
break;
case SR_DI_NUM_PROBES:
- info = GINT_TO_POINTER(NUM_PROBES);
+ *data = GINT_TO_POINTER(1);
break;
case SR_DI_PROBE_NAMES:
- info = probe_names;
+ *data = probe_names;
break;
case SR_DI_SAMPLERATES:
- info = &samplerates;
+ *data = &samplerates;
break;
case SR_DI_TRIGGER_TYPES:
- info = (char *)TRIGGER_TYPES;
+ *data = (char *)TRIGGER_TYPES;
break;
case SR_DI_CUR_SAMPLERATE:
- info = &ctx->cur_samplerate;
+ if (sdi) {
+ ctx = sdi->priv;
+ *data = &ctx->cur_samplerate;
+ } else
+ return SR_ERR;
break;
+ default:
+ return SR_ERR_ARG;
}
- return info;
+ return SR_OK;
}
static int hw_dev_status_get(int dev_index)
{
struct sr_dev_inst *sdi;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ if (!(sdi = sr_dev_inst_get(odi->instances, dev_index)))
return SR_ST_NOT_FOUND;
return sdi->status;
}
-static const int *hw_hwcap_get_all(void)
-{
- return hwcaps;
-}
-
-static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
+static int set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate)
{
struct context *ctx;
return SR_OK;
}
-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;
int ret;
const uint64_t *tmp_u64;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
- return SR_ERR;
ctx = sdi->priv;
if (sdi->status != SR_ST_ACTIVE)
/* Find this device's ctx struct by its fd. */
ctx = NULL;
- for (l = dev_insts; l; l = l->next) {
+ for (l = odi->instances; l; l = l->next) {
sdi = l->data;
ctx = sdi->priv;
if (ctx->serial->fd == fd) {
int num_channels;
int i;
- if (!(sdi = sr_dev_inst_get(dev_insts, dev_index)))
+ if (!(sdi = sr_dev_inst_get(odi->instances, dev_index)))
return SR_ERR;
ctx = sdi->priv;
.api_version = 1,
.init = hw_init,
.cleanup = hw_cleanup,
+ .scan = hw_scan,
.dev_open = hw_dev_open,
.dev_close = hw_dev_close,
- .dev_info_get = hw_dev_info_get,
+ .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,
};
projects / libsigrok.git / blobdiff