diff options
author | Yimin Zhang | 2016-05-09 13:20:33 -0500 |
---|---|---|
committer | Yimin Zhang | 2016-05-09 13:20:33 -0500 |
commit | 73dc94168c9c693d45a1e9ffbea5b81ad7221b6d (patch) | |
tree | 813e8bca75f9e96e2875fd92337f42b0c245f138 | |
parent | 7173b90cf7287d36fe50267118212ed1be94e943 (diff) | |
download | fftlib-73dc94168c9c693d45a1e9ffbea5b81ad7221b6d.tar.gz fftlib-73dc94168c9c693d45a1e9ffbea5b81ad7221b6d.tar.xz fftlib-73dc94168c9c693d45a1e9ffbea5b81ad7221b6d.zip |
facade code clean up.
-rw-r--r-- | ti/fftlib/src/common/fft_common_d.h | 1 | ||||
-rw-r--r-- | ti/fftw/fftw-acc/c66x/facade.c | 16 |
2 files changed, 4 insertions, 13 deletions
diff --git a/ti/fftlib/src/common/fft_common_d.h b/ti/fftlib/src/common/fft_common_d.h index 167f150..cea5ae1 100644 --- a/ti/fftlib/src/common/fft_common_d.h +++ b/ti/fftlib/src/common/fft_common_d.h | |||
@@ -40,6 +40,7 @@ | |||
40 | #define FFT_COMMON_D_H_ 1 | 40 | #define FFT_COMMON_D_H_ 1 |
41 | #include "libarch.h" | 41 | #include "libarch.h" |
42 | #include <ti/fftlib/src/common/fft_edma.h> | 42 | #include <ti/fftlib/src/common/fft_edma.h> |
43 | #include <ti/fftlib/src/common/omp/omp_config.h> | ||
43 | 44 | ||
44 | #define ANYSIZE_SUPPORT 0 | 45 | #define ANYSIZE_SUPPORT 0 |
45 | 46 | ||
diff --git a/ti/fftw/fftw-acc/c66x/facade.c b/ti/fftw/fftw-acc/c66x/facade.c index a9f59ce..7d96582 100644 --- a/ti/fftw/fftw-acc/c66x/facade.c +++ b/ti/fftw/fftw-acc/c66x/facade.c | |||
@@ -40,26 +40,16 @@ | |||
40 | #include <stdlib.h> | 40 | #include <stdlib.h> |
41 | #include <limits.h> | 41 | #include <limits.h> |
42 | #include <math.h> | 42 | #include <math.h> |
43 | |||
44 | #include <xdc/std.h> | 43 | #include <xdc/std.h> |
45 | 44 | ||
46 | #include "ti/fftlib/src/common/fft_common.h" | ||
47 | #include "libarch.h" | ||
48 | |||
49 | #ifdef TI_FFTW_ALLOW_ECPY | 45 | #ifdef TI_FFTW_ALLOW_ECPY |
50 | #include "fft_edma.h" | ||
51 | #include "ti/fftlib/fftlib.h" | 46 | #include "ti/fftlib/fftlib.h" |
52 | 47 | ||
53 | extern cregister volatile unsigned int DNUM; | ||
54 | #define ACTIVE_THREAD_COUNT 8 | ||
55 | #define FFT_EDMA_STATE_INIT 0 | ||
56 | #define FFT_EDMA_STATE_ALLOCATED 1 | ||
57 | |||
58 | int fftEdmaState[ACTIVE_THREAD_COUNT]; | 48 | int fftEdmaState[ACTIVE_THREAD_COUNT]; |
59 | FFT_EDMA_Struct gEdmaState[ACTIVE_THREAD_COUNT]; | 49 | FFT_EDMA_Struct gEdmaState[ACTIVE_THREAD_COUNT]; |
60 | |||
61 | lib_emt_ConfigLarge_t cfg; | 50 | lib_emt_ConfigLarge_t cfg; |
62 | IALG_MemRec memTab[FFT_NUM_EDMA_CH]; | 51 | IALG_MemRec memTab[FFT_NUM_EDMA_CH]; |
52 | |||
63 | /* Function to trap exceptions */ | 53 | /* Function to trap exceptions */ |
64 | void fft_assert(int statement, int node_id, const char *error) | 54 | void fft_assert(int statement, int node_id, const char *error) |
65 | { | 55 | { |
@@ -75,7 +65,7 @@ void *fft_omp_assign_edma_resources(void *buf, int buf_size) | |||
75 | */ | 65 | */ |
76 | int i, ret_val; | 66 | int i, ret_val; |
77 | void *ret = (void *) (&gEdmaState[0]); | 67 | void *ret = (void *) (&gEdmaState[0]); |
78 | uint32_t *buf0 = buf; | 68 | uint32_t *buf0 = buf; |
79 | 69 | ||
80 | cfg.max_num_lines = FFT_MAX_EDMA_LINKS_3D; | 70 | cfg.max_num_lines = FFT_MAX_EDMA_LINKS_3D; |
81 | for (i = 0; i < FFT_NUM_EDMA_CH; i++) { | 71 | for (i = 0; i < FFT_NUM_EDMA_CH; i++) { |