mirror of
https://github.com/apache/nuttx.git
synced 2026-06-02 01:21:26 +08:00
Trivial changes from review of last PR.
This commit is contained in:
@@ -133,10 +133,6 @@ static const struct file_operations g_lis3dh_fops =
|
|||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Public Data
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Private Functions
|
* Private Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
@@ -262,10 +258,10 @@ static int lis3dh_ident(FAR struct lis3dh_dev_s *dev)
|
|||||||
{
|
{
|
||||||
return OK;
|
return OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Name: lis3dh_queue_lock
|
* Name: lis3dh_queue_lock
|
||||||
*
|
*
|
||||||
@@ -456,8 +452,8 @@ static int lis3dh_read_fifo(FAR struct lis3dh_dev_s *dev)
|
|||||||
data.x_acc = (float)x_acc * 0.016;
|
data.x_acc = (float)x_acc * 0.016;
|
||||||
data.y_acc = (float)y_acc * 0.016;
|
data.y_acc = (float)y_acc * 0.016;
|
||||||
data.z_acc = (float)z_acc * 0.016;
|
data.z_acc = (float)z_acc * 0.016;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case LIS3DH_POWER_NORMAL: /* 10 bit measurements */
|
case LIS3DH_POWER_NORMAL: /* 10 bit measurements */
|
||||||
x_acc = (int16_t)x_raw >> 6;
|
x_acc = (int16_t)x_raw >> 6;
|
||||||
y_acc = (int16_t)y_raw >> 6;
|
y_acc = (int16_t)y_raw >> 6;
|
||||||
@@ -466,8 +462,8 @@ static int lis3dh_read_fifo(FAR struct lis3dh_dev_s *dev)
|
|||||||
data.x_acc = (float)x_acc * 0.004;
|
data.x_acc = (float)x_acc * 0.004;
|
||||||
data.y_acc = (float)y_acc * 0.004;
|
data.y_acc = (float)y_acc * 0.004;
|
||||||
data.z_acc = (float)z_acc * 0.004;
|
data.z_acc = (float)z_acc * 0.004;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case LIS3DH_POWER_HIGH: /* 12 bit measurements */
|
case LIS3DH_POWER_HIGH: /* 12 bit measurements */
|
||||||
x_acc = (int16_t)x_raw >> 4;
|
x_acc = (int16_t)x_raw >> 4;
|
||||||
y_acc = (int16_t)y_raw >> 4;
|
y_acc = (int16_t)y_raw >> 4;
|
||||||
@@ -476,8 +472,8 @@ static int lis3dh_read_fifo(FAR struct lis3dh_dev_s *dev)
|
|||||||
data.x_acc = (float)x_acc * 0.001;
|
data.x_acc = (float)x_acc * 0.001;
|
||||||
data.y_acc = (float)y_acc * 0.001;
|
data.y_acc = (float)y_acc * 0.001;
|
||||||
data.z_acc = (float)z_acc * 0.001;
|
data.z_acc = (float)z_acc * 0.001;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
snerr("Unknown power mode\n");
|
snerr("Unknown power mode\n");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
@@ -588,6 +584,7 @@ static int lis3dh_set_power_mode(FAR struct lis3dh_dev_s *dev,
|
|||||||
lis3dh_write_register(dev, LIS3DH_CTRL_REG1, ctrl1);
|
lis3dh_write_register(dev, LIS3DH_CTRL_REG1, ctrl1);
|
||||||
lis3dh_write_register(dev, LIS3DH_CTRL_REG4, ctrl4);
|
lis3dh_write_register(dev, LIS3DH_CTRL_REG4, ctrl4);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case LIS3DH_POWER_NORMAL:
|
case LIS3DH_POWER_NORMAL:
|
||||||
lis3dh_read_register(dev, LIS3DH_CTRL_REG1, &ctrl1);
|
lis3dh_read_register(dev, LIS3DH_CTRL_REG1, &ctrl1);
|
||||||
lis3dh_read_register(dev, LIS3DH_CTRL_REG4, &ctrl4);
|
lis3dh_read_register(dev, LIS3DH_CTRL_REG4, &ctrl4);
|
||||||
@@ -598,6 +595,7 @@ static int lis3dh_set_power_mode(FAR struct lis3dh_dev_s *dev,
|
|||||||
lis3dh_write_register(dev, LIS3DH_CTRL_REG1, ctrl1);
|
lis3dh_write_register(dev, LIS3DH_CTRL_REG1, ctrl1);
|
||||||
lis3dh_write_register(dev, LIS3DH_CTRL_REG4, ctrl4);
|
lis3dh_write_register(dev, LIS3DH_CTRL_REG4, ctrl4);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case LIS3DH_POWER_HIGH:
|
case LIS3DH_POWER_HIGH:
|
||||||
lis3dh_read_register(dev, LIS3DH_CTRL_REG1, &ctrl1);
|
lis3dh_read_register(dev, LIS3DH_CTRL_REG1, &ctrl1);
|
||||||
lis3dh_read_register(dev, LIS3DH_CTRL_REG4, &ctrl4);
|
lis3dh_read_register(dev, LIS3DH_CTRL_REG4, &ctrl4);
|
||||||
@@ -608,6 +606,7 @@ static int lis3dh_set_power_mode(FAR struct lis3dh_dev_s *dev,
|
|||||||
lis3dh_write_register(dev, LIS3DH_CTRL_REG1, ctrl1);
|
lis3dh_write_register(dev, LIS3DH_CTRL_REG1, ctrl1);
|
||||||
lis3dh_write_register(dev, LIS3DH_CTRL_REG4, ctrl4);
|
lis3dh_write_register(dev, LIS3DH_CTRL_REG4, ctrl4);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
break;
|
break;
|
||||||
@@ -891,6 +890,7 @@ static ssize_t lis3dh_read(FAR struct file *filep, FAR char *buffer,
|
|||||||
|
|
||||||
data++;
|
data++;
|
||||||
}
|
}
|
||||||
|
|
||||||
return count * sizeof(struct lis3dh_sensor_data_s);
|
return count * sizeof(struct lis3dh_sensor_data_s);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -929,7 +929,7 @@ static ssize_t lis3dh_write(FAR struct file *filep, FAR const char *buffer,
|
|||||||
*
|
*
|
||||||
* Returned Value:
|
* Returned Value:
|
||||||
* OK - The command was executed successfully.
|
* OK - The command was executed successfully.
|
||||||
* -ENOTTY - The request command is not applicible to the driver.
|
* -ENOTTY - The request command is not applicable to the driver.
|
||||||
*
|
*
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user