summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gr-atsc/src/lib/qa_atsci_single_viterbi.cc4
-rw-r--r--gr-audio/lib/alsa/audio_alsa_source.cc6
-rw-r--r--gr-digital/lib/digital_constellation.cc2
-rw-r--r--volk/include/volk/volk_16i_max_star_16i_a.h4
-rw-r--r--volk/include/volk/volk_32f_s32f_stddev_32f_a.h6
-rw-r--r--volk/include/volk/volk_32f_stddev_and_mean_32f_x2_a.h6
-rw-r--r--volk/lib/CMakeLists.txt2
-rw-r--r--volk/orc/volk_16ic_magnitude_16i_a_orc_impl.orc2
-rw-r--r--volk/orc/volk_16sc_magnitude_32f_aligned16_orc_impl.orc2
-rw-r--r--volk/orc/volk_32f_sqrt_32f_a_orc_impl.orc2
-rw-r--r--volk/orc/volk_32fc_magnitude_32f_a_orc_impl.orc2
-rw-r--r--volk/orc/volk_32fc_s32f_magnitude_16i_a_orc_impl.orc2
12 files changed, 18 insertions, 22 deletions
diff --git a/gr-atsc/src/lib/qa_atsci_single_viterbi.cc b/gr-atsc/src/lib/qa_atsci_single_viterbi.cc
index dac1e94c3..95e595026 100644
--- a/gr-atsc/src/lib/qa_atsci_single_viterbi.cc
+++ b/gr-atsc/src/lib/qa_atsci_single_viterbi.cc
@@ -238,7 +238,7 @@ qa_atsci_single_viterbi::t1 ()
if (differs) {
const int ERRTOL = 12; /* Or relate to delay? */
int shouldfix = 1;
- int lasti = -ERRTOL;
+ //int lasti = -ERRTOL;
printf ( " Inserted errors: ");
for (int erri = 0; erri < NN; erri++) {
@@ -246,7 +246,7 @@ qa_atsci_single_viterbi::t1 ()
printf (" %d", erri);
// if (erri < lasti+ERRTOL)
// shouldfix = 0;
- lasti = erri;
+ //lasti = erri;
}
}
printf ("\n Erroneous result dibits:");
diff --git a/gr-audio/lib/alsa/audio_alsa_source.cc b/gr-audio/lib/alsa/audio_alsa_source.cc
index 08d4996a8..a90552ff5 100644
--- a/gr-audio/lib/alsa/audio_alsa_source.cc
+++ b/gr-audio/lib/alsa/audio_alsa_source.cc
@@ -348,12 +348,11 @@ audio_alsa_source::work_s16_2x1 (int noutput_items,
typedef gr_int16 sample_t; // the type of samples we're creating
static const float scale_factor = 1.0 / std::pow(2.0f, 16-1);
- unsigned int nchan = output_items.size ();
float **out = (float **) &output_items[0];
sample_t *buf = (sample_t *) d_buffer;
int bi;
- assert (nchan == 1);
+ assert (output_items.size () == 1);
unsigned int sizeof_frame = d_hw_nchan * sizeof (sample_t);
assert (d_buffer_size_bytes == d_period_size * sizeof_frame);
@@ -425,12 +424,11 @@ audio_alsa_source::work_s32_2x1 (int noutput_items,
typedef gr_int32 sample_t; // the type of samples we're creating
static const float scale_factor = 1.0 / std::pow(2.0f, 32-1);
- unsigned int nchan = output_items.size ();
float **out = (float **) &output_items[0];
sample_t *buf = (sample_t *) d_buffer;
int bi;
- assert (nchan == 1);
+ assert (output_items.size () == 1);
unsigned int sizeof_frame = d_hw_nchan * sizeof (sample_t);
assert (d_buffer_size_bytes == d_period_size * sizeof_frame);
diff --git a/gr-digital/lib/digital_constellation.cc b/gr-digital/lib/digital_constellation.cc
index 0c100f38e..d9a53c493 100644
--- a/gr-digital/lib/digital_constellation.cc
+++ b/gr-digital/lib/digital_constellation.cc
@@ -357,10 +357,8 @@ digital_constellation_psk::get_sector (const gr_complex *sample)
float phase = arg(*sample);
float width = M_TWOPI / n_sectors;
int sector = floor(phase/width + 0.5);
- unsigned int u_sector;
if (sector < 0)
sector += n_sectors;
- u_sector = sector;
return sector;
}
diff --git a/volk/include/volk/volk_16i_max_star_16i_a.h b/volk/include/volk/volk_16i_max_star_16i_a.h
index 6a4f63708..28197ddef 100644
--- a/volk/include/volk/volk_16i_max_star_16i_a.h
+++ b/volk/include/volk/volk_16i_max_star_16i_a.h
@@ -18,7 +18,7 @@ static inline void volk_16i_max_star_16i_a_ssse3(short* target, short* src0, un
short candidate = src0[0];
short cands[8];
- __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6;
+ __m128i xmm0, xmm1, xmm3, xmm4, xmm5, xmm6;
__m128i *p_src0;
@@ -41,7 +41,7 @@ static inline void volk_16i_max_star_16i_a_ssse3(short* target, short* src0, un
for(i = 0; i < bound; ++i) {
xmm1 = _mm_load_si128(p_src0);
p_src0 += 1;
- xmm2 = _mm_sub_epi16(xmm1, xmm0);
+ //xmm2 = _mm_sub_epi16(xmm1, xmm0);
diff --git a/volk/include/volk/volk_32f_s32f_stddev_32f_a.h b/volk/include/volk/volk_32f_s32f_stddev_32f_a.h
index 881067bdc..75fe0cb2e 100644
--- a/volk/include/volk/volk_32f_s32f_stddev_32f_a.h
+++ b/volk/include/volk/volk_32f_s32f_stddev_32f_a.h
@@ -60,7 +60,7 @@ static inline void volk_32f_s32f_stddev_32f_a_sse4_1(float* stddev, const float*
}
returnValue /= num_points;
returnValue -= (mean * mean);
- returnValue = sqrt(returnValue);
+ returnValue = sqrtf(returnValue);
}
*stddev = returnValue;
}
@@ -106,7 +106,7 @@ static inline void volk_32f_s32f_stddev_32f_a_sse(float* stddev, const float* in
}
returnValue /= num_points;
returnValue -= (mean * mean);
- returnValue = sqrt(returnValue);
+ returnValue = sqrtf(returnValue);
}
*stddev = returnValue;
}
@@ -133,7 +133,7 @@ static inline void volk_32f_s32f_stddev_32f_a_generic(float* stddev, const float
returnValue /= num_points;
returnValue -= (mean * mean);
- returnValue = sqrt(returnValue);
+ returnValue = sqrtf(returnValue);
}
*stddev = returnValue;
}
diff --git a/volk/include/volk/volk_32f_stddev_and_mean_32f_x2_a.h b/volk/include/volk/volk_32f_stddev_and_mean_32f_x2_a.h
index 3a82e3d2f..20ff676d8 100644
--- a/volk/include/volk/volk_32f_stddev_and_mean_32f_x2_a.h
+++ b/volk/include/volk/volk_32f_stddev_and_mean_32f_x2_a.h
@@ -72,7 +72,7 @@ static inline void volk_32f_stddev_and_mean_32f_x2_a_sse4_1(float* stddev, float
newMean /= num_points;
returnValue /= num_points;
returnValue -= (newMean * newMean);
- returnValue = sqrt(returnValue);
+ returnValue = sqrtf(returnValue);
}
*stddev = returnValue;
*mean = newMean;
@@ -128,7 +128,7 @@ static inline void volk_32f_stddev_and_mean_32f_x2_a_sse(float* stddev, float* m
newMean /= num_points;
returnValue /= num_points;
returnValue -= (newMean * newMean);
- returnValue = sqrt(returnValue);
+ returnValue = sqrtf(returnValue);
}
*stddev = returnValue;
*mean = newMean;
@@ -157,7 +157,7 @@ static inline void volk_32f_stddev_and_mean_32f_x2_a_generic(float* stddev, floa
newMean /= num_points;
returnValue /= num_points;
returnValue -= (newMean * newMean);
- returnValue = sqrt(returnValue);
+ returnValue = sqrtf(returnValue);
}
*stddev = returnValue;
*mean = newMean;
diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt
index 1891996af..00d8660ab 100644
--- a/volk/lib/CMakeLists.txt
+++ b/volk/lib/CMakeLists.txt
@@ -277,7 +277,7 @@ if(ORC_FOUND)
#create a rule to generate the source and add to the list of sources
add_custom_command(
- COMMAND ${ORCC_EXECUTABLE} --implementation -o ${orcc_gen} ${orc_file}
+ COMMAND ${ORCC_EXECUTABLE} --include math.h --implementation -o ${orcc_gen} ${orc_file}
DEPENDS ${orc_file} OUTPUT ${orcc_gen}
)
list(APPEND volk_sources ${orcc_gen})
diff --git a/volk/orc/volk_16ic_magnitude_16i_a_orc_impl.orc b/volk/orc/volk_16ic_magnitude_16i_a_orc_impl.orc
index 3966526ed..fbaebc46d 100644
--- a/volk/orc/volk_16ic_magnitude_16i_a_orc_impl.orc
+++ b/volk/orc/volk_16ic_magnitude_16i_a_orc_impl.orc
@@ -17,7 +17,7 @@ x2 divf iqf, iqf, scalar
x2 mulf prodiqf, iqf, iqf
splitql qf, if, prodiqf
addf sumf, if, qf
-sqrt, sqrtf rootf, sumf
+sqrtf rootf, sumf
mulf rootf, rootf, scalar
convfl rootl, rootf
convlw dst, rootl
diff --git a/volk/orc/volk_16sc_magnitude_32f_aligned16_orc_impl.orc b/volk/orc/volk_16sc_magnitude_32f_aligned16_orc_impl.orc
index d5c8212c3..66fef7d2e 100644
--- a/volk/orc/volk_16sc_magnitude_32f_aligned16_orc_impl.orc
+++ b/volk/orc/volk_16sc_magnitude_32f_aligned16_orc_impl.orc
@@ -22,4 +22,4 @@ divf imagf, imagf, scalar
mulf realf, realf, realf
mulf imagf, imagf, imagf
addf sumf, realf, imagf
-sqrt, sqrtf dst, sumf
+sqrtf dst, sumf
diff --git a/volk/orc/volk_32f_sqrt_32f_a_orc_impl.orc b/volk/orc/volk_32f_sqrt_32f_a_orc_impl.orc
index 719cca037..f339b1122 100644
--- a/volk/orc/volk_32f_sqrt_32f_a_orc_impl.orc
+++ b/volk/orc/volk_32f_sqrt_32f_a_orc_impl.orc
@@ -1,4 +1,4 @@
.function volk_32f_sqrt_32f_a_orc_impl
.source 4 src
.dest 4 dst
-sqrt, sqrtf dst, src
+sqrtf dst, src
diff --git a/volk/orc/volk_32fc_magnitude_32f_a_orc_impl.orc b/volk/orc/volk_32fc_magnitude_32f_a_orc_impl.orc
index 4fc0642fc..032ab2b1b 100644
--- a/volk/orc/volk_32fc_magnitude_32f_a_orc_impl.orc
+++ b/volk/orc/volk_32fc_magnitude_32f_a_orc_impl.orc
@@ -10,4 +10,4 @@
x2 mulf prodiqf, src, src
splitql qf, if, prodiqf
addf sumf, if, qf
-sqrt, sqrtf dst, sumf
+sqrtf dst, sumf
diff --git a/volk/orc/volk_32fc_s32f_magnitude_16i_a_orc_impl.orc b/volk/orc/volk_32fc_s32f_magnitude_16i_a_orc_impl.orc
index ed89c3d18..d3bf78935 100644
--- a/volk/orc/volk_32fc_s32f_magnitude_16i_a_orc_impl.orc
+++ b/volk/orc/volk_32fc_s32f_magnitude_16i_a_orc_impl.orc
@@ -14,7 +14,7 @@
x2 mulf prodiqf, src, src
splitql qf, if, prodiqf
addf sumf, if, qf
-sqrt, sqrtf rootf, sumf
+sqrtf rootf, sumf
mulf rootf, rootf, scalar
#cmpltf maskl, 32768.0, rootf
#andl maskl, maskl, 0x80000000
generated by cgit (git 2.34.1) at 2025-01-08 06:52:07 +0000