From 85c9eb4a21a93ce3285cc3bf700a73acf407d95f Mon Sep 17 00:00:00 2001
From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Sat, 1 Aug 2015 15:10:40 +0200
Subject: [PATCH] Merge target-specific drv/adc.h to a single file

There was not many differences and one file will be easier to maintain.
---
 rpp/include/drv/_rm48_hdk/adc.h         | 26 -------------------------
 rpp/include/drv/_tms570_hdk/adc.h       | 26 -------------------------
 rpp/include/drv/_tms570_hydctr/adc.h    | 26 -------------------------
 rpp/include/drv/{_tms570_rpp => }/adc.h |  5 ++++-
 rpp/include/drv/drv.h                   | 13 +------------
 5 files changed, 5 insertions(+), 91 deletions(-)
 delete mode 100644 rpp/include/drv/_rm48_hdk/adc.h
 delete mode 100644 rpp/include/drv/_tms570_hdk/adc.h
 delete mode 100644 rpp/include/drv/_tms570_hydctr/adc.h
 rename rpp/include/drv/{_tms570_rpp => }/adc.h (81%)

diff --git a/rpp/include/drv/_rm48_hdk/adc.h b/rpp/include/drv/_rm48_hdk/adc.h
deleted file mode 100644
index f8003aa..0000000
--- a/rpp/include/drv/_rm48_hdk/adc.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * RPP driver implementation for ADC header file.
- *
- * @file adc.h
- *
- * @copyright Copyright (C) 2012-2013 Czech Technical University in Prague
- *
- * @author Michal Horn
- * @author Carlos Jenkins <carlos@jenkins.co.cr>
- */
-
-
-#ifndef __DRV_ADC_H
-#define __DRV_ADC_H
-
-#include "sys/ti_drv_adc.h"
-
-#define ADC_MAX_CHANNELS 24
-
-void drv_adc_init();
-uint32_t drv_adc_read_adc(adcData_t *data);
-
-uint32_t adc_get_port_val(uint32_t *config, uint32_t num_channels,
-						  uint32_t *values);
-
-#endif /* __DRV_ADC_H */
diff --git a/rpp/include/drv/_tms570_hdk/adc.h b/rpp/include/drv/_tms570_hdk/adc.h
deleted file mode 100644
index f8003aa..0000000
--- a/rpp/include/drv/_tms570_hdk/adc.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * RPP driver implementation for ADC header file.
- *
- * @file adc.h
- *
- * @copyright Copyright (C) 2012-2013 Czech Technical University in Prague
- *
- * @author Michal Horn
- * @author Carlos Jenkins <carlos@jenkins.co.cr>
- */
-
-
-#ifndef __DRV_ADC_H
-#define __DRV_ADC_H
-
-#include "sys/ti_drv_adc.h"
-
-#define ADC_MAX_CHANNELS 24
-
-void drv_adc_init();
-uint32_t drv_adc_read_adc(adcData_t *data);
-
-uint32_t adc_get_port_val(uint32_t *config, uint32_t num_channels,
-						  uint32_t *values);
-
-#endif /* __DRV_ADC_H */
diff --git a/rpp/include/drv/_tms570_hydctr/adc.h b/rpp/include/drv/_tms570_hydctr/adc.h
deleted file mode 100644
index f8003aa..0000000
--- a/rpp/include/drv/_tms570_hydctr/adc.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * RPP driver implementation for ADC header file.
- *
- * @file adc.h
- *
- * @copyright Copyright (C) 2012-2013 Czech Technical University in Prague
- *
- * @author Michal Horn
- * @author Carlos Jenkins <carlos@jenkins.co.cr>
- */
-
-
-#ifndef __DRV_ADC_H
-#define __DRV_ADC_H
-
-#include "sys/ti_drv_adc.h"
-
-#define ADC_MAX_CHANNELS 24
-
-void drv_adc_init();
-uint32_t drv_adc_read_adc(adcData_t *data);
-
-uint32_t adc_get_port_val(uint32_t *config, uint32_t num_channels,
-						  uint32_t *values);
-
-#endif /* __DRV_ADC_H */
diff --git a/rpp/include/drv/_tms570_rpp/adc.h b/rpp/include/drv/adc.h
similarity index 81%
rename from rpp/include/drv/_tms570_rpp/adc.h
rename to rpp/include/drv/adc.h
index 713e651..f3a9f70 100644
--- a/rpp/include/drv/_tms570_rpp/adc.h
+++ b/rpp/include/drv/adc.h
@@ -3,7 +3,7 @@
  *
  * @file adc.h
  *
- * @copyright Copyright (C) 2012-2013 Czech Technical University in Prague
+ * @copyright Copyright (C) 2012-2013, 2015 Czech Technical University in Prague
  *
  * @author Michal Horn
  * @author Carlos Jenkins <carlos@jenkins.co.cr>
@@ -19,7 +19,10 @@
 
 void drv_adc_init();
 uint32_t drv_adc_read_adc(adcData_t *data);
+
+#ifdef TARGET_TMS570_RPP
 uint32_t drv_adc_read_houtifbk(adcData_t *data);
+#endif
 
 uint32_t adc_get_port_val(uint32_t *config, uint32_t num_channels,
 						  uint32_t *values);
diff --git a/rpp/include/drv/drv.h b/rpp/include/drv/drv.h
index 981b7eb..9771c50 100644
--- a/rpp/include/drv/drv.h
+++ b/rpp/include/drv/drv.h
@@ -13,18 +13,7 @@
 
 #include "hal/hal.h"
 
-#if defined(TARGET_RM48_HDK)
-#include "drv/_rm48_hdk/adc.h"
-#elif defined(TARGET_TMS570_HDK)
-#include "drv/_tms570_hdk/adc.h"
-#elif defined(TARGET_TMS570_HYDCTR)
-#include "drv/_tms570_hydctr/adc.h"
-#elif defined(TARGET_TMS570_RPP)
-#include "drv/_tms570_rpp/adc.h"
-#else
-#error No supported target specified!
-#endif /* TARGET */
-
+#include "drv/adc.h"
 #include "drv/sci.h"
 
 #ifdef TARGET_TMS570_RPP
-- 
2.39.2