Use std_serial_dev_open().

[libsigrok.git] / hardware / serial-dmm / api.c

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index ef57f31822e3eaf97b090b332bdc5583d074ad5b..a3123b080916063760bc6bb3466ddfdc8c7f3f88 100644 (file)
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -380,32 +380,6 @@ static GSList *dev_list(int dmm)
        return ((struct drv_context *)(dmms[dmm].di->priv))->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 | SERIAL_NONBLOCK) != SR_OK)
-               return SR_ERR;
-
-       sdi->status = SR_ST_ACTIVE;
-
-       return SR_OK;
-}
-
-static int dev_close(struct sr_dev_inst *sdi)
-{
-       struct sr_serial_dev_inst *serial;
-
-       serial = sdi->conn;
-       if (serial && serial->fd != -1) {
-               serial_close(serial);
-               sdi->status = SR_ST_INACTIVE;
-       }
-
-       return SR_OK;
-}
-
 static int cleanup(int dmm)
 {
        return dev_clear(dmm);
@@ -495,7 +469,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 
        /* Poll every 50ms, or whenever some data comes in. */
        serial = sdi->conn;
-       sr_source_add(serial->fd, G_IO_IN, 50,
+       serial_source_add(serial, G_IO_IN, 50,
                      dmms[dmm].receive_data, (void *)sdi);
 
        return SR_OK;
@@ -503,8 +477,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-       return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
-                                              sdi->conn, LOG_PREFIX);
+       return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close,
+                       sdi->conn, LOG_PREFIX);
 }
 
 /* Driver-specific API function wrappers */
@@ -542,8 +516,8 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
        .config_get = NULL, \
        .config_set = config_set, \
        .config_list = config_list, \
-       .dev_open = dev_open, \
-       .dev_close = dev_close, \
+       .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, \
        .priv = NULL, \