From 88b64ee23785a1326a02bd6e928dbdbc5b5ec5b3 Mon Sep 17 00:00:00 2001
From: Rocco Marco Guglielmi <roccomarco.guglielmi@gmail.com>
Date: Tue, 27 Feb 2018 16:19:21 +0000
Subject: Updated base classes for sensors

git-svn-id: https://svn.code.sf.net/p/chibios/svn2/trunk@11587 110e8d01-0319-4d1e-a829-52ad28d1bb01
---
 os/hal/lib/peripherals/sensors/hal_hygrometer.h | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'os/hal/lib/peripherals/sensors/hal_hygrometer.h')

diff --git a/os/hal/lib/peripherals/sensors/hal_hygrometer.h b/os/hal/lib/peripherals/sensors/hal_hygrometer.h
index 31c066e92..054e6faf5 100644
--- a/os/hal/lib/peripherals/sensors/hal_hygrometer.h
+++ b/os/hal/lib/peripherals/sensors/hal_hygrometer.h
@@ -85,7 +85,7 @@ struct BaseHygrometerVMT {
  */
 typedef struct {
   /** @brief Virtual Methods Table.*/
-  const struct BaseHygrometerVMT *vmt_hygrometer;
+  const struct BaseHygrometerVMT *vmt;
   _base_hygrometer_data
 } BaseHygrometer;
 
@@ -96,13 +96,6 @@ typedef struct {
  * @name    Macro Functions (BaseHygrometer)
  * @{
  */
-/**
- * @brief   Instance getter.
- * @details This special method is used to get the instance of this class
- *          object from a derived class.
- */
-#define getBaseHygrometer(ip) ((BaseHygrometer *)&(ip)->vmt_hygrometer)
-
 /**
  * @brief   Hygrometer get channels number.
  *
@@ -112,7 +105,7 @@ typedef struct {
  * @api
  */
 #define hygrometerGetChannelsNumber(ip)                                     \
-        (ip)->vmt_hygrometer->get_channels_number(ip)
+        (ip)->vmt->get_channels_number(ip)
 
 /**
  * @brief   Hygrometer read raw data.
@@ -127,7 +120,7 @@ typedef struct {
  * @api
  */
 #define hygrometerReadRaw(ip, dp)                                           \
-        (ip)->vmt_hygrometer->read_raw(ip, dp)
+        (ip)->vmt->read_raw(ip, dp)
 
 /**
  * @brief   Hygrometer read cooked data.
@@ -142,7 +135,7 @@ typedef struct {
  * @api
  */
 #define hygrometerReadCooked(ip, dp)                                        \
-        (ip)->vmt_hygrometer->read_cooked(ip, dp)
+        (ip)->vmt->read_cooked(ip, dp)
 
 /**
  * @brief   Updates hygrometer bias data from received buffer.
@@ -159,7 +152,7 @@ typedef struct {
  * @api
  */
 #define hygrometerSetBias(ip, bp)                                           \
-        (ip)->vmt_hygrometer->set_bias(ip, bp)
+        (ip)->vmt->set_bias(ip, bp)
 
 /**
  * @brief   Reset hygrometer bias data restoring it to zero.
@@ -173,7 +166,7 @@ typedef struct {
  * @api
  */
 #define hygrometerResetBias(ip)                                             \
-        (ip)->vmt_hygrometer->reset_bias(ip)
+        (ip)->vmt->reset_bias(ip)
 
 /**
  * @brief   Updates hygrometer sensitivity data from received buffer.
@@ -190,7 +183,7 @@ typedef struct {
  * @api
  */
 #define hygrometerSetSensitivity(ip, sp)                                    \
-        (ip)->vmt_hygrometer->set_sensitivity(ip, sp)
+        (ip)->vmt->set_sensitivity(ip, sp)
 
 /**
  * @brief   Reset hygrometer sensitivity data restoring it to its typical
@@ -205,7 +198,7 @@ typedef struct {
  * @api
  */
 #define hygrometerResetSensitivity(ip)                                      \
-        (ip)->vmt_hygrometer->reset_sensitivity(ip)
+        (ip)->vmt->reset_sensitivity(ip)
 /** @} */
 
 /*===========================================================================*/
-- 
cgit v1.2.3