Fixes for things picked up by clang compilation

This commit is contained in:
Steve Underwood 2014-02-24 12:50:41 +08:00
parent 7682d96b3f
commit 5e0b3fa077
4 changed files with 21 additions and 3 deletions

View File

@ -154,9 +154,15 @@ static const sig_tone_descriptor_t sig_tones[3] =
}, },
&flat_coeffs[NOTCH_COEFF_SET_2280HZ], &flat_coeffs[NOTCH_COEFF_SET_2280HZ],
#if defined(SPANDSP_USE_FIXED_POINT)
13,
-30,
-30
#else
13.0f, 13.0f,
-30.0f, -30.0f,
-30.0f -30.0f
#endif
}, },
{ {
/* 2600Hz (e.g. many US protocols) */ /* 2600Hz (e.g. many US protocols) */
@ -176,9 +182,15 @@ static const sig_tone_descriptor_t sig_tones[3] =
}, },
NULL, NULL,
#if defined(SPANDSP_USE_FIXED_POINT)
16,
-30,
-30
#else
15.6f, 15.6f,
-30.0f, -30.0f,
-30.0f -30.0f
#endif
}, },
{ {
/* 2400Hz/2600Hz (e.g. SS5 and SS5bis) */ /* 2400Hz/2600Hz (e.g. SS5 and SS5bis) */
@ -198,9 +210,15 @@ static const sig_tone_descriptor_t sig_tones[3] =
}, },
NULL, NULL,
#if defined(SPANDSP_USE_FIXED_POINT)
16,
-30,
-30
#else
15.6f, 15.6f,
-30.0f, -30.0f,
-30.0f -30.0f
#endif
} }
}; };

View File

@ -140,7 +140,7 @@ typedef struct
/*! \brief True if we are using ECM mode. This is used to select HDLC faking, necessary /*! \brief True if we are using ECM mode. This is used to select HDLC faking, necessary
with clunky class 1 modems. */ with clunky class 1 modems. */
bool ecm_mode; int ecm_mode;
/*! \brief Counter for trailing non-ECM bytes, used to flush out the far end's modem. */ /*! \brief Counter for trailing non-ECM bytes, used to flush out the far end's modem. */
int non_ecm_trailer_bytes; int non_ecm_trailer_bytes;

View File

@ -241,7 +241,7 @@ SPAN_DECLARE(v17_rx_state_t *) v17_rx_init(v17_rx_state_t *s, int bit_rate, put_
\param bit_rate The bit rate of the modem. Valid values are 7200, 9600, 12000 and 14400. \param bit_rate The bit rate of the modem. Valid values are 7200, 9600, 12000 and 14400.
\param short_train True if a short training sequence is expected. \param short_train True if a short training sequence is expected.
\return 0 for OK, -1 for bad parameter */ \return 0 for OK, -1 for bad parameter */
SPAN_DECLARE(int) v17_rx_restart(v17_rx_state_t *s, int bit_rate, bool short_train); SPAN_DECLARE(int) v17_rx_restart(v17_rx_state_t *s, int bit_rate, int short_train);
/*! Release a V.17 modem receive context. /*! Release a V.17 modem receive context.
\brief Release a V.17 modem receive context. \brief Release a V.17 modem receive context.

View File

@ -1392,7 +1392,7 @@ SPAN_DECLARE(logging_state_t *) v17_rx_get_logging_state(v17_rx_state_t *s)
} }
/*- End of function --------------------------------------------------------*/ /*- End of function --------------------------------------------------------*/
SPAN_DECLARE(int) v17_rx_restart(v17_rx_state_t *s, int bit_rate, bool short_train) SPAN_DECLARE(int) v17_rx_restart(v17_rx_state_t *s, int bit_rate, int short_train)
{ {
int i; int i;