summaryrefslogtreecommitdiff
path: root/maximus
diff options
context:
space:
mode:
authorburet2008-02-21 13:36:35 +0000
committerburet2008-02-21 13:36:35 +0000
commit4663fcad59d50c1f0a756b88e57aba3a867b717a (patch)
tree07d1f897188072e956357ee917c0d3701cf3055d /maximus
parent841a01d698bfd2c8ca7cf7b84a5942409531f483 (diff)
Maximus: redefine SNR max interval number.
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1448 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'maximus')
-rw-r--r--maximus/channel/inc/ChannelSettings.h7
-rw-r--r--maximus/channel/src/ChannelSettings.cpp10
-rw-r--r--maximus/channel/src/ChannelSettingsTest.cpp4
-rw-r--r--maximus/common/interfaces/Maximus.h5
-rw-r--r--maximus/common/types/channel_types.h2
-rw-r--r--maximus/coreengine/src/Maximus.cpp26
6 files changed, 27 insertions, 27 deletions
diff --git a/maximus/channel/inc/ChannelSettings.h b/maximus/channel/inc/ChannelSettings.h
index 540265a618..1ec40409dc 100644
--- a/maximus/channel/inc/ChannelSettings.h
+++ b/maximus/channel/inc/ChannelSettings.h
@@ -32,9 +32,8 @@ The original location of this file is /home/buret/eclipse/maximus/channel/inc/Ch
#define CHANNELSETTINGS_H
#include "networkclock_types.h" // for 'Network_Clock_Tick'
-#include "channel_types.h" // for 'Channel_Mod'
+#include "channel_types.h" // for 'Channel_Mod' and 'MAXIMUS_CHANNEL_INTERVAL_MAX_NB'
-#include "mac/common/defs.h" // for 'TONEMAP_INTERVAL_NB'
#include "hal/phy/defs.h" // for 'PHY_CARRIER_NB'
@@ -56,7 +55,7 @@ private:
//
bool mIsConfigured;
- float mSnrArray[TONEMAP_INTERVAL_NB][PHY_CARRIER_NB + 1];
+ float mSnrArray[MAXIMUS_CHANNEL_INTERVAL_MAX_NB][PHY_CARRIER_NB + 1];
Channel_Mod mTonemapArray[PHY_CARRIER_NB];
Network_Clock_Tick mPreDetectionDate;
Network_Clock_Tick mFcReceptionDate;
@@ -131,7 +130,7 @@ public:
* @param snr array of SNR values in dB
* @return bool
*/
- bool setSnr ( const float snr_values[TONEMAP_INTERVAL_NB][PHY_CARRIER_NB + 1] );
+ bool setSnr ( const float snr_values[MAXIMUS_CHANNEL_INTERVAL_MAX_NB][PHY_CARRIER_NB + 1] );
/**
* Sets the tonemap of the current transmission.
diff --git a/maximus/channel/src/ChannelSettings.cpp b/maximus/channel/src/ChannelSettings.cpp
index c5b7ed0779..1eab9c1798 100644
--- a/maximus/channel/src/ChannelSettings.cpp
+++ b/maximus/channel/src/ChannelSettings.cpp
@@ -54,7 +54,7 @@ void ChannelSettings::initAttributes ( )
logFunction();
// Init SNR array
- memset(mSnrArray, '\0', TONEMAP_INTERVAL_NB * (PHY_CARRIER_NB + 1) * sizeof(float));
+ memset(mSnrArray, '\0', MAXIMUS_CHANNEL_INTERVAL_MAX_NB * (PHY_CARRIER_NB + 1) * sizeof(float));
// Init tonemap array
memset(mTonemapArray, '\0', PHY_CARRIER_NB * sizeof(Channel_Mod));
@@ -131,7 +131,7 @@ const unsigned int ChannelSettings::getInterval ( const Network_Clock_Tick beaco
{
unsigned int i;
- for (i=0; i<TONEMAP_INTERVAL_NB; i++)
+ for (i=0; i<MAXIMUS_CHANNEL_INTERVAL_MAX_NB; i++)
{
if ( (symbol_start_date % beacon_period) / 25 < mSnrArray[i][0] )
{
@@ -169,7 +169,7 @@ bool ChannelSettings::setSnr ( const float snr_value )
{
logFunction();
- for (int i=0; i<TONEMAP_INTERVAL_NB; i++)
+ for (int i=0; i<MAXIMUS_CHANNEL_INTERVAL_MAX_NB; i++)
{
for (int j=0; j<=PHY_CARRIER_NB; j++)
{
@@ -181,11 +181,11 @@ bool ChannelSettings::setSnr ( const float snr_value )
}
-bool ChannelSettings::setSnr ( const float snr_values[TONEMAP_INTERVAL_NB][PHY_CARRIER_NB + 1] )
+bool ChannelSettings::setSnr ( const float snr_values[MAXIMUS_CHANNEL_INTERVAL_MAX_NB][PHY_CARRIER_NB + 1] )
{
logFunction();
- for (int i=0; i<TONEMAP_INTERVAL_NB; i++)
+ for (int i=0; i<MAXIMUS_CHANNEL_INTERVAL_MAX_NB; i++)
{
for (int j=0; j<=PHY_CARRIER_NB; j++)
{
diff --git a/maximus/channel/src/ChannelSettingsTest.cpp b/maximus/channel/src/ChannelSettingsTest.cpp
index a9e646355d..1546c213f5 100644
--- a/maximus/channel/src/ChannelSettingsTest.cpp
+++ b/maximus/channel/src/ChannelSettingsTest.cpp
@@ -80,8 +80,8 @@ void ChannelSettingsTest::getSnrTest (void)
try
{
- float snrArray[TONEMAP_INTERVAL_NB][PHY_CARRIER_NB + 1];
- memset(snrArray, '\0', TONEMAP_INTERVAL_NB * (PHY_CARRIER_NB + 1));
+ float snrArray[MAXIMUS_CHANNEL_INTERVAL_MAX_NB][PHY_CARRIER_NB + 1];
+ memset(snrArray, '\0', MAXIMUS_CHANNEL_INTERVAL_MAX_NB * (PHY_CARRIER_NB + 1));
snrArray[0][0] = 10000; // in ticks 25 MHz
snrArray[1][0] = 20000;
snrArray[2][0] = 30000;
diff --git a/maximus/common/interfaces/Maximus.h b/maximus/common/interfaces/Maximus.h
index 9dc447938d..a9b1741622 100644
--- a/maximus/common/interfaces/Maximus.h
+++ b/maximus/common/interfaces/Maximus.h
@@ -35,8 +35,7 @@ The original location of this file is /home/buret/eclipse/maximus/common/interfa
#include "IEthernet.h" // for 'EtherCb'
#include "networkclock_types.h" // for 'tick_t'
-
-#include "mac/common/defs.h" // for 'TONEMAP_INTERVAL_NB'
+#include "channel_types.h" // for 'MAXIMUS_CHANNEL_INTERVAL_MAX_NB'
#include <fstream> // for 'std::ofstream'
#include <string> // for 'std::string'
@@ -288,7 +287,7 @@ private:
* @param the SNR array read from the SNR file
* @return bool
*/
- bool readSnrFile ( const std::string & snr_file, float snr_array[TONEMAP_INTERVAL_NB][PHY_CARRIER_NB + 1] );
+ bool readSnrFile ( const std::string & snr_file, float snr_array[MAXIMUS_CHANNEL_INTERVAL_MAX_NB][PHY_CARRIER_NB + 1] );
public:
diff --git a/maximus/common/types/channel_types.h b/maximus/common/types/channel_types.h
index e38fe6cedf..86552d77d8 100644
--- a/maximus/common/types/channel_types.h
+++ b/maximus/common/types/channel_types.h
@@ -37,6 +37,8 @@ The original location of this file is /home/buret/eclipse/maximus/common/types/c
#define MAXIMUS_CHANNEL_CODE_MAX_VALUE 0x3FF // 0b1111111111 in QAM1024
#define MAXIMUS_CHANNEL_Q_QAM8_ABSOLUTE_VALUE 1.29f
+#define MAXIMUS_CHANNEL_INTERVAL_MAX_NB 128
+
enum Channel_Mod
{
MAXIMUS_CHANNEL_MOD_NONE = 0x00,
diff --git a/maximus/coreengine/src/Maximus.cpp b/maximus/coreengine/src/Maximus.cpp
index 349c427e72..d24ccc1aa7 100644
--- a/maximus/coreengine/src/Maximus.cpp
+++ b/maximus/coreengine/src/Maximus.cpp
@@ -689,12 +689,12 @@ void Maximus::set_snr ( const string & snr_file )
try
{
// Read the user SNR file
- float snrArray[TONEMAP_INTERVAL_NB][PHY_CARRIER_NB + 1];
+ float snrArray[MAXIMUS_CHANNEL_INTERVAL_MAX_NB][PHY_CARRIER_NB + 1];
if (!readSnrFile(snr_file, snrArray))
{
for (int j=0; j<= PHY_CARRIER_NB; j++)
{
- for (int i=0; i<TONEMAP_INTERVAL_NB; i++)
+ for (int i=0; i<MAXIMUS_CHANNEL_INTERVAL_MAX_NB; i++)
{
cerr << snrArray[i][j] << " ";
}
@@ -781,12 +781,12 @@ void Maximus::set_snr_from_src ( const string & snr_file, const Sta & src, const
try
{
// Read the user SNR file
- float snrArray[TONEMAP_INTERVAL_NB][PHY_CARRIER_NB + 1];
+ float snrArray[MAXIMUS_CHANNEL_INTERVAL_MAX_NB][PHY_CARRIER_NB + 1];
if (!readSnrFile(snr_file, snrArray))
{
for (int j=0; j<= PHY_CARRIER_NB; j++)
{
- for (int i=0; i<TONEMAP_INTERVAL_NB; i++)
+ for (int i=0; i<MAXIMUS_CHANNEL_INTERVAL_MAX_NB; i++)
{
cerr << snrArray[i][j] << " ";
}
@@ -873,12 +873,12 @@ void Maximus::set_snr_to_dst ( const string & snr_file, const Sta & dst, const b
try
{
// Read the user SNR file
- float snrArray[TONEMAP_INTERVAL_NB][PHY_CARRIER_NB + 1];
+ float snrArray[MAXIMUS_CHANNEL_INTERVAL_MAX_NB][PHY_CARRIER_NB + 1];
if (!readSnrFile(snr_file, snrArray))
{
for (int j=0; j<= PHY_CARRIER_NB; j++)
{
- for (int i=0; i<TONEMAP_INTERVAL_NB; i++)
+ for (int i=0; i<MAXIMUS_CHANNEL_INTERVAL_MAX_NB; i++)
{
cerr << snrArray[i][j] << " ";
}
@@ -964,12 +964,12 @@ void Maximus::set_snr_from_src_to_dst ( const string & snr_file, const Sta & src
try
{
- float snrArray[TONEMAP_INTERVAL_NB][PHY_CARRIER_NB + 1];
+ float snrArray[MAXIMUS_CHANNEL_INTERVAL_MAX_NB][PHY_CARRIER_NB + 1];
if (!readSnrFile(snr_file, snrArray))
{
for (int j=0; j<= PHY_CARRIER_NB; j++)
{
- for (int i=0; i<TONEMAP_INTERVAL_NB; i++)
+ for (int i=0; i<MAXIMUS_CHANNEL_INTERVAL_MAX_NB; i++)
{
cerr << snrArray[i][j] << " ";
}
@@ -1207,7 +1207,7 @@ bool Maximus::setWaitTickValue ( const Network_Clock_Tick wait_tick_value )
}
-bool Maximus::readSnrFile ( const string & snr_file, float snr_array[TONEMAP_INTERVAL_NB][PHY_CARRIER_NB + 1] )
+bool Maximus::readSnrFile ( const string & snr_file, float snr_array[MAXIMUS_CHANNEL_INTERVAL_MAX_NB][PHY_CARRIER_NB + 1] )
{
logFunction();
bool bRead = true;
@@ -1216,7 +1216,7 @@ bool Maximus::readSnrFile ( const string & snr_file, float snr_array[TONEMAP_INT
{
// Read file
//
- memset(snr_array, '\0', TONEMAP_INTERVAL_NB * (PHY_CARRIER_NB + 1) * sizeof(float));
+ memset(snr_array, '\0', MAXIMUS_CHANNEL_INTERVAL_MAX_NB * (PHY_CARRIER_NB + 1) * sizeof(float));
ifstream snrFile(snr_file.c_str(), ifstream::in);
if (snrFile.is_open())
{
@@ -1224,8 +1224,8 @@ bool Maximus::readSnrFile ( const string & snr_file, float snr_array[TONEMAP_INT
char c;
float tempEndTimeOfLastInterval = (2 * 1000000) / (getPhyProcessor()->getFrequency());
unsigned short int endTimeOfLastInterval = (unsigned short int)tempEndTimeOfLastInterval;
- unsigned short int numberOfIntervals = TONEMAP_INTERVAL_NB;
- for (int i=0; i<TONEMAP_INTERVAL_NB; i++)
+ unsigned short int numberOfIntervals = MAXIMUS_CHANNEL_INTERVAL_MAX_NB;
+ for (int i=0; i<MAXIMUS_CHANNEL_INTERVAL_MAX_NB; i++)
{
snrFile >> snr_array[i][0];
if (endTimeOfLastInterval <= snr_array[i][0])
@@ -1254,7 +1254,7 @@ bool Maximus::readSnrFile ( const string & snr_file, float snr_array[TONEMAP_INT
numberOfIntervals = i + 1;
if (endTimeOfLastInterval != snr_array[i][0])
{
- if (TONEMAP_INTERVAL_NB > i+1)
+ if (MAXIMUS_CHANNEL_INTERVAL_MAX_NB > i+1)
{
snr_array[i+1][0] = endTimeOfLastInterval;
numberOfIntervals++;