# HG changeset patch # User Paul LEROY # Date 2012-12-10 07:06:33 # Node ID ead10fa095b76ba291ac53eaed6cf3e8dea4c8c1 # Parent 73b8297d63900d3376bdf855dd0b4599b0405e18 Minor changes diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: PAULs_LPPMON_PLUGINS -# Generated by qmake (2.01a) (Qt 4.8.3) on: Thu Nov 29 14:02:20 2012 +# Generated by qmake (2.01a) (Qt 4.8.3) on: Mon Dec 10 07:51:52 2012 # Project: PAULs_LPPMON_PLUGINS.pro # Template: subdirs # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile PAULs_LPPMON_PLUGINS.pro diff --git a/PAULs_LPPMON_PLUGINS.pro b/PAULs_LPPMON_PLUGINS.pro --- a/PAULs_LPPMON_PLUGINS.pro +++ b/PAULs_LPPMON_PLUGINS.pro @@ -7,5 +7,4 @@ unix:LPPMONCFG = /etc/lppmon SUBDIRS = \ rmapplugin - #include( $${LPPMONCFG}/lppmonplugin.prf) diff --git a/PAULs_LPPMON_PLUGINS.pro.user b/PAULs_LPPMON_PLUGINS.pro.user --- a/PAULs_LPPMON_PLUGINS.pro.user +++ b/PAULs_LPPMON_PLUGINS.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/rmapplugin/Makefile b/rmapplugin/Makefile --- a/rmapplugin/Makefile +++ b/rmapplugin/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: librmapplugin.so.1.0.0 -# Generated by qmake (2.01a) (Qt 4.8.3) on: Mon Dec 3 13:45:43 2012 +# Generated by qmake (2.01a) (Qt 4.8.3) on: Mon Dec 10 07:51:52 2012 # Project: rmapplugin.pro # Template: lib # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile rmapplugin.pro @@ -54,6 +54,7 @@ SOURCES = rmapplugin.cpp \ rmappluginpythonwrapper.cpp \ stardundee.cpp \ gresb.cpp \ + bridge.cpp \ /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp moc/moc_rmappluginui.cpp \ moc/moc_rmapplugin.cpp \ moc/moc_spwpacketreceiver.cpp \ @@ -63,6 +64,7 @@ SOURCES = rmapplugin.cpp \ moc/moc_rmappluginpythonwrapper.cpp \ moc/moc_stardundee.cpp \ moc/moc_gresb.cpp \ + moc/moc_bridge.cpp \ moc/moc_genericPySysdriver.cpp \ moc/moc_lppmonplugin.cpp OBJECTS = obj/rmapplugin.o \ @@ -76,6 +78,7 @@ OBJECTS = obj/rmapplugin.o \ obj/rmappluginpythonwrapper.o \ obj/stardundee.o \ obj/gresb.o \ + obj/bridge.o \ obj/lppmonplugininterface.o \ obj/moc_rmappluginui.o \ obj/moc_rmapplugin.o \ @@ -86,6 +89,7 @@ OBJECTS = obj/rmapplugin.o \ obj/moc_rmappluginpythonwrapper.o \ obj/moc_stardundee.o \ obj/moc_gresb.o \ + obj/moc_bridge.o \ obj/moc_genericPySysdriver.o \ obj/moc_lppmonplugin.o DIST = /usr/lib64/qt4/mkspecs/common/unix.conf \ @@ -233,7 +237,7 @@ qmake: FORCE dist: @$(CHK_DIR_EXISTS) obj/rmapplugin1.0.0 || $(MKDIR) obj/rmapplugin1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmappluginui.h rmapplugin.h rmapoperations.h ccsds.h spwpacketreceiver.h ../common_PLE/qipdialogbox.h ../common_PLE/gresbstatusenquiry.h spectralmatricesdmasimulator.h rmappluginpythonwrapper.h stardundee.h ../spw_usb_driver_v2.61/inc/spw_usb_api.h ../spw_usb_driver_v2.61/inc/spw_config_library.h gresb.h /usr/include/genericPySysdriver.h /usr/include/lppmonplugin.h obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmapplugin.cpp rmappluginui.cpp rmapoperations.cpp ccsds.cpp spwpacketreceiver.cpp ../common_PLE/qipdialogbox.cpp ../common_PLE/gresbstatusenquiry.cpp spectralmatricesdmasimulator.cpp rmappluginpythonwrapper.cpp stardundee.cpp gresb.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp obj/rmapplugin1.0.0/ && (cd `dirname obj/rmapplugin1.0.0` && $(TAR) rmapplugin1.0.0.tar rmapplugin1.0.0 && $(COMPRESS) rmapplugin1.0.0.tar) && $(MOVE) `dirname obj/rmapplugin1.0.0`/rmapplugin1.0.0.tar.gz . && $(DEL_FILE) -r obj/rmapplugin1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmappluginui.h rmapplugin.h rmapoperations.h ccsds.h spwpacketreceiver.h ../common_PLE/qipdialogbox.h ../common_PLE/gresbstatusenquiry.h spectralmatricesdmasimulator.h rmappluginpythonwrapper.h stardundee.h ../spw_usb_driver_v2.61/inc/spw_usb_api.h ../spw_usb_driver_v2.61/inc/spw_config_library.h gresb.h bridge.h /usr/include/genericPySysdriver.h /usr/include/lppmonplugin.h obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmapplugin.cpp rmappluginui.cpp rmapoperations.cpp ccsds.cpp spwpacketreceiver.cpp ../common_PLE/qipdialogbox.cpp ../common_PLE/gresbstatusenquiry.cpp spectralmatricesdmasimulator.cpp rmappluginpythonwrapper.cpp stardundee.cpp gresb.cpp bridge.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp obj/rmapplugin1.0.0/ && (cd `dirname obj/rmapplugin1.0.0` && $(TAR) rmapplugin1.0.0.tar rmapplugin1.0.0 && $(COMPRESS) rmapplugin1.0.0.tar) && $(MOVE) `dirname obj/rmapplugin1.0.0`/rmapplugin1.0.0.tar.gz . && $(DEL_FILE) -r obj/rmapplugin1.0.0 clean:compiler_clean @@ -255,12 +259,13 @@ mocclean: compiler_moc_header_clean comp mocables: compiler_moc_header_make_all compiler_moc_source_make_all -compiler_moc_header_make_all: moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_spwpacketreceiver.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp +compiler_moc_header_make_all: moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_spwpacketreceiver.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_bridge.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp compiler_moc_header_clean: - -$(DEL_FILE) moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_spwpacketreceiver.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp + -$(DEL_FILE) moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_spwpacketreceiver.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_bridge.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp moc/moc_rmappluginui.cpp: rmapoperations.h \ spectralmatricesdmasimulator.h \ stardundee.h \ + gresb.h \ rmappluginui.h /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmappluginui.h -o moc/moc_rmappluginui.cpp @@ -268,6 +273,7 @@ moc/moc_rmapplugin.cpp: rmappluginui.h \ rmapoperations.h \ spectralmatricesdmasimulator.h \ stardundee.h \ + gresb.h \ ccsds.h \ spwpacketreceiver.h \ rmapplugin.h @@ -288,12 +294,17 @@ moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp: rmappluginpythonwrapper.h /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmappluginpythonwrapper.h -o moc/moc_rmappluginpythonwrapper.cpp -moc/moc_stardundee.cpp: stardundee.h +moc/moc_stardundee.cpp: rmapoperations.h \ + stardundee.h /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) stardundee.h -o moc/moc_stardundee.cpp moc/moc_gresb.cpp: gresb.h /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) gresb.h -o moc/moc_gresb.cpp +moc/moc_bridge.cpp: rmapoperations.h \ + bridge.h + /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) bridge.h -o moc/moc_bridge.cpp + moc/moc_genericPySysdriver.cpp: /usr/include/genericPySysdriver.h /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) /usr/include/genericPySysdriver.h -o moc/moc_genericPySysdriver.cpp @@ -324,6 +335,7 @@ obj/rmapplugin.o: rmapplugin.cpp rmapplu rmapoperations.h \ spectralmatricesdmasimulator.h \ stardundee.h \ + gresb.h \ ccsds.h \ spwpacketreceiver.h \ rmappluginpythonwrapper.h @@ -334,6 +346,7 @@ obj/rmappluginui.o: rmappluginui.cpp rma rmapoperations.h \ spectralmatricesdmasimulator.h \ stardundee.h \ + gresb.h \ ccsds.h \ spwpacketreceiver.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmappluginui.o rmappluginui.cpp @@ -344,7 +357,8 @@ obj/rmapoperations.o: rmapoperations.cpp obj/ccsds.o: ccsds.cpp ccsds.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ccsds.o ccsds.cpp -obj/spwpacketreceiver.o: spwpacketreceiver.cpp spwpacketreceiver.h +obj/spwpacketreceiver.o: spwpacketreceiver.cpp spwpacketreceiver.h \ + rmapoperations.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/spwpacketreceiver.o spwpacketreceiver.cpp obj/qipdialogbox.o: ../common_PLE/qipdialogbox.cpp ../common_PLE/qipdialogbox.h @@ -366,6 +380,10 @@ obj/stardundee.o: stardundee.cpp stardun obj/gresb.o: gresb.cpp gresb.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/gresb.o gresb.cpp +obj/bridge.o: bridge.cpp bridge.h \ + rmapoperations.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/bridge.o bridge.cpp + obj/lppmonplugininterface.o: /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.h \ /usr/include/lppmon/pluginsInterface/lppmonplugininterface_global.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/lppmonplugininterface.o /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp @@ -397,6 +415,9 @@ obj/moc_stardundee.o: moc/moc_stardundee obj/moc_gresb.o: moc/moc_gresb.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_gresb.o moc/moc_gresb.cpp +obj/moc_bridge.o: moc/moc_bridge.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_bridge.o moc/moc_bridge.cpp + obj/moc_genericPySysdriver.o: moc/moc_genericPySysdriver.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_genericPySysdriver.o moc/moc_genericPySysdriver.cpp diff --git a/rmapplugin/bridge.cpp b/rmapplugin/bridge.cpp --- a/rmapplugin/bridge.cpp +++ b/rmapplugin/bridge.cpp @@ -3,4 +3,154 @@ bridge::bridge(QWidget *parent) : QWidget(parent) { + // Packet receiver + rmapPacketSEMAPHORE = new QSemaphore; + ccsdsPacketSEMAPHORE = new QSemaphore; + rmapPacket = (char*) malloc(RMAP_MAX_PACKET_LENGTH); + ccsdsPacket = (unsigned char*) malloc(CCSDS_MAX_PACKET_LENGTH); + spwPacket = (char*) malloc( qMax(RMAP_MAX_PACKET_LENGTH, CCSDS_MAX_PACKET_LENGTH) ); + + bridge_LAYOUT = new QGridLayout; } + +bridge::~bridge() +{ + free(rmapPacket); + free(ccsdsPacket); + free(spwPacket); +} + +unsigned int bridge::Write(unsigned int *Value, unsigned int count, unsigned int address) +{ + unsigned int remainingCount = count; + unsigned int iOffset = 0; + QString console_message; + char* data; + + if(rmapPacketSEMAPHORE->available()!=0) + { + emit appendToLog("WARNING === in function WRITE of rmapplugin *** RMAP request already running, WRITE access stopped"); + return 1; + } + + emit this->RMAP_write_reply_setText("reply to the write command required\nlast reply status: unavailable"); + + data = (char*) malloc(READ_WRITE_MAX_COUNTS*4); + + emit appendToLog(QString("*** START *** WRITE ")+ QString::number(count) + QString(" word(s) @0x")+ QString::number(address,16)); + + while (remainingCount > READ_WRITE_MAX_COUNTS) + { + for (int i = 0; i>8); + data[i*4+1] = (char) ((unsigned int) Value[i+iOffset]>>16); + data[i*4+0] = (char) ((unsigned int) Value[i+iOffset]>>24); + } + + console_message.sprintf("remainingCount: %d => ", remainingCount); + emit appendToLog(console_message + QString("Write ")+ QString::number(READ_WRITE_MAX_COUNTS*4) + QString(" byte(s) @0x")+ QString::number(address,16)); + + if(WriteBLOCK(data, READ_WRITE_MAX_COUNTS*4, address)==0) + { + emit appendToLog("WARNING === in function WRITE of rmapplugin *** RMAP write command failed"); + return 1; + } + + remainingCount = remainingCount - READ_WRITE_MAX_COUNTS; + address = address + READ_WRITE_MAX_COUNTS * 4; + iOffset = iOffset + READ_WRITE_MAX_COUNTS; + } + + if (remainingCount > 0) + { + for (unsigned int i = 0; i>8); + data[i*4+1] = (char) ((unsigned int) Value[i+iOffset]>>16); + data[i*4+0] = (char) ((unsigned int) Value[i+iOffset]>>24); + } + + console_message.sprintf("remainingCount: %d => ", remainingCount); + emit appendToLog(console_message + QString("Write ")+ QString::number(remainingCount*4) + QString(" byte(s) @0x")+ QString::number(address,16)); + + if (WriteBLOCK(data, remainingCount*4, address)==0) + { + emit appendToLog("WARNING === in function WRITE of rmapplugin *** RMAP write command failed"); + return 1; + } + } + + emit appendToLog(QString("*** STOP *** WRITE")); + free(data); + return count; +} + +unsigned int bridge::Read(unsigned int *Value, unsigned int count, unsigned int address) +{ + unsigned int remainingCount = count; + unsigned int iOffset = 0; + QString console_message; + + if(rmapPacketSEMAPHORE->available()!=0) + { + emit appendToLog("WARNING === in function READ of rmapplugin *** RMAP request already running, READ access stopped"); + return 1; + } + emit appendToLog(QString("*** START *** READ ")+ QString::number(count) + QString(" word(s) @0x")+ QString::number(address,16)); + + while (remainingCount > READ_WRITE_MAX_COUNTS) + { + console_message.sprintf("remainingCount: %d => ", remainingCount); + emit appendToLog(console_message + QString("Read ")+ QString::number(4*READ_WRITE_MAX_COUNTS) + QString(" byte(s) @0x")+ QString::number(address,16)); + + if (this->ReadBLOCK(READ_WRITE_MAX_COUNTS*4, address)==0) + { + emit appendToLog("WARNING === in function READ of rmapplugin *** RMAP packet not received"); + return 1; + } + + for(int i=0;iacquire(); + } + + if (remainingCount > 0) + { + console_message.sprintf("remainingCount: %d => ", remainingCount); + emit appendToLog(console_message + QString("Read ")+ QString::number(4*remainingCount) + QString(" byte(s) @0x")+ QString::number(address,16)); + + if (this->ReadBLOCK(4*remainingCount, address)==0) + { + emit appendToLog("WARNING === in function READ of rmapplugin *** RMAP packet not received"); + return 1; + } + + for(unsigned int i=0;iacquire(); + } + + emit appendToLog(QString("*** STOP *** READ ")); + return count; +} + diff --git a/rmapplugin/bridge.h b/rmapplugin/bridge.h --- a/rmapplugin/bridge.h +++ b/rmapplugin/bridge.h @@ -2,17 +2,53 @@ #define BRIDGE_H #include +#include +#include +#include "rmapoperations.h" class bridge : public QWidget { Q_OBJECT public: explicit bridge(QWidget *parent = 0); - + ~bridge(); + unsigned int Write(unsigned int *Value,unsigned int count,unsigned int address=0); + unsigned int Read(unsigned int *Value,unsigned int count,unsigned int address=0); + virtual unsigned int WriteSPW(char *Value, unsigned int count, char targetLogicalAddress, char userApplication); + virtual unsigned int WriteBLOCK(char *data,unsigned int nbBytes,unsigned int address=0) = 0; + virtual unsigned int ReadBLOCK(unsigned int nbBytes,unsigned int address=0) = 0; + virtual unsigned int getLinkStatus(unsigned char link) = 0; + + unsigned char rmapTargetLogicalAddress ; + unsigned char rmapSourceLogicalAddress ; + + RMAP_command_codes commandCode; + + QGridLayout *bridge_LAYOUT; + + QSemaphore *rmapPacketSEMAPHORE; + QSemaphore *ccsdsPacketSEMAPHORE; + + char *spwPacket; + char* rmapPacket; + unsigned char *ccsdsPacket; + signals: + void sendMessage(QString message); + void isOpen(bool); + void RMAP_write_reply_setText(QString); + void appendToLog(QString); + void ccsdsPacketAvailable(unsigned char*, unsigned int); public slots: - + unsigned int Open(); + unsigned int Close(); + virtual int receiveSPWPacket(unsigned char requestID) = 0; + void commandCodeHasChanged(RMAP_command_codes code) {this->commandCode = code;} + void targetHasChanged(int target) {rmapTargetLogicalAddress = (unsigned char) target;} + void sourceHasChanged(int target) {rmapSourceLogicalAddress = (unsigned char) target;} + +private: }; #endif // BRIDGE_H diff --git a/rmapplugin/gresb.h b/rmapplugin/gresb.h --- a/rmapplugin/gresb.h +++ b/rmapplugin/gresb.h @@ -19,6 +19,11 @@ signals: public slots: private: + //******************* + // specific functions + + //***************** + // specific members QLabel *gresbBridgeIPLabel; QLabel *gresbVirtualLinkLabel; QLabel *spwLinkLabel; diff --git a/rmapplugin/rmapplugin.pro b/rmapplugin/rmapplugin.pro --- a/rmapplugin/rmapplugin.pro +++ b/rmapplugin/rmapplugin.pro @@ -18,10 +18,8 @@ DEFINES += driver_can_be_child=0 DEFINES += driver_VID=0 DEFINES += driver_PID=0 - QT += network - LIBS += ../spw_usb_driver_v2.61/lib/x86_64/libSpaceWireUSBAPI.so \ ../spw_usb_driver_v2.61/lib/x86_64/libConfigLibraryUSB.so @@ -72,4 +70,3 @@ SOURCES += \ - diff --git a/rmapplugin/stardundee.cpp b/rmapplugin/stardundee.cpp --- a/rmapplugin/stardundee.cpp +++ b/rmapplugin/stardundee.cpp @@ -15,7 +15,7 @@ StarDundee::StarDundee(QWidget *parent) commandCode = invalid0; // initialization of the cmmand code for the RMAP transfers rmapSourceLogicalAddress = 0x20; - connection_LAYOUT = new QGridLayout; + bridge_LAYOUT = new QGridLayout; usbDeviceNumber_LABEL = new QLabel(tr("USB device number: ")); linkNumber_LABEL = new QLabel(tr("SpaceWire link number: ")); @@ -31,17 +31,16 @@ StarDundee::StarDundee(QWidget *parent) sourceLogicalAddress_SPINBOX->setRange(0,254); sourceLogicalAddress_SPINBOX->setValue(32); - connection_LAYOUT->addWidget(usbDeviceNumber_LABEL, 0, 0, 1, 1); - connection_LAYOUT->addWidget(usbDeviceNumber_SPINBOX, 0, 1, 1, 1); - connection_LAYOUT->addWidget(linkNumber_LABEL, 1, 0, 1, 1); - connection_LAYOUT->addWidget(linkNumber_SPINBOX, 1, 1, 1, 1); - connection_LAYOUT->addWidget(sourceLogicalAddress_LABEL, 2, 0, 1, 1); - connection_LAYOUT->addWidget(sourceLogicalAddress_SPINBOX, 2, 1, 1, 1); + bridge_LAYOUT->addWidget(usbDeviceNumber_LABEL, 0, 0, 1, 1); + bridge_LAYOUT->addWidget(usbDeviceNumber_SPINBOX, 0, 1, 1, 1); + bridge_LAYOUT->addWidget(linkNumber_LABEL, 1, 0, 1, 1); + bridge_LAYOUT->addWidget(linkNumber_SPINBOX, 1, 1, 1, 1); + bridge_LAYOUT->addWidget(sourceLogicalAddress_LABEL, 2, 0, 1, 1); + bridge_LAYOUT->addWidget(sourceLogicalAddress_SPINBOX, 2, 1, 1, 1); + bridge_LAYOUT->setRowStretch(3, 1); + bridge_LAYOUT->setColumnStretch(2, 1); - connection_LAYOUT->setRowStretch(3, 1); - connection_LAYOUT->setColumnStretch(2, 1); - - this->setLayout(connection_LAYOUT); + this->setLayout(bridge_LAYOUT); connect(this->sourceLogicalAddress_SPINBOX, SIGNAL(valueChanged(int)), this, SLOT(sourceHasChanged(int))); } diff --git a/rmapplugin/stardundee.h b/rmapplugin/stardundee.h --- a/rmapplugin/stardundee.h +++ b/rmapplugin/stardundee.h @@ -22,7 +22,6 @@ public: ~StarDundee(); unsigned int Write(unsigned int *Value,unsigned int count,unsigned int address=0); unsigned int Read(unsigned int *Value,unsigned int count,unsigned int address=0); - unsigned int WriteStarDundee(unsigned int *Value, unsigned int count, unsigned int address); unsigned int WriteSPW(char *Value, unsigned int count, char targetLogicalAddress, char userApplication); unsigned int getLinkStatus(unsigned char link); @@ -42,17 +41,33 @@ public slots: void sourceHasChanged(int target) {rmapSourceLogicalAddress = (unsigned char) target;} private: - unsigned int GetRoutingTableEntry(); + //****************** + // general functions unsigned int WriteBLOCK(char *data,unsigned int nbBytes,unsigned int address=0); unsigned int ReadBLOCK(unsigned int nbBytes,unsigned int address=0); void acquireRMAPSemaphore() {rmapPacketSEMAPHORE->acquire();} void acquireCCSDSSemaphore() {ccsdsPacketSEMAPHORE->acquire();} + //**************** + // general members unsigned char rmapTargetLogicalAddress ; unsigned char rmapSourceLogicalAddress ; + RMAP_command_codes commandCode; + QGridLayout *bridge_LAYOUT; + QSemaphore *rmapPacketSEMAPHORE; + QSemaphore *ccsdsPacketSEMAPHORE; + char* rmapPacket; + unsigned char *ccsdsPacket; + char *spwPacket; + unsigned int rmapPacketSize; + unsigned int ccsdsPacketSize; - RMAP_command_codes commandCode; + //************************** + // specific member functions + unsigned int GetRoutingTableEntry(); + //************************** + // specific member variables QLabel *usbDeviceNumber_LABEL; QLabel *linkNumber_LABEL; QLabel *sourceLogicalAddress_LABEL; @@ -61,22 +76,9 @@ private: QSpinBox *linkNumber_SPINBOX; QSpinBox *sourceLogicalAddress_SPINBOX; - QGridLayout *connection_LAYOUT; - - unsigned char pBuffer[10]; // Pointer to the start of the user buffer from which to transmit data - USB_SPACEWIRE_ID pIdentifier; // A pointer to a variable which will be set to contain a unique identifier for the send - + USB_SPACEWIRE_ID pIdentifier; // unique identifier for the send/receive operations star_device_handle hDevice; // Handle to the SpaceWire device USB_SPACEWIRE_STATUS result; // The result of the send operation - - // Packet receiver - QSemaphore *rmapPacketSEMAPHORE; - QSemaphore *ccsdsPacketSEMAPHORE; - char* rmapPacket; // The buffer to receive RMAP READ packets - unsigned char *ccsdsPacket; - char *spwPacket; - unsigned int rmapPacketSize; - unsigned int ccsdsPacketSize; }; #endif // STARDUNDEE_H