summaryrefslogtreecommitdiff
path: root/maximus/sci/src
diff options
context:
space:
mode:
authorburet2007-06-06 17:06:41 +0000
committerburet2007-06-06 17:06:41 +0000
commit0811741c23cf30ad726ae2b05f07eabe1115ff80 (patch)
tree542637d4fc321379fd6fe726f9878be5d94a0d17 /maximus/sci/src
parent562434116bd2789d888dac33fbd446c9cfda4d8d (diff)
Development of dispatch system SCI msg
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@244 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'maximus/sci/src')
-rw-r--r--maximus/sci/src/SciMsg.cpp5
-rw-r--r--maximus/sci/src/SciServerTest.cpp10
2 files changed, 7 insertions, 8 deletions
diff --git a/maximus/sci/src/SciMsg.cpp b/maximus/sci/src/SciMsg.cpp
index 379a570b7c..06f894b01a 100644
--- a/maximus/sci/src/SciMsg.cpp
+++ b/maximus/sci/src/SciMsg.cpp
@@ -220,10 +220,9 @@ void SciMsg::displaySciMsgHeader ( ) const
clog << "SciMsg::displaySciMsgHeader" << endl;
clog << "\tSCI msg header = " << endl;
- clog << hex;
- clog << "\t\tmagic_id = 0x" << setfill('0') << setw(8) << uppercase << getSciMsgHeader()->magic_id << endl;
+ clog << "\t\tmagic_id = 0x" << hex << setfill('0') << setw(8) << uppercase << getSciMsgHeader()->magic_id << endl;
clog << "\t\tlength = " << dec << getSciMsgHeader()->length << endl;
- clog << "\t\ttype = " << dec << getSciMsgHeader()->type << endl;
+ clog << "\t\ttype = " << getSciMsgHeader()->type << endl;
clog << "\t\tversion = 0x" << hex << setfill('0') << setw(4) << uppercase << getSciMsgHeader()->version << endl;
clog << "\t\tmsg_id = 0x" << setfill('0') << setw(4) << uppercase << getSciMsgHeader()->msg_id << endl;
clog << "\t\tstation_id = 0x" << setfill('0') << setw(4) << uppercase << getSciMsgHeader()->station_id << endl;
diff --git a/maximus/sci/src/SciServerTest.cpp b/maximus/sci/src/SciServerTest.cpp
index 31213f18b7..295496f994 100644
--- a/maximus/sci/src/SciServerTest.cpp
+++ b/maximus/sci/src/SciServerTest.cpp
@@ -141,8 +141,8 @@ void SciServerTest::receiveMsgTest (void)
{
receiveClockSciMsgTest (msgHeader, dataLength, (unsigned char *)"123456789011223344556677889900111222333444555666777888999000");
receivePhySciMsgTest (msgHeader, dataLength, (unsigned char *)"123456789011223344556677889900111222333444555666777888999000");
- receiveSystemSciMsgTest (msgHeader, dataLength, (unsigned char *)"123456789011223344556677889900111222333444555666777888999000");
- receiveFunctionSciMsgTest (msgHeader, dataLength, (unsigned char *)"0000functionSciMsgCallback\0 parameter1\0 012parameter2\0 06123456");
+ receiveSystemSciMsgTest (msgHeader, dataLength, (unsigned char *)"113456789011223344556677889900111222333444555666777888999000");
+ receiveFunctionSciMsgTest (msgHeader, dataLength, (unsigned char *)"0000functionSciMsgCallback\0parameter1\0 012parameter2\0 061234");
}
catch ( Error &e )
{
@@ -203,7 +203,7 @@ void SciServerTest::registerPhySciMsgTest (void)
//
clog << "\tSciServerTest -> SciServer::registerSpecializedSciMsg" << endl;
CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("registerSpecializedSciMsg failed"),
- mpSciServer->registerSpecializedSciMsg(SCI_MSG_TYPE_PHY, new PhySciMsg()) );
+ mpSciServer->registerSpecializedSciMsg(SCI_MSG_TYPE_PHY, new PhySciMsg(mpPhyProcessor)) );
// Check results
//
@@ -218,7 +218,7 @@ void SciServerTest::registerSystemSciMsgTest (void)
//
clog << "\tSciServerTest -> SciServer::registerSpecializedSciMsg" << endl;
CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("registerSpecializedSciMsg failed"),
- mpSciServer->registerSpecializedSciMsg(SCI_MSG_TYPE_SYSTEM, new SystemSciMsg ( )) );
+ mpSciServer->registerSpecializedSciMsg(SCI_MSG_TYPE_SYSTEM, new SystemSciMsg(mpSystemManager)) );
// Check results
//
@@ -251,7 +251,7 @@ void SciServerTest::receiveSystemSciMsgTest ( Sci_Msg_Header & msg_header, unsig
//
clog << "\tSciServerTest -> SciServer::receiveMsg" << endl;
CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("receiveMsg failed"),
- mpSciServer->receiveMsg (&msg_header, data_length, p_data) );
+ !mpSciServer->receiveMsg (&msg_header, data_length, p_data) );
}