Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix return values attribute writes #2

Merged
merged 3 commits into from
Jul 30, 2014
Merged

Fix return values attribute writes #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3468e0a
iio_device_attr_write_*: fix return value
gizero Jul 28, 2014
62d6331
iio_device_debug_attr_write_*: fix return value
gizero Jul 28, 2014
a08465c
iio_device_reg_write: fix return value
gizero Jul 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 37 additions & 9 deletions device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,26 +499,38 @@ int iio_device_attr_read_double(const struct iio_device *dev,
int iio_device_attr_write_longlong(const struct iio_device *dev,
const char *attr, long long val)
{
ssize_t ret;
char buf[1024];

snprintf(buf, sizeof(buf), "%lld", val);
return iio_device_attr_write(dev, attr, buf);
ret = iio_device_attr_write(dev, attr, buf);

return ret < 0 ? ret : 0;
}

int iio_device_attr_write_double(const struct iio_device *dev,
const char *attr, double val)
{
ssize_t ret;
char buf[1024];

snprintf(buf, sizeof(buf), "%lf", val);
return iio_device_attr_write(dev, attr, buf);
ret = iio_device_attr_write(dev, attr, buf);

return ret < 0 ? ret : 0;
}

int iio_device_attr_write_bool(const struct iio_device *dev,
const char *attr, bool val)
{
ssize_t ret;

if (val)
return iio_device_attr_write(dev, attr, "1");
ret = iio_device_attr_write(dev, attr, "1");
else
return iio_device_attr_write(dev, attr, "0");
ret = iio_device_attr_write(dev, attr, "0");

return ret < 0 ? ret : 0;
}

ssize_t iio_device_debug_attr_read(const struct iio_device *dev,
Expand Down Expand Up @@ -608,26 +620,38 @@ int iio_device_debug_attr_read_double(const struct iio_device *dev,
int iio_device_debug_attr_write_longlong(const struct iio_device *dev,
const char *attr, long long val)
{
ssize_t ret;

char buf[1024];
snprintf(buf, sizeof(buf), "%lld", val);
return iio_device_debug_attr_write(dev, attr, buf);
ret = iio_device_debug_attr_write(dev, attr, buf);

return ret < 0 ? ret : 0;
}

int iio_device_debug_attr_write_double(const struct iio_device *dev,
const char *attr, double val)
{
ssize_t ret;

char buf[1024];
snprintf(buf, sizeof(buf), "%lf", val);
return iio_device_debug_attr_write(dev, attr, buf);
ret = iio_device_debug_attr_write(dev, attr, buf);

return ret < 0 ? ret : 0;
}

int iio_device_debug_attr_write_bool(const struct iio_device *dev,
const char *attr, bool val)
{
ssize_t ret;

if (val)
return iio_device_debug_attr_write_raw(dev, attr, "1", 2);
ret = iio_device_debug_attr_write_raw(dev, attr, "1", 2);
else
return iio_device_debug_attr_write_raw(dev, attr, "0", 2);
ret = iio_device_debug_attr_write_raw(dev, attr, "0", 2);

return ret < 0 ? ret : 0;
}

int iio_device_identify_filename(const struct iio_device *dev,
Expand Down Expand Up @@ -672,9 +696,13 @@ int iio_device_identify_filename(const struct iio_device *dev,
int iio_device_reg_write(struct iio_device *dev,
uint32_t address, uint32_t value)
{
ssize_t ret;

char buf[1024];
snprintf(buf, sizeof(buf), "0x%x 0x%x", address, value);
return iio_device_debug_attr_write(dev, "direct_reg_access", buf);
ret = iio_device_debug_attr_write(dev, "direct_reg_access", buf);

return ret < 0 ? ret : 0;
}

int iio_device_reg_read(struct iio_device *dev,
Expand Down