From 46acfaebd2e4670e0d63696dc55fcb5f6bd9737a Mon Sep 17 00:00:00 2001 From: Dimitri Stolnikov Date: Sun, 1 Apr 2012 12:40:51 +0200 Subject: rework on autotools handling of private headers --- include/Makefile.am | 2 +- include/i2c.h | 9 --------- include/rtlsdr_i2c.h | 9 +++++++++ src/tuner_e4000.c | 2 +- src/tuner_fc0012.c | 2 +- src/tuner_fc0013.c | 3 ++- 6 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 include/i2c.h create mode 100644 include/rtlsdr_i2c.h diff --git a/include/Makefile.am b/include/Makefile.am index 50d681c..17482c9 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,5 +1,5 @@ rtlsdr_HEADERS = rtl-sdr.h -noinst_HEADERS = i2c.h tuner_e4000.h tuner_fc0013.h +noinst_HEADERS = rtlsdr_i2c.h tuner_e4000.h tuner_fc0012.h tuner_fc0013.h rtlsdrdir = $(includedir) diff --git a/include/i2c.h b/include/i2c.h deleted file mode 100644 index 0877380..0000000 --- a/include/i2c.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef __I2C_H -#define __I2C_H - -typedef int rtlsdr_dev_t; - -int rtlsdr_i2c_write(rtlsdr_dev_t *dev, uint8_t i2c_addr, uint8_t *buffer, int len); -int rtlsdr_i2c_read(rtlsdr_dev_t *dev, uint8_t i2c_addr, uint8_t *buffer, int len); - -#endif diff --git a/include/rtlsdr_i2c.h b/include/rtlsdr_i2c.h new file mode 100644 index 0000000..0877380 --- /dev/null +++ b/include/rtlsdr_i2c.h @@ -0,0 +1,9 @@ +#ifndef __I2C_H +#define __I2C_H + +typedef int rtlsdr_dev_t; + +int rtlsdr_i2c_write(rtlsdr_dev_t *dev, uint8_t i2c_addr, uint8_t *buffer, int len); +int rtlsdr_i2c_read(rtlsdr_dev_t *dev, uint8_t i2c_addr, uint8_t *buffer, int len); + +#endif diff --git a/src/tuner_e4000.c b/src/tuner_e4000.c index 18aa967..ae14dfc 100644 --- a/src/tuner_e4000.c +++ b/src/tuner_e4000.c @@ -8,7 +8,7 @@ #include -#include "i2c.h" +#include "rtlsdr_i2c.h" #include "tuner_e4000.h" #define FUNCTION_ERROR 1 diff --git a/src/tuner_fc0012.c b/src/tuner_fc0012.c index 0b4ca22..a13dbae 100644 --- a/src/tuner_fc0012.c +++ b/src/tuner_fc0012.c @@ -10,8 +10,8 @@ #include #include +#include "rtlsdr_i2c.h" #include "tuner_fc0012.h" -#include "i2c.h" #define CRYSTAL_FREQ 28800000 diff --git a/src/tuner_fc0013.c b/src/tuner_fc0013.c index c718601..22c8066 100644 --- a/src/tuner_fc0013.c +++ b/src/tuner_fc0013.c @@ -7,7 +7,8 @@ */ #include -#include "i2c.h" + +#include "rtlsdr_i2c.h" #include "tuner_fc0013.h" #define CRYSTAL_FREQ 28800000 -- cgit v1.3.1