Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 197383
b: refs/heads/master
c: a1169c5
h: refs/heads/master
i:
  197381: e6f578a
  197379: becbea6
  197375: 69a481c
v: v3
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed May 11, 2010
1 parent a4cc946 commit a3ebb63
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 59 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 85798ec85ec6146bff3af886c06d72cc66940a05
refs/heads/master: a1169c5a0bfec75730a080a5f5d668e65144d1d1
23 changes: 23 additions & 0 deletions trunk/drivers/staging/iio/accel/inclinometer.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Inclinometer related attributes
*/
#include "../sysfs.h"

#define IIO_DEV_ATTR_INCLI_X(_show, _addr) \
IIO_DEVICE_ATTR(incli_x_raw, S_IRUGO, _show, NULL, _addr)

#define IIO_DEV_ATTR_INCLI_Y(_show, _addr) \
IIO_DEVICE_ATTR(incli_y_raw, S_IRUGO, _show, NULL, _addr)

#define IIO_DEV_ATTR_INCLI_Z(_show, _addr) \
IIO_DEVICE_ATTR(incli_z_raw, S_IRUGO, _show, NULL, _addr)

#define IIO_DEV_ATTR_INCLI_X_OFFSET(_mode, _show, _store, _addr) \
IIO_DEVICE_ATTR(incli_x_offset, _mode, _show, _store, _addr)

#define IIO_DEV_ATTR_INCLI_Y_OFFSET(_mode, _show, _store, _addr) \
IIO_DEVICE_ATTR(incli_y_offset, _mode, _show, _store, _addr)

#define IIO_DEV_ATTR_INCLI_Z_OFFSET(_mode, _show, _store, _addr) \
IIO_DEVICE_ATTR(incli_z_offset, _mode, _show, _store, _addr)

43 changes: 4 additions & 39 deletions trunk/drivers/staging/iio/gyro/gyro.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,49 +28,14 @@
IIO_DEVICE_ATTR(gyro_scale, S_IRUGO, _show, _store, _addr)

#define IIO_DEV_ATTR_GYRO(_show, _addr) \
IIO_DEVICE_ATTR(gyro, S_IRUGO, _show, NULL, _addr)
IIO_DEVICE_ATTR(gyro_raw, S_IRUGO, _show, NULL, _addr)

#define IIO_DEV_ATTR_GYRO_X(_show, _addr) \
IIO_DEVICE_ATTR(gyro_x, S_IRUGO, _show, NULL, _addr)
IIO_DEVICE_ATTR(gyro_x_raw, S_IRUGO, _show, NULL, _addr)

#define IIO_DEV_ATTR_GYRO_Y(_show, _addr) \
IIO_DEVICE_ATTR(gyro_y, S_IRUGO, _show, NULL, _addr)
IIO_DEVICE_ATTR(gyro_y_raw, S_IRUGO, _show, NULL, _addr)

#define IIO_DEV_ATTR_GYRO_Z(_show, _addr) \
IIO_DEVICE_ATTR(gyro_z, S_IRUGO, _show, NULL, _addr)
IIO_DEVICE_ATTR(gyro_z_raw, S_IRUGO, _show, NULL, _addr)

#define IIO_DEV_ATTR_TEMP_X(_show, _addr) \
IIO_DEVICE_ATTR(temp_x, S_IRUGO, _show, NULL, _addr)

#define IIO_DEV_ATTR_TEMP_Y(_show, _addr) \
IIO_DEVICE_ATTR(temp_y, S_IRUGO, _show, NULL, _addr)

#define IIO_DEV_ATTR_TEMP_Z(_show, _addr) \
IIO_DEVICE_ATTR(temp_z, S_IRUGO, _show, NULL, _addr)

#define IIO_DEV_ATTR_INCLI_X(_show, _addr) \
IIO_DEVICE_ATTR(incli_x, S_IRUGO, _show, NULL, _addr)

#define IIO_DEV_ATTR_INCLI_Y(_show, _addr) \
IIO_DEVICE_ATTR(incli_y, S_IRUGO, _show, NULL, _addr)

#define IIO_DEV_ATTR_INCLI_Z(_show, _addr) \
IIO_DEVICE_ATTR(incli_z, S_IRUGO, _show, NULL, _addr)

#define IIO_DEV_ATTR_INCLI_X_OFFSET(_mode, _show, _store, _addr) \
IIO_DEVICE_ATTR(incli_x_offset, _mode, _show, _store, _addr)

#define IIO_DEV_ATTR_INCLI_Y_OFFSET(_mode, _show, _store, _addr) \
IIO_DEVICE_ATTR(incli_y_offset, _mode, _show, _store, _addr)

#define IIO_DEV_ATTR_INCLI_Z_OFFSET(_mode, _show, _store, _addr) \
IIO_DEVICE_ATTR(incli_z_offset, _mode, _show, _store, _addr)

#define IIO_DEV_ATTR_ROT(_show, _addr) \
IIO_DEVICE_ATTR(rot, S_IRUGO, _show, NULL, _addr)

#define IIO_DEV_ATTR_ROT_OFFSET(_mode, _show, _store, _addr) \
IIO_DEVICE_ATTR(rot_offset, _mode, _show, _store, _addr)

#define IIO_DEV_ATTR_ANGL(_show, _addr) \
IIO_DEVICE_ATTR(angl, S_IRUGO, _show, NULL, _addr)
11 changes: 6 additions & 5 deletions trunk/drivers/staging/iio/imu/adis16300_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../accel/accel.h"
#include "../accel/inclinometer.h"
#include "../gyro/gyro.h"
#include "../adc/adc.h"

Expand Down Expand Up @@ -613,7 +614,7 @@ static IIO_DEV_ATTR_INCLI_Y(adis16300_read_13bit_signed,
ADIS16300_YINCLI_OUT);
static IIO_CONST_ATTR(incli_scale, "0.044 d");

static IIO_DEV_ATTR_TEMP(adis16300_read_12bit_signed);
static IIO_DEV_ATTR_TEMP_RAW(adis16300_read_12bit_signed);
static IIO_CONST_ATTR(temp_offset, "198.16 K");
static IIO_CONST_ATTR(temp_scale, "0.14 K");

Expand Down Expand Up @@ -645,16 +646,16 @@ static struct attribute *adis16300_attributes[] = {
&iio_dev_attr_accel_z_offset.dev_attr.attr,
&iio_dev_attr_in_supply_raw.dev_attr.attr,
&iio_const_attr_in_supply_scale.dev_attr.attr,
&iio_dev_attr_gyro_x.dev_attr.attr,
&iio_dev_attr_gyro_x_raw.dev_attr.attr,
&iio_const_attr_gyro_scale.dev_attr.attr,
&iio_dev_attr_accel_x_raw.dev_attr.attr,
&iio_dev_attr_accel_y_raw.dev_attr.attr,
&iio_dev_attr_accel_z_raw.dev_attr.attr,
&iio_const_attr_accel_scale.dev_attr.attr,
&iio_dev_attr_incli_x.dev_attr.attr,
&iio_dev_attr_incli_y.dev_attr.attr,
&iio_dev_attr_incli_x_raw.dev_attr.attr,
&iio_dev_attr_incli_y_raw.dev_attr.attr,
&iio_const_attr_incli_scale.dev_attr.attr,
&iio_dev_attr_temp.dev_attr.attr,
&iio_dev_attr_temp_raw.dev_attr.attr,
&iio_const_attr_temp_offset.dev_attr.attr,
&iio_const_attr_temp_scale.dev_attr.attr,
&iio_dev_attr_in0_raw.dev_attr.attr,
Expand Down
16 changes: 8 additions & 8 deletions trunk/drivers/staging/iio/imu/adis16400_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ static IIO_DEV_ATTR_MAGN_Z(adis16400_read_14bit_signed,
static IIO_CONST_ATTR(magn_scale, "0.0005 Gs");


static IIO_DEV_ATTR_TEMP(adis16400_read_12bit_signed);
static IIO_DEV_ATTR_TEMP_RAW(adis16400_read_12bit_signed);
static IIO_CONST_ATTR(temp_offset, "198.16 K");
static IIO_CONST_ATTR(temp_scale, "0.14 K");

Expand Down Expand Up @@ -658,19 +658,19 @@ static struct attribute *adis16400_attributes[] = {
&iio_dev_attr_accel_z_offset.dev_attr.attr,
&iio_dev_attr_in_supply_raw.dev_attr.attr,
&iio_const_attr_in_supply_scale.dev_attr.attr,
&iio_dev_attr_gyro_x.dev_attr.attr,
&iio_dev_attr_gyro_y.dev_attr.attr,
&iio_dev_attr_gyro_z.dev_attr.attr,
&iio_dev_attr_gyro_x_raw.dev_attr.attr,
&iio_dev_attr_gyro_y_raw.dev_attr.attr,
&iio_dev_attr_gyro_z_raw.dev_attr.attr,
&iio_const_attr_gyro_scale.dev_attr.attr,
&iio_dev_attr_accel_x_raw.dev_attr.attr,
&iio_dev_attr_accel_y_raw.dev_attr.attr,
&iio_dev_attr_accel_z_raw.dev_attr.attr,
&iio_const_attr_accel_scale.dev_attr.attr,
&iio_dev_attr_magn_x.dev_attr.attr,
&iio_dev_attr_magn_y.dev_attr.attr,
&iio_dev_attr_magn_z.dev_attr.attr,
&iio_dev_attr_magn_x_raw.dev_attr.attr,
&iio_dev_attr_magn_y_raw.dev_attr.attr,
&iio_dev_attr_magn_z_raw.dev_attr.attr,
&iio_const_attr_magn_scale.dev_attr.attr,
&iio_dev_attr_temp.dev_attr.attr,
&iio_dev_attr_temp_raw.dev_attr.attr,
&iio_const_attr_temp_offset.dev_attr.attr,
&iio_const_attr_temp_scale.dev_attr.attr,
&iio_dev_attr_in0_raw.dev_attr.attr,
Expand Down
12 changes: 6 additions & 6 deletions trunk/drivers/staging/iio/magnetometer/magnet.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
#define IIO_DEV_ATTR_MAGN_Z_GAIN(_mode, _show, _store, _addr) \
IIO_DEVICE_ATTR(magn_z_gain, _mode, _show, _store, _addr)

#define IIO_DEV_ATTR_MAGN_X(_show, _addr) \
IIO_DEVICE_ATTR(magn_x, S_IRUGO, _show, NULL, _addr)
#define IIO_DEV_ATTR_MAGN_X(_show, _addr) \
IIO_DEVICE_ATTR(magn_x_raw, S_IRUGO, _show, NULL, _addr)

#define IIO_DEV_ATTR_MAGN_Y(_show, _addr) \
IIO_DEVICE_ATTR(magn_y, S_IRUGO, _show, NULL, _addr)
#define IIO_DEV_ATTR_MAGN_Y(_show, _addr) \
IIO_DEVICE_ATTR(magn_y_raw, S_IRUGO, _show, NULL, _addr)

#define IIO_DEV_ATTR_MAGN_Z(_show, _addr) \
IIO_DEVICE_ATTR(magn_z, S_IRUGO, _show, NULL, _addr)
#define IIO_DEV_ATTR_MAGN_Z(_show, _addr) \
IIO_DEVICE_ATTR(magn_z_raw, S_IRUGO, _show, NULL, _addr)

0 comments on commit a3ebb63

Please sign in to comment.