sr_config_set(): Factor out SR_ERR_DEV_CLOSED check.

[libsigrok.git] / src / hardware / mic-985xx / api.c

diff --git a/src/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c
index 329a14b6da8335109fdc89291169d44587512aef..492f4b7930395c86a4a121a1e878748df1077335 100644 (file)
--- a/src/hardware/mic-985xx/api.c
+++ b/src/hardware/mic-985xx/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 <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -60,18 +59,14 @@ SR_PRIV const struct mic_dev_info mic_devs[] = {
 static GSList *mic_scan(const char *conn, const char *serialcomm, int idx)
 {
        struct sr_dev_inst *sdi;
-       struct drv_context *drvc;
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
-       GSList *devices;
 
        serial = sr_serial_dev_inst_new(conn, serialcomm);
 
        if (serial_open(serial, SERIAL_RDWR) != SR_OK)
                return NULL;
 
-       drvc = mic_devs[idx].di->context;
-       devices = NULL;
        serial_flush(serial);
 
        /* TODO: Query device type. */
@@ -89,19 +84,15 @@ static GSList *mic_scan(const char *conn, const char *serialcomm, int idx)
        sdi->inst_type = SR_INST_SERIAL;
        sdi->conn = serial;
        sdi->priv = devc;
-       sdi->driver = mic_devs[idx].di;
 
        sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "Temperature");
 
        if (mic_devs[idx].has_humidity)
                sr_channel_new(sdi, 1, SR_CHANNEL_ANALOG, TRUE, "Humidity");
 
-       drvc->instances = g_slist_append(drvc->instances, sdi);
-       devices = g_slist_append(devices, sdi);
-
        serial_close(serial);
 
-       return devices;
+       return std_scan_complete(mic_devs[idx].di, g_slist_append(NULL, sdi));
 }
 
 static GSList *scan(GSList *options, int idx)
@@ -143,9 +134,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->limits, key, data);
@@ -187,13 +175,10 @@ 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->limits);
-       std_session_send_df_header(sdi, LOG_PREFIX);
+       std_session_send_df_header(sdi);
 
        /* Poll every 100ms, or whenever some data comes in. */
        serial = sdi->conn;
@@ -203,12 +188,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, LOG_PREFIX);
-}
-
 /* Driver-specific API function wrappers */
 #define HW_SCAN(X) \
 static GSList *scan_##X(struct sr_dev_driver *di, GSList *options) { \
@@ -240,7 +219,7 @@ static struct sr_dev_driver ID##_driver_info = { \
        .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)