Refactor logs messages in i2c/spi interface

- Print message if fd is invalid.
- Show fd number in error case.

Change-Id: If08d70d1a4465ecbb6a5cf29b77674c18debe5d0
Signed-off-by: Hyeongsik Min <hyeongsik.min@samsung.com>

diff --git a/src/interface/i2c.c b/src/interface/i2c.c
index 1e40ca6..0907cce 100644 (file)
--- a/src/interface/i2c.c
+++ b/src/interface/i2c.c
@@ -36,13 +36,13 @@ int i2c_open(int bus, int *fd)
 
        snprintf(i2c_dev, sizeof(i2c_dev)-1, SYSFS_I2C_DIR"-%d", bus);
        new_fd = open(i2c_dev, O_RDWR);
-
        if (new_fd < 0) {
                char errmsg[MAX_ERR_LEN];
                strerror_r(errno, errmsg, MAX_ERR_LEN);
                _E("Can't Open %s : %s", i2c_dev, errmsg);
                return -ENXIO;
        }
+       _D("fd : %d", new_fd);
        *fd = new_fd;
 
        return 0;
@@ -53,10 +53,9 @@ int i2c_close(int fd)
        int status;
 
        _D("fd : %d", fd);
+       RETVM_IF(fd < 0, -EINVAL, "Invalid fd");
 
-       if (fd < 0) return -EINVAL;
        status = close(fd);
-
        if (status < 0) {
                char errmsg[MAX_ERR_LEN];
                strerror_r(errno, errmsg, MAX_ERR_LEN);
@@ -71,14 +70,14 @@ int i2c_set_address(int fd, int address)
 {
        int status;
 
-       _D("slave address : 0x%x", address);
+       _D("fd : %d, slave address : 0x%x", fd, address);
+       RETVM_IF(fd < 0, -EINVAL, "Invalid fd");
 
        status = ioctl(fd, I2C_SLAVE, address);
-
        if (status < 0) {
                char errmsg[MAX_ERR_LEN];
                strerror_r(errno, errmsg, MAX_ERR_LEN);
-               _E("Failed to set slave address(%x) : %s", address, errmsg);
+               _E("Failed to set slave address(%x), fd : %d, errmsg : %s", address, fd, errmsg);
                return status;
        }
 
@@ -89,12 +88,13 @@ int i2c_read(int fd, unsigned char *data, int length)
 {
        int status;
 
-       status = read(fd, data, length);
+       RETVM_IF(fd < 0, -EINVAL, "Invalid fd : %d", fd);
 
+       status = read(fd, data, length);
        if (status != length) {
                char errmsg[MAX_ERR_LEN];
                strerror_r(errno, errmsg, MAX_ERR_LEN);
-               _E("i2c_read failed : %s", errmsg);
+               _E("i2c read failed, fd : %d, errmsg : %s", fd, errmsg);
                return -EIO;
        }
 
@@ -105,12 +105,13 @@ int i2c_write(int fd, const unsigned char *data, int length)
 {
        int status;
 
-       status = write(fd, data, length);
+       RETVM_IF(fd < 0, -EINVAL, "Invalid fd : %d", fd);
 
+       status = write(fd, data, length);
        if (status != length) {
                char errmsg[MAX_ERR_LEN];
                strerror_r(errno, errmsg, MAX_ERR_LEN);
-               _E("i2c write failed : %s\n", errmsg);
+               _E("i2c write failed fd : %d, errmsg : %s", fd, errmsg);
                return -EIO;
        }
 
@@ -121,11 +122,13 @@ int i2c_smbus_ioctl(int fd, struct i2c_smbus_ioctl_data *data)
 {
        int status;
 
+       RETVM_IF(fd < 0, -EINVAL, "Invalid fd : %d", fd);
+
        status = ioctl(fd, I2C_SMBUS, data);
        if (status < 0) {
                char errmsg[MAX_ERR_LEN];
                strerror_r(errno, errmsg, MAX_ERR_LEN);
-               _E("i2c write failed : %s\n", errmsg);
+               _E("i2c transaction failed fd : %d, errmsg : %s", fd, errmsg);
                return -EIO;
        }
 

diff --git a/src/interface/spi.c b/src/interface/spi.c
index 601be5c..cd20e97 100644 (file)
--- a/src/interface/spi.c
+++ b/src/interface/spi.c
@@ -47,6 +47,7 @@ int spi_open(int bus, int cs, int *fd)
                _E("Can't Open %s, errmsg : %s", spi_dev, errmsg);
                return -ENXIO;
        }
+       _D("fd : %d", new_fd);
        *fd = new_fd;
 
        return 0;
@@ -57,8 +58,7 @@ int spi_close(int fd)
        int status;
 
        _D("fd : %d", fd);
-
-       if (fd < 0) return -EINVAL;
+       RETVM_IF(fd < 0, -EINVAL, "Invalid fd");
 
        status = close(fd);
        if (status < 0) {
@@ -76,10 +76,8 @@ int spi_set_mode(int fd, unsigned char mode)
        int status;
 
        _D("fd : %d, mode : %d", fd, mode);
+       RETVM_IF(fd < 0, -EINVAL, "Invalid fd");
 
-       if (fd < 0) return -EINVAL;
-
-       _D("Set mode : %d", mode);
        status = ioctl(fd, SPI_IOC_WR_MODE, &mode);
        if (status < 0) {
                char errmsg[MAX_ERR_LEN];
@@ -96,13 +94,14 @@ int spi_get_mode(int fd, unsigned char *mode)
        unsigned char value = 0;
        int status;
 
-       if (fd < 0) return -EINVAL;
+       _D("fd : %d", fd);
+       RETVM_IF(fd < 0, -EINVAL, "Invalid fd");
 
        status = ioctl(fd, SPI_IOC_RD_MODE, &value);
        if (status < 0) {
                char errmsg[MAX_ERR_LEN];
                strerror_r(errno, errmsg, MAX_ERR_LEN);
-               _E("Failed to get mode : %s", errmsg);
+               _E("Failed to get mode, fd : %d, errmsg : %s", fd, errmsg);
                return -EIO;
        }
        *mode = value;
@@ -115,15 +114,13 @@ int spi_set_lsb_first(int fd, unsigned char lsb)
        int status;
 
        _D("fd : %d, lsb : %d", fd, lsb);
+       RETVM_IF(fd < 0, -EINVAL, "Invalid fd");
 
-       if (fd < 0) return -EINVAL;
-
-       _D("Set lsb first : %d", lsb);
        status = ioctl(fd, SPI_IOC_WR_LSB_FIRST, &lsb);
        if (status < 0) {
                char errmsg[MAX_ERR_LEN];
                strerror_r(errno, errmsg, MAX_ERR_LEN);
-               _E("Failed to set lsb first(%d) : %s", lsb, errmsg);
+               _E("Failed to set lsb first(%d), fd : %d, errmsg : %s", lsb, fd, errmsg);
                return -EIO;
        }
 
@@ -135,13 +132,14 @@ int spi_get_lsb_first(int fd, unsigned char *lsb)
        unsigned char value = 0;
        int status;
 
-       if (fd < 0) return -EINVAL;
+       _D("fd : %d", fd);
+       RETVM_IF(fd < 0, -EINVAL, "Invalid fd");
 
        status = ioctl(fd, SPI_IOC_RD_LSB_FIRST, &value);
        if (status < 0) {
                char errmsg[MAX_ERR_LEN];
                strerror_r(errno, errmsg, MAX_ERR_LEN);
-               _E("Failed to get lsb first : %s", errmsg);
+               _E("Failed to get lsb first, fd : %d, errmsg : %s", fd, errmsg);
                return -EIO;
        }
        *lsb = value ? 1 : 0;
@@ -154,15 +152,13 @@ int spi_set_bits(int fd, unsigned char bits)
        int status;
 
        _D("fd : %d, bits : %d", fd, bits);
+       RETVM_IF(fd < 0, -EINVAL, "Invalid fd");
 
-       if (fd < 0) return -EINVAL;
-
-       _D("Set bit per word : %d", bits);
        status = ioctl(fd, SPI_IOC_WR_BITS_PER_WORD, &bits);
        if (status < 0) {
                char errmsg[MAX_ERR_LEN];
                strerror_r(errno, errmsg, MAX_ERR_LEN);
-               _E("Failed to set bits(%d) : %s", bits, errmsg);
+               _E("Failed to set bits(%d), fd : %d, errmsg : %s", bits, fd, errmsg);
                return -EIO;
        }
 
@@ -174,13 +170,14 @@ int spi_get_bits(int fd, unsigned char *bits)
        unsigned char value = 0;
        int status;
 
-       if (fd < 0) return -EINVAL;
+       _D("fd : %d", fd);
+       RETVM_IF(fd < 0, -EINVAL, "Invalid fd");
 
        status = ioctl(fd, SPI_IOC_RD_BITS_PER_WORD, &value);
        if (status < 0) {
                char errmsg[MAX_ERR_LEN];
                strerror_r(errno, errmsg, MAX_ERR_LEN);
-               _E("Failed to get bits : %s", errmsg);
+               _E("Failed to get bits, fd : %d, errmsg : %s", fd, errmsg);
                return -EIO;
        }
        *bits = value;
@@ -193,15 +190,13 @@ int spi_set_frequency(int fd, unsigned int freq)
        int status;
 
        _D("fd : %d, freq : %d", fd, freq);
+       RETVM_IF(fd < 0, -EINVAL, "Invalid fd");
 
-       if (fd < 0) return -EINVAL;
-
-       _D("Set frequency : %d", freq);
        status = ioctl(fd, SPI_IOC_WR_MAX_SPEED_HZ, &freq);
        if (status < 0) {
                char errmsg[MAX_ERR_LEN];
                strerror_r(errno, errmsg, MAX_ERR_LEN);
-               _E("Failed to set frequency(%d) : %s", freq, errmsg);
+               _E("Failed to set frequency(%d), fd : %d, errmsg : %s", freq, fd, errmsg);
                return -EIO;
        }
 
@@ -213,13 +208,14 @@ int spi_get_frequency(int fd, unsigned int *freq)
        unsigned int value = 0;
        int status;
 
-       if (fd < 0) return -EINVAL;
+       _D("fd : %d", fd);
+       RETVM_IF(fd < 0, -EINVAL, "Invalid fd");
 
        status = ioctl(fd, SPI_IOC_RD_MAX_SPEED_HZ, &value);
        if (status < 0) {
                char errmsg[MAX_ERR_LEN];
                strerror_r(errno, errmsg, MAX_ERR_LEN);
-               _E("Failed to get frequency : %s", errmsg);
+               _E("Failed to get frequency, fd : %d, errmsg : %s", fd, errmsg);
                return -EIO;
        }
        *freq = value;
@@ -258,7 +254,7 @@ int spi_read(int fd, unsigned char *rxbuf, int length)
        int status;
        struct spi_ioc_transfer xfer;
 
-       if (fd < 0) return -EINVAL;
+       RETVM_IF(fd < 0, -EINVAL, "Invalid fd : %d", fd);
 
        memset(&xfer, 0, sizeof(struct spi_ioc_transfer));
        xfer.rx_buf = (unsigned long)rxbuf;
@@ -268,7 +264,7 @@ int spi_read(int fd, unsigned char *rxbuf, int length)
        if (status < 0) {
                char errmsg[MAX_ERR_LEN];
                strerror_r(errno, errmsg, MAX_ERR_LEN);
-               _E("Failed to read data(%d) : %s", length, errmsg);
+               _E("Failed to read data, fd : %d, length : %d, errmsg : %s", fd, length, errmsg);
                return -EIO;
        }
 
@@ -280,7 +276,7 @@ int spi_write(int fd, unsigned char *txbuf, int length)
        int status;
        struct spi_ioc_transfer xfer;
 
-       if (fd < 0) return -EINVAL;
+       RETVM_IF(fd < 0, -EINVAL, "Invalid fd : %d", fd);
 
        memset(&xfer, 0, sizeof(struct spi_ioc_transfer));
        xfer.tx_buf = (unsigned long)txbuf;
@@ -302,7 +298,7 @@ int spi_read_write(int fd, unsigned char *txbuf, unsigned char *rxbuf, int lengt
        int status;
        struct spi_ioc_transfer xfer[2];
 
-       if (fd < 0) return -EINVAL;
+       RETVM_IF(fd < 0, -EINVAL, "Invalid fd : %d", fd);
 
        if (!txbuf || !rxbuf || length < 0) return -EINVAL;