Skip to content
Snippets Groups Projects
Commit ecfeada6 authored by Erik von Reis's avatar Erik von Reis
Browse files

Merge branch 'new_cpu_isolator_symbols_deb10' into demod_parts_v5

parents c5dff7d6 601b565f
No related branches found
No related tags found
2 merge requests!439RCG 5.0 release fro deb 10,!409RCG: avx demod parts added
......@@ -535,7 +535,7 @@ namespace comm_impl
}
nw->decimation_requested = !nw->broadcast;
printf( "decimation flag=%d\n", nw->decimation_requested );
system_log( 5, "decimation flag=%d", nw->decimation_requested );
nw->block_size += nw->num_channels * sizeof( int );
if ( fast_net_writer )
{
......
......@@ -759,7 +759,6 @@ net_writer_c::consumer( )
}
else
{
// printf("Byteswaping data as integers\n");
for ( int j = 0; j < dec_vec[ i ].vec_len / 4; j++ )
( (unsigned int*)bptr )[ j ] =
htonl( ( (unsigned int*)bptr )[ j ] );
......@@ -816,7 +815,6 @@ net_writer_c::consumer( )
}
else
{
// printf("Byteswaping data as integers\n");
for ( int j = 0; j < dec_vec[ i ].vec_len / 4; j++ )
( (unsigned int*)bptr )[ j ] =
htonl( ( (unsigned int*)bptr )[ j ] );
......
......@@ -68,13 +68,14 @@ extern void set_fe_code_idle( play_dead_handler_fp_t rt_runner_func, unsigned in
#if LINUX_VERSION_CODE <= KERNEL_VERSION(5,6,0)
static inline int rts_isolator_exec( unsigned int CPU_ID ){ return cpu_down(CPU_ID); }
static inline int rts_isolator_cleanup( unsigned int CPU_ID ){ return cpu_up(CPU_ID); }
static inline int is_cpu_occupied( unsigned int cpu ) { return is_cpu_taken_by_rcg_model(cpu) };
static inline void set_rt_callback( play_dead_handler_fp_t rt_runner_func, unsigned int cpu ) { return set_fe_code_idle(rt_runner_func, cpu)};
#else //This is 5.10.0 and newer, caller interface is the same between versions
static inline int rts_isolator_exec( unsigned int CPU_ID ){ return remove_cpu(CPU_ID); }
static inline int rts_isolator_cleanup( unsigned int CPU_ID ){ return add_cpu(CPU_ID); }
#endif
/// Other Notes
///
///
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment