genericdmm: Factor out USB functions.

[libsigrok.git] / hardware / common / serial.c

diff --git a/hardware/common/serial.c b/hardware/common/serial.c
index d688f7d1f090cdebd0a0f29b064ef07d30d0d8a7..5a1d21af90c4cbebc9a593847f7b0fe1634c51e2 100644 (file)
--- a/hardware/common/serial.c
+++ b/hardware/common/serial.c
@@ -126,6 +126,8 @@ SR_PRIV int serial_open(const char *pathname, int flags)
                 */
                sr_dbg("Error opening serial port '%s': %s.", pathname,
                       strerror(errno));
+       } else {
+               sr_dbg("Opened serial port '%s' as FD %d.", pathname, fd);
        }
 
        return fd;
@@ -303,6 +305,11 @@ SR_PRIV int serial_restore_params(int fd, void *backup)
 {
        sr_dbg("FD %d: Restoring serial parameters from backup.", fd);
 
+       if (!backup) {
+               sr_err("FD %d: Cannot restore serial params (NULL).", fd);
+               return -1;
+       }
+
 #ifdef _WIN32
        /* TODO */
 #else
@@ -384,7 +391,7 @@ SR_PRIV int serial_set_params(int fd, int baudrate, int bits, int parity,
 
        sr_dbg("FD %d: Getting terminal settings.", fd);
        if (tcgetattr(fd, &term) < 0) {
-               sr_err("tcgetattr() error: %ѕ.", strerror(errno));
+               sr_err("tcgetattr() error: %s.", strerror(errno));
                return SR_ERR;
        }