#include <errno.h>
#include <string.h>
+/* The Colead SL-5868P uses this. */
+#define SERIALCOMM "2400/8n1"
+
static const int hwopts[] = {
SR_HWOPT_CONN,
SR_HWOPT_SERIALCOMM,
0,
};
-static const char *probe_names[] = {
- "P1",
- NULL,
-};
-
SR_PRIV struct sr_dev_driver colead_slm_driver_info;
static struct sr_dev_driver *di = &colead_slm_driver_info;
struct dev_context *devc;
GSList *l;
- drvc = di->priv;
+ if (!(drvc = di->priv))
+ return SR_OK;
+
for (l = drvc->instances; l; l = l->next) {
if (!(sdi = l->data))
continue;
return SR_OK;
}
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
{
struct drv_context *drvc;
return SR_ERR;
}
+ drvc->sr_ctx = sr_ctx;
di->priv = drvc;
return SR_OK;
}
if (!conn)
return NULL;
+ if (!serialcomm)
+ serialcomm = SERIALCOMM;
if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Colead",
"SL-5868P", NULL)))
return NULL;
}
- if (!serialcomm)
- /* The Colead SL-5868P uses this. */
- serialcomm = "2400/8n1";
+ if (!(devc->serial = sr_serial_dev_inst_new(conn, serialcomm)))
+ return NULL;
- devc->serial = sr_serial_dev_inst_new(conn, -1);
- devc->serialcomm = g_strdup(serialcomm);
sdi->priv = devc;
sdi->driver = di;
if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
return SR_ERR_BUG;
}
- sr_dbg("opening %s with %s", devc->serial->port, devc->serialcomm);
- devc->serial->fd = serial_open(devc->serial->port, O_RDWR | O_NONBLOCK);
- if (devc->serial->fd == -1) {
- sr_err("Couldn't open serial port '%s'.",
- devc->serial->port);
- return SR_ERR;
- }
- if (serial_set_paramstr(devc->serial->fd, devc->serialcomm) != SR_OK) {
- sr_err("Unable to set serial parameters.");
+ if (serial_open(devc->serial, SERIAL_RDWR) != SR_OK)
return SR_ERR;
- }
+
sdi->status = SR_ST_ACTIVE;
return SR_OK;
}
if (devc->serial && devc->serial->fd != -1) {
- serial_close(devc->serial->fd);
- devc->serial->fd = -1;
+ serial_close(devc->serial);
sdi->status = SR_ST_INACTIVE;
}
case SR_DI_HWCAPS:
*data = hwcaps;
break;
- case SR_DI_NUM_PROBES:
- *data = GINT_TO_POINTER(1);
- break;
- case SR_DI_PROBE_NAMES:
- *data = probe_names;
- break;
default:
return SR_ERR_ARG;
}
return SR_OK;
}
-static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
- void *cb_data)
+static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
struct sr_datafeed_packet packet;
struct dev_context *devc;