summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 24896cf)
raw | patch | inline | side by side (parent: 24896cf)
author | Varun Tripathi <a0486068@tidl-ud-08> | |
Tue, 26 Jul 2022 12:12:32 +0000 (17:42 +0530) | ||
committer | Rishabh Garg <rishabh@ti.com> | |
Thu, 28 Jul 2022 12:58:41 +0000 (07:58 -0500) |
diff --git a/packages/ti/drv/udma/dmautils/include/dmautils_autoincrement_3d.h b/packages/ti/drv/udma/dmautils/include/dmautils_autoincrement_3d.h
index eac4ff7eff1d774ed1f295aac56738e5d458f276..dafe71b4b651accb19c8255fecd4fb68a1d62b61 100755 (executable)
*/
typedef enum{
DMAUTILSAUTOINC3D_DFMT_NONE = 0, /*!< No formatting options */
- //DMAUTILSAUTOINC3D_DFMT_CONST = 1, /*!< DMA will do constant copy */
- //DMAUTILSAUTOINC3D_DFMT_TPOSE = 2, /*!< DMA will transpose 2 inner most dimensions */
- //DMAUTILSAUTOINC3D_DFMT_REV = 3, /*!< DMA will reverse all rows. i.e. ICNT0 will be reversed between reading and writing */
- //DMAUTILSAUTOINC3D_DFMT_REV_TPOSE = 4, /*!< DMA will transpose 2 inner most dimension and then reverse the outputed rows */
DMAUTILSAUTOINC3D_DFMT_COMP = 5, /*!< DMA will compress data into 1-D blocks */
DMAUTILSAUTOINC3D_DFMT_DECOMP = 6 /*!< DMA will decompress data from 1-D blocks into decompressed structure */
}DmaUitlsAutoInc3d_DfmtType;
index b15db8e17e689b13be77e8365e8a6705d31b388b..3ed1c12747914055f96566feb72949b6eaadeb4e 100644 (file)
SRCS_COMMON += dmautils_autoincrement_3d.c
SRCS_COMMON += dmautils_autoincrement_3d_hostemu.c
PACKAGE_SRCS_COMMON = .
-CFLAGS_LOCAL_COMMON = $(PDK_CFLAGS) $(UDMA_CFLAGS) $(DMAUTILS_CFLAGS) --disable_inlining
+ifneq ($(CORE),$(filter $(CORE), c7x-hostemu))
+DMAUTILS_CFLAGS += --disable_inlining
+endif
+CFLAGS_LOCAL_COMMON = $(PDK_CFLAGS) $(UDMA_CFLAGS) $(DMAUTILS_CFLAGS)
+
+
# Core/SoC/platform specific source files and CFLAGS
# Example:
diff --git a/packages/ti/drv/udma/dmautils/test/dmautils_autoinc_1d2d3d_test/dmautils_autoinc_1d2d3d_test.c b/packages/ti/drv/udma/dmautils/test/dmautils_autoinc_1d2d3d_test/dmautils_autoinc_1d2d3d_test.c
index 9ccfa61f28f38cd8828074ae765ae4e05833ca9e..44e97310ed34671ac6572aea96b055e57f0b5622 100644 (file)
--- a/packages/ti/drv/udma/dmautils/test/dmautils_autoinc_1d2d3d_test/dmautils_autoinc_1d2d3d_test.c
+++ b/packages/ti/drv/udma/dmautils/test/dmautils_autoinc_1d2d3d_test/dmautils_autoinc_1d2d3d_test.c
@@ -173,12 +173,7 @@ int32_t test_sciclientDmscGetVersion(char *version_str, uint32_t version_str_siz
static void appC7xClecInitDru(void)
{
CSL_ClecEventConfig cfgClec;
- #if defined(SOC_J721S2)
- CSL_CLEC_EVTRegs *clecBaseAddr = (CSL_CLEC_EVTRegs*) CSL_COMPUTE_CLUSTER0_CLEC_BASE;
- #else
CSL_CLEC_EVTRegs *clecBaseAddr = (CSL_CLEC_EVTRegs*) CSL_COMPUTE_CLUSTER0_CLEC_REGS_BASE;
- #endif
-
uint32_t i;
uint32_t dru_input_start = 192;
#if defined(SOC_J784S4)
dru_input_start = DRU_LOCAL_EVENT_START_DEFAULT;
#endif
uint32_t dru_input_num = 16;
+
/*Only configuring 16 channels*/
for(i=dru_input_start; i<(dru_input_start+dru_input_num); i++)
{
diff --git a/packages/ti/drv/udma/dmautils/test/dmautils_autoinc_circular_test/dmautils_autoinc_circular_test.c b/packages/ti/drv/udma/dmautils/test/dmautils_autoinc_circular_test/dmautils_autoinc_circular_test.c
index 7469473accd61d7c976d3e53f071fbd2c39f3515..1d21d6b4debce61c4cb5d5550da904d732e5630c 100644 (file)
--- a/packages/ti/drv/udma/dmautils/test/dmautils_autoinc_circular_test/dmautils_autoinc_circular_test.c
+++ b/packages/ti/drv/udma/dmautils/test/dmautils_autoinc_circular_test/dmautils_autoinc_circular_test.c
@@ -158,12 +158,7 @@ int32_t test_sciclientDmscGetVersion(char *version_str, uint32_t version_str_siz
static void appC7xClecInitDru(void)
{
CSL_ClecEventConfig cfgClec;
- #if defined(SOC_J721S2)
- CSL_CLEC_EVTRegs *clecBaseAddr = (CSL_CLEC_EVTRegs*) CSL_COMPUTE_CLUSTER0_CLEC_BASE;
- #else
CSL_CLEC_EVTRegs *clecBaseAddr = (CSL_CLEC_EVTRegs*) CSL_COMPUTE_CLUSTER0_CLEC_REGS_BASE;
- #endif
-
uint32_t i;
uint32_t dru_input_start = 192;
#if defined(SOC_J784S4)
dru_input_start = DRU_LOCAL_EVENT_START_DEFAULT;
#endif
uint32_t dru_input_num = 16;
+
/*Only configuring 16 channels*/
for(i=dru_input_start; i<(dru_input_start+dru_input_num); i++)
{
diff --git a/packages/ti/drv/udma/dmautils/test/dmautils_autoinc_compression_test/dmautils_autoinc_compression_test.c b/packages/ti/drv/udma/dmautils/test/dmautils_autoinc_compression_test/dmautils_autoinc_compression_test.c
index eeb76ab3d1d36e2eda217ee80d06b992ab2b96f5..d5945ff4aa89c6678e5ed63616f43b6005fd0922 100644 (file)
/*Configure CLEC*/
static void appC7xClecInitDru(void)
{
- printf("CLEC CONFIGURED!\n");
+
CSL_ClecEventConfig cfgClec;
- #if defined(SOC_J721S2)
- CSL_CLEC_EVTRegs *clecBaseAddr = (CSL_CLEC_EVTRegs*) CSL_COMPUTE_CLUSTER0_CLEC_BASE;
- #else
CSL_CLEC_EVTRegs *clecBaseAddr = (CSL_CLEC_EVTRegs*) CSL_COMPUTE_CLUSTER0_CLEC_REGS_BASE;
- #endif
-
uint32_t i;
uint32_t dru_input_start = 192;
#if defined(SOC_J784S4)
dru_input_start = DRU_LOCAL_EVENT_START_DEFAULT;
#endif
uint32_t dru_input_num = 16;
+
/*Only configuring 16 channels*/
for(i=dru_input_start; i<(dru_input_start+dru_input_num); i++)
{
cfgClec.c7xEvtNum = (i-dru_input_start)+32;
CSL_clecConfigEvent(clecBaseAddr, i, &cfgClec);
}
- printf("CLEC RTMAP = %d\n",cfgClec.rtMap);
+
}
#endif
typedef struct
diff --git a/packages/ti/drv/udma/dmautils/test/dmautils_autoincrement_test/dmautils_autoincrement_test.c b/packages/ti/drv/udma/dmautils/test/dmautils_autoincrement_test/dmautils_autoincrement_test.c
index b19c8f8a2cec9d3444879aa2de65a505c9b2f7e6..b0bf01de1c92f8e9b17aa4473d0726896b41c267 100644 (file)
@@ -182,12 +182,7 @@ int32_t test_sciclientDmscGetVersion(char *version_str, uint32_t version_str_siz
static void appC7xClecInitDru(void)
{
CSL_ClecEventConfig cfgClec;
- #if defined(SOC_J721S2)
- CSL_CLEC_EVTRegs *clecBaseAddr = (CSL_CLEC_EVTRegs*) CSL_COMPUTE_CLUSTER0_CLEC_BASE;
- #else
CSL_CLEC_EVTRegs *clecBaseAddr = (CSL_CLEC_EVTRegs*) CSL_COMPUTE_CLUSTER0_CLEC_REGS_BASE;
- #endif
-
uint32_t i;
uint32_t dru_input_start = 192;
#if defined(SOC_J784S4)
dru_input_start = DRU_LOCAL_EVENT_START_DEFAULT;
#endif
uint32_t dru_input_num = 16;
+
/*Only configuring 16 channels*/
for(i=dru_input_start; i<(dru_input_start+dru_input_num); i++)
{
diff --git a/packages/ti/osal/arch/core/c7x/Arch_util.c b/packages/ti/osal/arch/core/c7x/Arch_util.c
index 193a040b3d2160eec78e120b95bef57fe450ca54..5ab6c8a5eac1d7110cf289ba9a04bcb73a8d59e2 100644 (file)
uint32_t lo, hi;
key = HwiP_disable();
- #if !defined(HOST_EMULATION)
cycle = __TSC;
- #else
- cycle = 0x00;
- #endif
cycleHi = ((uint64_t)(cycle >> 32U));
/* get the lo and hi parts */