Updated peripherals interfaces (Fixing Bug #915).

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11437 35acf78f-673a-0410-8e92-d51de3d6d3f4

7 files changed, 54 insertions, 54 deletions

diff --git a/os/hal/lib/peripherals/sensors/hal_accelerometer.h b/os/hal/lib/peripherals/sensors/hal_accelerometer.h
index dbc96484a..31e12637e 100644
--- a/os/hal/lib/peripherals/sensors/hal_accelerometer.h
+++ b/os/hal/lib/peripherals/sensors/hal_accelerometer.h
@@ -82,8 +82,8 @@ struct BaseAccelerometerVMT {
  */

 typedef struct {

   /** @brief Virtual Methods Table.*/

-  const struct BaseAccelerometerVMT *vmt_baseaccelerometer;

-  _base_sensor_data

+  const struct BaseAccelerometerVMT *vmt_accelerometer;

+  _base_accelerometer_data

 } BaseAccelerometer;

 

 /*===========================================================================*/

@@ -103,7 +103,7 @@ typedef struct {
  * @api

  */

 #define accelerometerGetAxesNumber(ip)                                      \

-        (ip)->vmt_baseaccelerometer->get_channels_number(ip)

+        (ip)->vmt_accelerometer->get_channels_number(ip)

 

 /**

  * @brief   Accelerometer read raw data.

@@ -118,7 +118,7 @@ typedef struct {
  * @api

  */

 #define accelerometerReadRaw(ip, dp)                                        \

-        (ip)->vmt_baseaccelerometer->read_raw(ip, dp)

+        (ip)->vmt_accelerometer->read_raw(ip, dp)

 

 /**

  * @brief   Accelerometer read cooked data.

@@ -133,7 +133,7 @@ typedef struct {
  * @api

  */

 #define accelerometerReadCooked(ip, dp)                                     \

-        (ip)->vmt_baseaccelerometer->read_cooked(ip, dp)

+        (ip)->vmt_accelerometer->read_cooked(ip, dp)

 

 /**

  * @brief   Updates accelerometer bias data from received buffer.

@@ -151,7 +151,7 @@ typedef struct {
  * @api

  */

 #define accelerometerSetBias(ip, bp)                                        \

-        (ip)->vmt_baseaccelerometer->set_bias(ip, bp)

+        (ip)->vmt_accelerometer->set_bias(ip, bp)

 

 /**

  * @brief   Reset accelerometer bias data restoring it to zero.

@@ -165,7 +165,7 @@ typedef struct {
  * @api

  */

 #define accelerometerResetBias(ip)                                          \

-        (ip)->vmt_baseaccelerometer->reset_bias(ip)

+        (ip)->vmt_accelerometer->reset_bias(ip)

 

 /**

  * @brief   Updates accelerometer sensitivity data from received buffer.

@@ -182,7 +182,7 @@ typedef struct {
  * @api

  */

 #define accelerometerSetSensitivity(ip, sp)                                 \

-        (ip)->vmt_baseaccelerometer->set_sensitivity(ip, sp)

+        (ip)->vmt_accelerometer->set_sensitivity(ip, sp)

 

 /**

  * @brief   Reset accelerometer sensitivity data restoring it to its typical

@@ -197,7 +197,7 @@ typedef struct {
  * @api

  */

 #define accelerometerResetSensitivity(ip)                                   \

-        (ip)->vmt_baseaccelerometer->reset_sensitivity(ip)

+        (ip)->vmt_accelerometer->reset_sensitivity(ip)

 /** @} */

 

 /*===========================================================================*/

diff --git a/os/hal/lib/peripherals/sensors/hal_barometer.h b/os/hal/lib/peripherals/sensors/hal_barometer.h
index 168922761..079d569ac 100644
--- a/os/hal/lib/peripherals/sensors/hal_barometer.h
+++ b/os/hal/lib/peripherals/sensors/hal_barometer.h
@@ -83,7 +83,7 @@ struct BaseBarometerVMT {
  */

 typedef struct {

   /** @brief Virtual Methods Table.*/

-  const struct BaseBarometerVMT *vmt_basebarometer;

+  const struct BaseBarometerVMT *vmt_barometer;

   _base_barometer_data

 } BaseBarometer;

 

@@ -103,7 +103,7 @@ typedef struct {
  * @api

  */

 #define barometerGetChannelsNumber(ip)                                      \

-        (ip)->vmt_basebarometer->get_channels_number(ip)

+        (ip)->vmt_barometer->get_channels_number(ip)

 

 /**

  * @brief   Barometer read raw data.

@@ -118,7 +118,7 @@ typedef struct {
  * @api

  */

 #define barometerReadRaw(ip, dp)                                              \

-        (ip)->vmt_basebarometer->read_raw(ip, dp)

+        (ip)->vmt_barometer->read_raw(ip, dp)

 

 /**

  * @brief   Barometer read cooked data.

@@ -133,7 +133,7 @@ typedef struct {
  * @api

  */

 #define barometerReadCooked(ip, dp)                                           \

-        (ip)->vmt_basebarometer->read_cooked(ip, dp)

+        (ip)->vmt_barometer->read_cooked(ip, dp)

 

 /**

  * @brief   Updates barometer bias data from received buffer.

@@ -150,7 +150,7 @@ typedef struct {
  * @api

  */

 #define barometerSetBias(ip, bp)                                            \

-        (ip)->vmt_basebarometer->set_bias(ip, bp)

+        (ip)->vmt_barometer->set_bias(ip, bp)

 

 /**

  * @brief   Reset barometer bias data restoring it to zero.

@@ -164,7 +164,7 @@ typedef struct {
  * @api

  */

 #define barometerResetBias(ip)                                               \

-        (ip)->vmt_basebarometer->reset_bias(ip)

+        (ip)->vmt_barometer->reset_bias(ip)

 

 /**

  * @brief   Updates barometer sensitivity data from received buffer.

@@ -181,7 +181,7 @@ typedef struct {
  * @api

  */

 #define barometerSetSensitivity(ip, sp)                                     \

-        (ip)->vmt_basebarometer->set_sensitivity(ip, sp)

+        (ip)->vmt_barometer->set_sensitivity(ip, sp)

 

 /**

  * @brief   Reset barometer sensitivity data restoring it to its typical

@@ -196,7 +196,7 @@ typedef struct {
  * @api

  */

 #define barometerResetSensitivity(ip)                                       \

-        (ip)->vmt_basebarometer->reset_sensitivity(ip)

+        (ip)->vmt_barometer->reset_sensitivity(ip)

 /** @} */

 

 /*===========================================================================*/

diff --git a/os/hal/lib/peripherals/sensors/hal_compass.h b/os/hal/lib/peripherals/sensors/hal_compass.h
index 51b1fe407..34473e04a 100644
--- a/os/hal/lib/peripherals/sensors/hal_compass.h
+++ b/os/hal/lib/peripherals/sensors/hal_compass.h
@@ -83,7 +83,7 @@ struct BaseCompassVMT {
  */

 typedef struct {

   /** @brief Virtual Methods Table.*/

-  const struct BaseCompassVMT *vmt_basecompass;

+  const struct BaseCompassVMT *vmt_compass;

   _base_compass_data

 } BaseCompass;

 

@@ -103,7 +103,7 @@ typedef struct {
  * @api

  */

 #define compassGetAxesNumber(ip)                                            \

-        (ip)->vmt_basecompass->get_channels_number(ip)

+        (ip)->vmt_compass->get_channels_number(ip)

 

 /**

  * @brief   Compass read raw data.

@@ -118,7 +118,7 @@ typedef struct {
  * @api

  */

 #define compassReadRaw(ip, dp)                                              \

-        (ip)->vmt_basecompass->read_raw(ip, dp)

+        (ip)->vmt_compass->read_raw(ip, dp)

 

 /**

  * @brief   Compass read cooked data.

@@ -133,7 +133,7 @@ typedef struct {
  * @api

  */

 #define compassReadCooked(ip, dp)                                           \

-        (ip)->vmt_basecompass->read_cooked(ip, dp)

+        (ip)->vmt_compass->read_cooked(ip, dp)

 

 /**

  * @brief   Updates compass bias data from received buffer.

@@ -150,7 +150,7 @@ typedef struct {
  * @api

  */

 #define compassSetBias(ip, bp)                                            \

-        (ip)->vmt_basecompass->set_bias(ip, bp)

+        (ip)->vmt_compass->set_bias(ip, bp)

 

 /**

  * @brief   Reset compass bias data restoring it to zero.

@@ -164,7 +164,7 @@ typedef struct {
  * @api

  */

 #define compassResetBias(ip)                                               \

-        (ip)->vmt_basecompass->reset_bias(ip)

+        (ip)->vmt_compass->reset_bias(ip)

 

 /**

  * @brief   Updates compass sensitivity data from received buffer.

@@ -181,7 +181,7 @@ typedef struct {
  * @api

  */

 #define compassSetSensitivity(ip, sp)                                     \

-        (ip)->vmt_basecompass->set_sensitivity(ip, sp)

+        (ip)->vmt_compass->set_sensitivity(ip, sp)

 

 /**

  * @brief   Reset compass sensitivity data restoring it to its typical

@@ -196,7 +196,7 @@ typedef struct {
  * @api

  */

 #define compassResetSensitivity(ip)                                       \

-        (ip)->vmt_basecompass->reset_sensitivity(ip)

+        (ip)->vmt_compass->reset_sensitivity(ip)

 /** @} */

 

 /*===========================================================================*/

diff --git a/os/hal/lib/peripherals/sensors/hal_gyroscope.h b/os/hal/lib/peripherals/sensors/hal_gyroscope.h
index bc3e693a3..00786607e 100644
--- a/os/hal/lib/peripherals/sensors/hal_gyroscope.h
+++ b/os/hal/lib/peripherals/sensors/hal_gyroscope.h
@@ -85,7 +85,7 @@ struct BaseGyroscopeVMT {
  */

 typedef struct {

   /** @brief Virtual Methods Table.*/

-  const struct BaseGyroscopeVMT *vmt_basegyroscope;

+  const struct BaseGyroscopeVMT *vmt_gyroscope;

   _base_gyroscope_data

 } BaseGyroscope;

 

@@ -106,7 +106,7 @@ typedef struct {
  * @api

  */

 #define gyroscopeGetAxesNumber(ip)                                          \

-        (ip)->vmt_basegyroscope->get_channels_number(ip)

+        (ip)->vmt_gyroscope->get_channels_number(ip)

 

 /**

  * @brief   Gyroscope read raw data.

@@ -121,7 +121,7 @@ typedef struct {
  * @api

  */

 #define gyroscopeReadRaw(ip, dp)                                            \

-        (ip)->vmt_basegyroscope->read_raw(ip, dp)

+        (ip)->vmt_gyroscope->read_raw(ip, dp)

 

 /**

  * @brief   Gyroscope read cooked data.

@@ -136,7 +136,7 @@ typedef struct {
  * @api

  */

 #define gyroscopeReadCooked(ip, dp)                                         \

-        (ip)->vmt_basegyroscope->read_cooked(ip, dp)

+        (ip)->vmt_gyroscope->read_cooked(ip, dp)

 

 /**

  * @brief   Gyroscope bias sampling procedure.

@@ -153,7 +153,7 @@ typedef struct {
  * @api

  */

 #define gyroscopeSampleBias(ip)                                             \

-        (ip)->vmt_basegyroscope->sample_bias(ip)

+        (ip)->vmt_gyroscope->sample_bias(ip)

 

 /**

  * @brief   Updates gyroscope bias data from received buffer.

@@ -170,7 +170,7 @@ typedef struct {
  * @api

  */

 #define gyroscopeSetBias(ip, bp)                                            \

-        (ip)->vmt_basegyroscope->set_bias(ip, bp)

+        (ip)->vmt_gyroscope->set_bias(ip, bp)

 		

 /**

  * @brief   Reset gyroscope bias data restoring it to zero.

@@ -184,7 +184,7 @@ typedef struct {
  * @api

  */

 #define gyroscopeResetBias(ip)                                               \

-        (ip)->vmt_basegyroscope->reset_bias(ip)

+        (ip)->vmt_gyroscope->reset_bias(ip)

 		

 /**

  * @brief   Updates gyroscope sensitivity data from received buffer.

@@ -201,7 +201,7 @@ typedef struct {
  * @api

  */

 #define gyroscopeSetSensitivity(ip, sp)                                     \

-        (ip)->vmt_basegyroscope->set_sensitivity(ip, sp)

+        (ip)->vmt_gyroscope->set_sensitivity(ip, sp)

 		

 /**

  * @brief   Reset gyroscope sensitivity data restoring it to its typical 

@@ -216,7 +216,7 @@ typedef struct {
  * @api

  */

 #define gyroscopeResetSensitivity(ip)                                       \

-        (ip)->vmt_basegyroscope->reset_sensitivity(ip)

+        (ip)->vmt_gyroscope->reset_sensitivity(ip)

 /** @} */

 

 /*===========================================================================*/

diff --git a/os/hal/lib/peripherals/sensors/hal_hygrometer.h b/os/hal/lib/peripherals/sensors/hal_hygrometer.h
index d6a9c1634..6cf5eef21 100644
--- a/os/hal/lib/peripherals/sensors/hal_hygrometer.h
+++ b/os/hal/lib/peripherals/sensors/hal_hygrometer.h
@@ -83,7 +83,7 @@ struct BaseHygrometerVMT {
  */

 typedef struct {

   /** @brief Virtual Methods Table.*/

-  const struct BaseHygrometerVMT *vmt_basehygrometer;

+  const struct BaseHygrometerVMT *vmt_hygrometer;

   _base_hygrometer_data

 } BaseHygrometer;

 

@@ -103,7 +103,7 @@ typedef struct {
  * @api

  */

 #define hygrometerGetChannelsNumber(ip)                                     \

-        (ip)->vmt_basehygrometer->get_channels_number(ip)

+        (ip)->vmt_hygrometer->get_channels_number(ip)

 

 /**

  * @brief   Hygrometer read raw data.

@@ -118,7 +118,7 @@ typedef struct {
  * @api

  */

 #define hygrometerReadRaw(ip, dp)                                           \

-        (ip)->vmt_basehygrometer->read_raw(ip, dp)

+        (ip)->vmt_hygrometer->read_raw(ip, dp)

 

 /**

  * @brief   Hygrometer read cooked data.

@@ -133,7 +133,7 @@ typedef struct {
  * @api

  */

 #define hygrometerReadCooked(ip, dp)                                        \

-        (ip)->vmt_basehygrometer->read_cooked(ip, dp)

+        (ip)->vmt_hygrometer->read_cooked(ip, dp)

 

 /**

  * @brief   Updates hygrometer bias data from received buffer.

@@ -150,7 +150,7 @@ typedef struct {
  * @api

  */

 #define hygrometerSetBias(ip, bp)                                           \

-        (ip)->vmt_basehygrometer->set_bias(ip, bp)

+        (ip)->vmt_hygrometer->set_bias(ip, bp)

 

 /**

  * @brief   Reset hygrometer bias data restoring it to zero.

@@ -164,7 +164,7 @@ typedef struct {
  * @api

  */

 #define hygrometerResetBias(ip)                                             \

-        (ip)->vmt_basehygrometer->reset_bias(ip)

+        (ip)->vmt_hygrometer->reset_bias(ip)

 

 /**

  * @brief   Updates hygrometer sensitivity data from received buffer.

@@ -181,7 +181,7 @@ typedef struct {
  * @api

  */

 #define hygrometerSetSensitivity(ip, sp)                                    \

-        (ip)->vmt_basehygrometer->set_sensitivity(ip, sp)

+        (ip)->vmt_hygrometer->set_sensitivity(ip, sp)

 

 /**

  * @brief   Reset hygrometer sensitivity data restoring it to its typical

@@ -196,7 +196,7 @@ typedef struct {
  * @api

  */

 #define hygrometerResetSensitivity(ip)                                      \

-        (ip)->vmt_basehygrometer->reset_sensitivity(ip)

+        (ip)->vmt_hygrometer->reset_sensitivity(ip)

 /** @} */

 

 /*===========================================================================*/

diff --git a/os/hal/lib/peripherals/sensors/hal_sensors.h b/os/hal/lib/peripherals/sensors/hal_sensors.h
index ad053667a..6a97ddaed 100644
--- a/os/hal/lib/peripherals/sensors/hal_sensors.h
+++ b/os/hal/lib/peripherals/sensors/hal_sensors.h
@@ -79,7 +79,7 @@ struct BaseSensorVMT {
  */

 typedef struct {

   /** @brief Virtual Methods Table.*/

-  const struct BaseSensorVMT *vmt_basesensor;

+  const struct BaseSensorVMT *vmt_sensor;

   _base_sensor_data

 } BaseSensor;

 

@@ -99,7 +99,7 @@ typedef struct {
  *

  * @api

  */

-#define sensorGetChannelNumber(ip) (ip)->vmt_basesensor->get_channels_number(ip)

+#define sensorGetChannelNumber(ip) (ip)->vmt_sensor->get_channels_number(ip)

 

 /**

  * @brief   Sensors read raw data.

@@ -113,7 +113,7 @@ typedef struct {
  *

  * @api

  */

-#define sensorReadRaw(ip, dp) (ip)->vmt_basesensor->read_raw(ip, dp)

+#define sensorReadRaw(ip, dp) (ip)->vmt_sensor->read_raw(ip, dp)

 

 /**

  * @brief   Sensors read cooked data.

@@ -127,7 +127,7 @@ typedef struct {
  *

  * @api

  */

-#define sensorReadCooked(ip, dp) (ip)->vmt_basesensor->read_cooked(ip, dp)

+#define sensorReadCooked(ip, dp) (ip)->vmt_sensor->read_cooked(ip, dp)

 /** @} */

 

 /*===========================================================================*/

diff --git a/os/hal/lib/peripherals/sensors/hal_thermometer.h b/os/hal/lib/peripherals/sensors/hal_thermometer.h
index b02cbfe07..4620cbd0a 100644
--- a/os/hal/lib/peripherals/sensors/hal_thermometer.h
+++ b/os/hal/lib/peripherals/sensors/hal_thermometer.h
@@ -83,7 +83,7 @@ struct BaseThermometerVMT {
  */

 typedef struct {

   /** @brief Virtual Methods Table.*/

-  const struct BaseThermometerVMT *vmt_basethermometer;

+  const struct BaseThermometerVMT *vmt_thermometer;

   _base_thermometer_data

 } BaseThermometer;

 

@@ -103,7 +103,7 @@ typedef struct {
  * @api

  */

 #define thermometerGetChannelsNumber(ip)                                    \

-        (ip)->vmt_basethermometer->get_channels_number(ip)

+        (ip)->vmt_thermometer->get_channels_number(ip)

 

 /**

  * @brief   Thermometer read raw data.

@@ -118,7 +118,7 @@ typedef struct {
  * @api

  */

 #define thermometerReadRaw(ip, dp)                                          \

-        (ip)->vmt_basethermometer->read_raw(ip, dp)

+        (ip)->vmt_thermometer->read_raw(ip, dp)

 

 /**

  * @brief   Thermometer read cooked data.

@@ -133,7 +133,7 @@ typedef struct {
  * @api

  */

 #define thermometerReadCooked(ip, dp)                                       \

-        (ip)->vmt_basethermometer->read_cooked(ip, dp)

+        (ip)->vmt_thermometer->read_cooked(ip, dp)

 

 /**

  * @brief   Updates thermometer bias data from received buffer.

@@ -150,7 +150,7 @@ typedef struct {
  * @api

  */

 #define thermometerSetBias(ip, bp)                                          \

-        (ip)->vmt_basethermometer->set_bias(ip, bp)

+        (ip)->vmt_thermometer->set_bias(ip, bp)

 

 /**

  * @brief   Reset thermometer bias data restoring it to zero.

@@ -164,7 +164,7 @@ typedef struct {
  * @api

  */

 #define thermometerResetBias(ip)                                            \

-        (ip)->vmt_basethermometer->reset_bias(ip)

+        (ip)->vmt_thermometer->reset_bias(ip)

 

 /**

  * @brief   Updates thermometer sensitivity data from received buffer.

@@ -181,7 +181,7 @@ typedef struct {
  * @api

  */

 #define thermometerSetSensitivity(ip, sp)                                   \

-        (ip)->vmt_basethermometer->set_sensitivity(ip, sp)

+        (ip)->vmt_thermometer->set_sensitivity(ip, sp)

 

 /**

  * @brief   Reset thermometer sensitivity data restoring it to its typical

@@ -196,7 +196,7 @@ typedef struct {
  * @api

  */

 #define thermometerResetSensitivity(ip)                                     \

-        (ip)->vmt_basethermometer->reset_sensitivity(ip)

+        (ip)->vmt_thermometer->reset_sensitivity(ip)

 /** @} */

 

 /*===========================================================================*/