0x00, 0x08, 0x04
};
-static GSList *scan_port(GSList *devices, struct sr_dev_driver *di,
- struct parport *port)
+static GSList *scan_port(GSList *devices, struct parport *port)
{
struct sr_dev_inst *sdi;
struct sr_channel *ch;
struct sr_channel_group *cg;
struct dev_context *devc;
- struct drv_context *drvc;
int i;
if (ieee1284_open(port, 0, &i) != E1284_OK) {
sdi->status = SR_ST_INACTIVE;
sdi->vendor = g_strdup("Hung-Chang");
sdi->model = g_strdup("DSO-2100");
- sdi->driver = di;
- drvc = di->context;
sdi->inst_type = 0; /* FIXME */
sdi->conn = port;
ieee1284_ref(port);
devc->last_step = 0; /* buffersize = 1000 */
sdi->priv = devc;
- drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi);
fail3:
for (i = 0; i < ports.portc; i++)
if (!strcmp(ports.portv[i]->name, conn)) {
port_found = TRUE;
- devices = scan_port(devices, di, ports.portv[i]);
+ devices = scan_port(devices, ports.portv[i]);
}
if (!port_found) {
ieee1284_free_ports(&ports);
- return devices;
+ return std_scan_complete(di, devices);
}
static void clear_private(void *priv)
}
}
- return std_dev_clear(di, clear_private);
+ return std_dev_clear_with_callback(di, clear_private);
}
static int dev_open(struct sr_dev_inst *sdi)
struct dev_context *devc = sdi->priv;
int i;
- if (sdi->status != SR_ST_INACTIVE)
- goto fail1;
-
if (ieee1284_open(sdi->conn, 0, &i) != E1284_OK)
goto fail1;
if (!devc->samples)
goto fail3;
- sdi->status = SR_ST_ACTIVE;
-
return SR_OK;
fail3:
{
struct dev_context *devc = sdi->priv;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_OK;
-
g_free(devc->samples);
hung_chang_dso_2100_reset_port(sdi->conn);
ieee1284_release(sdi->conn);
ieee1284_close(sdi->conn);
- sdi->status = SR_ST_INACTIVE;
return SR_OK;
}
if (cg) /* sr_config_set will validate cg using config_list */
ch = ((struct sr_channel *)cg->channels->data)->index;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
ret = SR_OK;
switch (key) {
case SR_CONF_LIMIT_FRAMES:
uint8_t state = hung_chang_dso_2100_read_mbox(sdi->conn, 0.02);
int ret;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
switch (state) {
case 0x03:
case 0x14:
break;
case 0x00:
state = 0x01;
+ /* Fallthrough */
default:
ret = hung_chang_dso_2100_move_to(sdi, 1);
if (ret != SR_OK)
return ret;
+ /* Fallthrough */
case 0x01:
hung_chang_dso_2100_write_mbox(sdi->conn, 4);
}
struct dev_context *devc = sdi->priv;
int ret;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
if (devc->channel) {
static const float res_array[] = {0.5, 1, 2, 5};
static const uint8_t relays[] = {100, 10, 10, 1};
if (ret != SR_OK)
return ret;
- std_session_send_df_header(sdi, LOG_PREFIX);
+ std_session_send_df_header(sdi);
sr_session_source_add(sdi->session, -1, 0, 8,
hung_chang_dso_2100_poll, (void *)sdi);
return SR_OK;
}
-SR_PRIV int hung_chang_dso_2100_dev_acquisition_stop(const struct sr_dev_inst *sdi)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
- std_session_send_df_end(sdi, LOG_PREFIX);
+ std_session_send_df_end(sdi);
sr_session_source_remove(sdi->session, -1);
hung_chang_dso_2100_move_to(sdi, 1);
return SR_OK;
}
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
- return hung_chang_dso_2100_dev_acquisition_stop(sdi);
-}
-
-SR_PRIV struct sr_dev_driver hung_chang_dso_2100_driver_info = {
+static struct sr_dev_driver hung_chang_dso_2100_driver_info = {
.name = "hung-chang-dso-2100",
.longname = "Hung-Chang DSO-2100",
.api_version = 1,
.dev_acquisition_stop = dev_acquisition_stop,
.context = NULL,
};
+SR_REGISTER_DEV_DRIVER(hung_chang_dso_2100_driver_info);