jens/radio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- compile clean for gcc

Browse Source 
git-svn-id: http://moon:8086/svn/software/trunk/libsrc/radio@10 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2014-07-19 13:01:23 +00:00
parent 4f99329d33
commit e4afd465e2
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RealVector.hpp
+2 -2
View File
@@ -190,7 +190,7 @@ private:
radio_float_t *m_pBufReal; radio_float_t *m_pBufReal;
radio_float_t *m_pPtrReal; radio_float_t *m_pPtrReal;
_inline void checkSize(uint32_t size1, uint32_t size2) inline void checkSize(uint32_t size1, uint32_t size2)
{ {
try try
{ {
@@ -231,4 +231,4 @@ RealVector::OpBinary<RealVector::Sub> operator-(const RealVector &a, const RealV
RealVector::OpBinary<RealVector::Mul> operator*(const RealVector &a, const RealVector &b); RealVector::OpBinary<RealVector::Mul> operator*(const RealVector &a, const RealVector &b);
RealVector::OpBinary<RealVector::Div> operator/(const RealVector &a, const RealVector &b); RealVector::OpBinary<RealVector::Div> operator/(const RealVector &a, const RealVector &b);
#endif // _REAL_HPP_ #endif // _REAL_HPP_
interpolation.h
+2 -2
View File
@@ -23,8 +23,8 @@ typedef struct _fir_cpx_t
uint32_t N, r, w; uint32_t N, r, w;
cpx_t *pX; cpx_t *pX;
uint32_t M_up, M_down; uint32_t M_up, M_down;
clock_t clockUp; sample_clock_t clockUp;
clock_t clockDown; sample_clock_t clockDown;
} fir_cpx_t; } fir_cpx_t;
typedef struct _fir_cpx_multirate_stage_t typedef struct _fir_cpx_multirate_stage_t
statistics.c
+2 -2
View File
@@ -220,7 +220,7 @@ void SlidingMinMaxProcessV(sl_minmax_t *pObj, radio_float_t *pX, uint32_t len)
} }
// -------------------------------------------------------------- // --------------------------------------------------------------
void TraceOpen(trace_t *pObj, char *pFilename) void TraceOpen(trace_t *pObj, const char *pFilename)
{ {
pObj->pFile = fopen(pFilename, "w"); pObj->pFile = fopen(pFilename, "w");
} }
@@ -231,7 +231,7 @@ void TraceClose(trace_t *pObj)
fclose(pObj->pFile); fclose(pObj->pFile);
} }
void TracePrint(trace_t *pObj, char *fmt, ... ) void TracePrint(trace_t *pObj, const char *fmt, ... )
{ {
va_list a_list; va_list a_list;
statistics.h
+2 -2
View File
@@ -81,9 +81,9 @@ typedef struct _trace_t
FILE *pFile; FILE *pFile;
} trace_t; } trace_t;
void TraceOpen(trace_t *pObj, char *pFilename); void TraceOpen(trace_t *pObj, const char *pFilename);
void TraceClose(trace_t *pObj); void TraceClose(trace_t *pObj);
void TracePrint(trace_t *pObj, char *fmt, ... ); void TracePrint(trace_t *pObj, const char *fmt, ... );
// -------------------------------------------------------------- // --------------------------------------------------------------
#ifdef __cplusplus #ifdef __cplusplus
synchronization.c
+4 -4
View File
@@ -6,7 +6,7 @@
// -------------------------------------------------------------- // --------------------------------------------------------------
// Clock generator // Clock generator
// -------------------------------------------------------------- // --------------------------------------------------------------
void ClockInit(clock_t *pObj, uint32_t divide) void ClockInit(sample_clock_t *pObj, uint32_t divide)
{ {
if (divide == 0) if (divide == 0)
divide = 1; divide = 1;
@@ -15,7 +15,7 @@ void ClockInit(clock_t *pObj, uint32_t divide)
pObj->count = (int32_t)divide; pObj->count = (int32_t)divide;
} }
uint32_t ClockIsTick(clock_t *pObj, uint32_t do_advance) uint32_t ClockIsTick(sample_clock_t *pObj, uint32_t do_advance)
{ {
uint32_t isTick; uint32_t isTick;
@@ -32,7 +32,7 @@ uint32_t ClockIsTick(clock_t *pObj, uint32_t do_advance)
return isTick; return isTick;
} }
void ClockAdvance(clock_t *pObj) void ClockAdvance(sample_clock_t *pObj)
{ {
if (pObj->count == 0) if (pObj->count == 0)
{ {
@@ -41,7 +41,7 @@ void ClockAdvance(clock_t *pObj)
pObj->count--; pObj->count--;
} }
void ClockSetPhase(clock_t *pObj, int32_t phase) void ClockSetPhase(sample_clock_t *pObj, int32_t phase)
{ {
pObj->count = pObj->count - phase; pObj->count = pObj->count - phase;
if (pObj->count <= 0) if (pObj->count <= 0)
synchronization.h
+6 -6
View File
@@ -9,12 +9,12 @@
// -------------------------------------------------------------- // --------------------------------------------------------------
// Types // Types
// -------------------------------------------------------------- // --------------------------------------------------------------
typedef struct _clock_t typedef struct _sample_clock_t
{ {
uint32_t reload; uint32_t reload;
int32_t count; int32_t count;
} clock_t; } sample_clock_t;
typedef struct _lead_lag_filter_t typedef struct _lead_lag_filter_t
{ {
@@ -59,10 +59,10 @@ typedef struct _timing_corrector_t
extern "C" { extern "C" {
#endif #endif
void ClockInit(clock_t *pObj, uint32_t divide); void ClockInit(sample_clock_t *pObj, uint32_t divide);
uint32_t ClockIsTick(clock_t *pObj, uint32_t do_advance); uint32_t ClockIsTick(sample_clock_t *pObj, uint32_t do_advance);
void ClockAdvance(clock_t *pObj); void ClockAdvance(sample_clock_t *pObj);
void ClockSetPhase(clock_t *pObj, int32_t phase); void ClockSetPhase(sample_clock_t *pObj, int32_t phase);
void STRGardnerInit(str_t *pObj); void STRGardnerInit(str_t *pObj);
radio_float_t STRGardnerProcess(str_t *pObj, cpx_t x); radio_float_t STRGardnerProcess(str_t *pObj, cpx_t x);