X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fpcf8574.h;h=bf2f8e5ea5df254da2a4bbda9d3f343f2790695e;hb=fe0574946861850880407c1be53f3b12c61cbb04;hp=7d53d95ec88cc0268f719c9cc37225c128868014;hpb=830e0e12736975e4da0440cc225ff6a4e98d45ca;p=bertos.git

diff --git a/bertos/drv/pcf8574.h b/bertos/drv/pcf8574.h
index 7d53d95e..bf2f8e5e 100644
--- a/bertos/drv/pcf8574.h
+++ b/bertos/drv/pcf8574.h
@@ -30,17 +30,33 @@
  *
  * -->
  *
- * \brief PCF8574 i2c port expander driver (interface).
+ * \brief PCF8574 i2c port expander driver.
  *
- * \version $Id: ft245rl.c 22301 2008-09-09 16:53:17Z batt $
  * \author Francesco Sacchi <batt@develer.com>
+ *
+ * $WIZ$ module_name = "pcf8574"
+ * $WIZ$ module_depends = "i2c"
  */
 
 #ifndef DRV_PCF8574_H
 #define DRV_PCF8574_H
 
+#include "cfg/cfg_i2c.h"
+
 #include <cfg/compiler.h>
 
+#include <drv/i2c.h>
+
+#if COMPILER_C99
+	#define pcf8574_init(...)       PP_CAT(pcf8574_init ## _, COUNT_PARMS(__VA_ARGS__)) (__VA_ARGS__)
+	#define pcf8574_get(...)        PP_CAT(pcf8574_get ## _, COUNT_PARMS(__VA_ARGS__)) (__VA_ARGS__)
+	#define pcf8574_put(...)        PP_CAT(pcf8574_put ## _, COUNT_PARMS(__VA_ARGS__)) (__VA_ARGS__)
+#else
+	#define pcf8574_init(args...)   PP_CAT(pcf8574_init ## _, COUNT_PARMS(args)) (args)
+	#define pcf8574_get(args...)    PP_CAT(pcf8574_get ## _, COUNT_PARMS(args)) (args)
+	#define pcf8574_put(args...)    PP_CAT(pcf8574_put ## _, COUNT_PARMS(args)) (args)
+#endif
+
 typedef uint8_t pcf8574_addr;
 
 /**
@@ -51,9 +67,18 @@ typedef struct Pcf8574
 	pcf8574_addr addr;
 } Pcf8574;
 
+#define PCF8574ID 0x40 ///< I2C address
+
+#if !CONFIG_I2C_DISABLE_OLD_API
+
+DEPRECATED int pcf8574_get_1(Pcf8574 *pcf);
+DEPRECATED bool pcf8574_put_2(Pcf8574 *pcf, uint8_t data);
+DEPRECATED bool pcf8574_init_2(Pcf8574 *pcf, pcf8574_addr addr);
+#endif /* !CONFIG_I2C_DISABLE_OLD_API */
+
 
-int pcf8574_get(Pcf8574 *pcf);
-bool pcf8574_put(Pcf8574 *pcf, uint8_t data);
-bool pcf8574_init(Pcf8574 *pcf, pcf8574_addr addr);
+int pcf8574_get_2(I2c *i2c, Pcf8574 *pcf);
+bool pcf8574_put_3(I2c *i2c, Pcf8574 *pcf, uint8_t data);
+bool pcf8574_init_3(I2c *i2c, Pcf8574 *pcf, pcf8574_addr addr);
 
 #endif /* DRV_PCF8574_H */