BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cem-dt-885x/colead-slm: Use std_serial_dev_open().

This commit is contained in:
Uwe Hermann 2016-04-24 20:17:49 +02:00
parent a52e2a0b37
commit 8f878dc6aa
2 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hardware/cem-dt-885x/api.c
View File

@ -141,19 +141,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances; return ((struct drv_context *)(di->context))->instances;
} }
static int dev_open(struct sr_dev_inst *sdi)
{
struct sr_serial_dev_inst *serial;
serial = sdi->conn;
if (serial_open(serial, SERIAL_RDWR) != SR_OK)
return SR_ERR;
sdi->status = SR_ST_ACTIVE;
return SR_OK;
}
static int cleanup(const struct sr_dev_driver *di) static int cleanup(const struct sr_dev_driver *di)
{ {
return std_dev_clear(di, NULL); return std_dev_clear(di, NULL);
@ -422,7 +409,7 @@ SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info = {
.config_get = config_get, .config_get = config_get,
.config_set = config_set, .config_set = config_set,
.config_list = config_list, .config_list = config_list,
.dev_open = dev_open, .dev_open = std_serial_dev_open,
.dev_close = std_serial_dev_close, .dev_close = std_serial_dev_close,
.dev_acquisition_start = dev_acquisition_start, .dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop, .dev_acquisition_stop = dev_acquisition_stop,

15
src/hardware/colead-slm/api.c
View File

@ -101,19 +101,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances; return ((struct drv_context *)(di->context))->instances;
} }
static int dev_open(struct sr_dev_inst *sdi)
{
struct sr_serial_dev_inst *serial;
serial = sdi->conn;
if (serial_open(serial, SERIAL_RDWR) != SR_OK)
return SR_ERR;
sdi->status = SR_ST_ACTIVE;
return SR_OK;
}
static int cleanup(const struct sr_dev_driver *di) static int cleanup(const struct sr_dev_driver *di)
{ {
return std_dev_clear(di, NULL); return std_dev_clear(di, NULL);
@ -206,7 +193,7 @@ SR_PRIV struct sr_dev_driver colead_slm_driver_info = {
.config_get = NULL, .config_get = NULL,
.config_set = config_set, .config_set = config_set,
.config_list = config_list, .config_list = config_list,
.dev_open = dev_open, .dev_open = std_serial_dev_open,
.dev_close = std_serial_dev_close, .dev_close = std_serial_dev_close,
.dev_acquisition_start = dev_acquisition_start, .dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop, .dev_acquisition_stop = dev_acquisition_stop,