Move SPI driver from HAL layer to DRV layer

diff --git a/Makefile.var b/Makefile.var
index 19732ad884ade68a18d5d3ed06277513def9b88b..54aaaed9e40aa8e3aab882f43d3c7f208ef9493d 100644 (file)
--- a/Makefile.var
+++ b/Makefile.var
@@ -155,11 +155,11 @@ rpp_lib_SOURCES_tms570_rpp =                                      \
        rpp/src/drv/hout.c                                              \
        rpp/src/drv/lout.c                                              \
        rpp/src/drv/mout.c                                              \
-       rpp/src/hal/spi.c                                       \
        rpp/src/hal/pom_vect_remap.c                            \
+       rpp/src/drv/spi.c                                               \
+       rpp/src/drv/spi_tms570.c                                        \
        rpp/src/hal/port_spi.c                                  \
        rpp/src/hal/spi_resp_transl.c                   \
-       rpp/src/hal/spi_tms570.c                                        \
        rpp/src/rpp/dac.c                                               \
        rpp/src/rpp/din.c                                               \
        rpp/src/rpp/eth.c                                               \

diff --git a/rpp/include/drv/drv.h b/rpp/include/drv/drv.h
index 9771c5050229ae86dfa1e93c2f16ce5beaa5822f..4c72c25f83ea39468dffb14bd845d586b365de3b 100644 (file)
--- a/rpp/include/drv/drv.h
+++ b/rpp/include/drv/drv.h
@@ -25,6 +25,7 @@
 #include "drv/hout.h"
 #include "drv/lout.h"
 #include "drv/mout.h"
+#include "drv/spi.h"
 #endif /* TARGET_TMS570_RPP */
 
 #endif /* __DRV_H */

diff --git a/rpp/include/hal/spi.h b/rpp/include/drv/spi.h
similarity index 96%
rename from rpp/include/hal/spi.h
rename to rpp/include/drv/spi.h
index 2fd0187b4920158bdc9bb55129a6cf9e0930e964..26b6830a235b56de6006283d153bd7b9d5906d8d 100644 (file)
--- a/rpp/include/hal/spi.h
+++ b/rpp/include/drv/spi.h
@@ -9,7 +9,7 @@
 #ifndef _SPI_DRV_H_
 #define _SPI_DRV_H_
 
-#include "hal/spi_tms570.h"
+#include "drv/spi_tms570.h"
 
 UL_LIST_CUST_DEC(spi_rq_queue, spi_drv_t, spi_msg_head_t, rq_queue, node)
 

diff --git a/rpp/include/hal/spi_tms570.h b/rpp/include/drv/spi_tms570.h
similarity index 100%
rename from rpp/include/hal/spi_tms570.h
rename to rpp/include/drv/spi_tms570.h

diff --git a/rpp/src/drv/hbridge.c b/rpp/src/drv/hbridge.c
index f3d49738849d97092dbb201ff45050b0f33afcba..e4236a18c0b5330402e4ffc8851c6c2470a9ebdb 100644 (file)
--- a/rpp/src/drv/hbridge.c
+++ b/rpp/src/drv/hbridge.c
@@ -22,7 +22,7 @@
 // PWM is available for HBR control.
 #include "drv/drv.h"
 #include <os/semphr.h>
-#include "hal/spi.h"
+#include "drv/spi.h"
 
 //Flag variable if pwm was initialized and is ready to start.
 static boolean_t pwm_initialized = FALSE;

diff --git a/rpp/src/hal/spi.c b/rpp/src/drv/spi.c
similarity index 98%
rename from rpp/src/hal/spi.c
rename to rpp/src/drv/spi.c
index 6e78eca9e13e5827f6c015dbbdd703d218041ce2..d4ed1bf0f50b9b4ba31958aaa236be5119af8ab3 100644 (file)
--- a/rpp/src/hal/spi.c
+++ b/rpp/src/drv/spi.c
@@ -12,7 +12,7 @@
 //#include "drv/spi.h"
 //#include "cpu_def.h"
 //#include "ul/ul_list.h"
-#include "hal/spi.h"
+#include "drv/spi.h"
 
 int spi_msg_rq_ins(spi_drv_t *ifc, spi_msg_head_t *msg)
 {

diff --git a/rpp/src/hal/spi_tms570.c b/rpp/src/drv/spi_tms570.c
similarity index 99%
rename from rpp/src/hal/spi_tms570.c
rename to rpp/src/drv/spi_tms570.c
index b221b2c35cff8f89dca8a3bd73296a4fb9b3044e..64f94a1b3e8633bea8dfd8845c735f52688764b5 100644 (file)
--- a/rpp/src/hal/spi_tms570.c
+++ b/rpp/src/drv/spi_tms570.c
@@ -10,7 +10,7 @@
  * Code based on Halcogen generated source code
  */
 
-#include "hal/spi.h"
+#include "drv/spi.h"
 #include "sys/port.h"
 //#include "drv_spi.h"
 //#include "sys_common.h"

diff --git a/rpp/src/hal/_tms570_rpp/port_def.c b/rpp/src/hal/_tms570_rpp/port_def.c
index 456d7d29b91a1e4c0fd267d3c95ad8111f851495..37c4ad0b367f4f0902201eddd20177f65545fcc0 100644 (file)
--- a/rpp/src/hal/_tms570_rpp/port_def.c
+++ b/rpp/src/hal/_tms570_rpp/port_def.c
@@ -26,7 +26,7 @@
 #include "hal/hal.h"
 
 #include "hal/port_spi.h"
-#include "hal/spi.h"
+#include "drv/spi.h"
 
 // Lists of pins assigned to the ports
 static uint32_t port_cfg_dinmcu[] = PORT_CFG_DINMCU;

diff --git a/rpp/src/hal/port_spi.c b/rpp/src/hal/port_spi.c
index f1cb47efed2fb94a3de882b31e87fa037e9f87df..8c265370841d4ea93dbbb3f66babee448e6a2add 100644 (file)
--- a/rpp/src/hal/port_spi.c
+++ b/rpp/src/hal/port_spi.c
@@ -14,7 +14,7 @@
  *         This file contains getter and setter functions for SPI port type.
  */
 
-#include "hal/spi.h"
+#include "drv/spi.h"
 
 #define PORT_BUF 4
 /** Buffer for spi command to be sent */

diff --git a/rpp/src/hal/spi_resp_transl.c b/rpp/src/hal/spi_resp_transl.c
index e09555370a522fc63f1aa8770c6277fbc210b2fc..0edfc3b2317bb13c18184ec8d29b519991574cf5 100644 (file)
--- a/rpp/src/hal/spi_resp_transl.c
+++ b/rpp/src/hal/spi_resp_transl.c
@@ -27,7 +27,7 @@
  */
 
 #include "hal/hal.h"
-#include "hal/spi.h"
+#include "drv/spi.h"
 #include "hal/spi_resp_transl.h"
 
 // Field descriptors

diff --git a/rpp/src/rpp/dac.c b/rpp/src/rpp/dac.c
index ea33b139328e9f36e8fbd412382d3e3e9de1004d..b2bf2ba3249ccd41f0c6eb3e4d337d9196d6e043 100644 (file)
--- a/rpp/src/rpp/dac.c
+++ b/rpp/src/rpp/dac.c
@@ -22,7 +22,7 @@
 
 #ifndef FREERTOS_POSIX
 #include "drv/dac.h"
-#include "hal/spi_tms570.h"
+#include "drv/spi_tms570.h"
 #endif
 
 static boolean_t initialized = FALSE;

diff --git a/rpp/src/rpp/din.c b/rpp/src/rpp/din.c
index 5ffcddd56e1217f87c21e5fc283be1198bd7f0ad..0523905759c612ff2b8e733d4630ee27186d2f71 100644 (file)
--- a/rpp/src/rpp/din.c
+++ b/rpp/src/rpp/din.c
@@ -22,7 +22,7 @@
 
 #ifndef FREERTOS_POSIX
 #include "drv/din.h"
-#include "hal/spi_tms570.h"
+#include "drv/spi_tms570.h"
 #endif
 
 static boolean_t initialized = FALSE;

diff --git a/rpp/src/rpp/fr.c b/rpp/src/rpp/fr.c
index f62685afc0a37df2e02ee10166b76921d8cc781e..9193a509374cf3809ea1d4b6fd3451fd7444a76a 100644 (file)
--- a/rpp/src/rpp/fr.c
+++ b/rpp/src/rpp/fr.c
@@ -26,7 +26,7 @@
 #include "stdio.h"
 #include "string.h"
 #include "drv/drv.h"
-#include "hal/spi_tms570.h"
+#include "drv/spi_tms570.h"
 
 static rpp_fr_state_t rpp_fr_state = RPP_FR_NOT_INITIALIZED;    /**< Stores the actual state of the FlexRay module */
 

diff --git a/rpp/src/rpp/hbr.c b/rpp/src/rpp/hbr.c
index 64dd6066d56e3c9fd9b1e50a72e8d28d83a59c89..fe4e300abc73a346f264ab26c515a499e85a911d 100644 (file)
--- a/rpp/src/rpp/hbr.c
+++ b/rpp/src/rpp/hbr.c
@@ -22,7 +22,7 @@
 
 #ifndef FREERTOS_POSIX
 #include "drv/hbridge.h"
-#include "hal/spi_tms570.h"
+#include "drv/spi_tms570.h"
 #endif
 
 static boolean_t initialized = FALSE;

diff --git a/rpp/src/rpp/lout.c b/rpp/src/rpp/lout.c
index b55e011173813ec9347407678c160bf6a8bcd8cb..507506844b3b63839866c11f2ef6ded4a1496201 100644 (file)
--- a/rpp/src/rpp/lout.c
+++ b/rpp/src/rpp/lout.c
@@ -22,7 +22,7 @@
 
 #ifndef FREERTOS_POSIX
 #include "drv/lout.h"
-#include "hal/spi_tms570.h"
+#include "drv/spi_tms570.h"
 #endif
 
 static boolean_t initialized = FALSE;