X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fcenter-3xx%2Fapi.c;h=97869bce395056ce10995940dd190519b3e299ca;hb=53279f13e4694fcf2aba314baade418941b0bc3e;hp=f5be8a8329997a89ed8643f3e92e43710576cc9a;hpb=bee2b0168c087676c1b365861d8c2d4714afa9b9;p=libsigrok.git diff --git a/src/hardware/center-3xx/api.c b/src/hardware/center-3xx/api.c index f5be8a83..97869bce 100644 --- a/src/hardware/center-3xx/api.c +++ b/src/hardware/center-3xx/api.c @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ #include @@ -128,9 +127,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd (void)cg; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - devc = sdi->priv; return sr_sw_limits_config_set(&devc->sw_limits, key, data); @@ -166,9 +162,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, int idx) struct dev_context *devc; struct sr_serial_dev_inst *serial; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - devc = sdi->priv; sr_sw_limits_acquisition_start(&devc->sw_limits); @@ -183,12 +176,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, int idx) return SR_OK; } -static int dev_acquisition_stop(struct sr_dev_inst *sdi) -{ - return std_serial_dev_acquisition_stop(sdi, - std_serial_dev_close, sdi->conn); -} - /* Driver-specific API function wrappers */ #define HW_SCAN(X) \ static GSList *scan_##X(struct sr_dev_driver *d, GSList *options) { \ @@ -209,13 +196,14 @@ static struct sr_dev_driver ID##_driver_info = { \ .cleanup = std_cleanup, \ .scan = scan_##ID_UPPER, \ .dev_list = std_dev_list, \ + .dev_clear = std_dev_clear, \ .config_get = NULL, \ .config_set = config_set, \ .config_list = config_list, \ .dev_open = std_serial_dev_open, \ .dev_close = std_serial_dev_close, \ .dev_acquisition_start = dev_acquisition_start_##ID_UPPER, \ - .dev_acquisition_stop = dev_acquisition_stop, \ + .dev_acquisition_stop = std_serial_dev_acquisition_stop, \ .context = NULL, \ }; \ SR_REGISTER_DEV_DRIVER(ID##_driver_info);