sr_dev_open(): Factor out SR_ST_ACTIVE check.

[libsigrok.git] / src / hardware / uni-t-dmm / api.c

diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index c708d879d0beb8ed45b10f32163326ac517bc3e8..c6e0dd9adcbc59d5180037d811e6cab9019b2b38 100644 (file)
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/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>
@@ -25,8 +24,6 @@
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
-#define UNI_T_UT_D04_NEW "1a86.e008"
-
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
 };
@@ -87,15 +84,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                sdi->vendor = g_strdup(dmm->vendor);
                sdi->model = g_strdup(dmm->device);
                sdi->priv = devc;
-               sdi->driver = di;
                sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
                sdi->inst_type = SR_INST_USB;
                sdi->conn = usb;
-               drvc->instances = g_slist_append(drvc->instances, sdi);
                devices = g_slist_append(devices, sdi);
        }
 
-       return devices;
+       return std_scan_complete(di, devices);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
@@ -166,18 +161,17 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
        sr_sw_limits_acquisition_start(&devc->limits);
 
-       std_session_send_df_header(sdi, LOG_PREFIX);
+       std_session_send_df_header(sdi);
 
        sr_session_source_add(sdi->session, -1, 0, 10 /* poll_timeout */,
-                     uni_t_dmm_receive_data, (void *)sdi);
+                       uni_t_dmm_receive_data, (void *)sdi);
 
        return SR_OK;
 }
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       sr_dbg("Stopping acquisition.");
-       std_session_send_df_end(sdi, LOG_PREFIX);
+       std_session_send_df_end(sdi);
        sr_session_source_remove(sdi->session, -1);
 
        return SR_OK;
@@ -185,7 +179,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
 #define DMM(ID, CHIPSET, VENDOR, MODEL, BAUDRATE, PACKETSIZE, \
                        VALID, PARSE, DETAILS) \
-    &((struct dmm_info) { \
+       &((struct dmm_info) { \
                { \
                        .name = ID, \
                        .longname = VENDOR " " MODEL, \
@@ -363,7 +357,7 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
                sr_ut71x_packet_valid, sr_ut71x_parse, NULL
        ),
        DMM(
-               "tenma-72-7745", es519xx,
+               "tenma-72-7745", fs9721,
                "Tenma", "72-7745", 2400,
                FS9721_PACKET_SIZE,
                sr_fs9721_packet_valid, sr_fs9721_parse,