HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorerPlugins Commit - r50:9c702d65566a

A lot of cleaning,...

paul -

r50:9c702d65566a default

parent child

Context file:

r50:9c702d65566a

Collapse all files

ambaplugin/AHB/ahbpluginui.cpp +2 -2

             void ahbPluginUi::scanAHB()
             {
-                unsigned int size = AHB_PLUGNPLAY_SLAVE_STOP- AHB_PLUGNPLAY_MASTER_START;
+                unsigned int size = (AHB_PLUGNPLAY_SLAVE_STOP - AHB_PLUGNPLAY_MASTER_START)/4;
                 int j=0;
                 unsigned long long i = AHB_PLUGNPLAY_MASTER_START;
-                int pnpregs[AHB_PLUGNPLAY_SLAVE_STOP- AHB_PLUGNPLAY_MASTER_START];
+                int pnpregs[size];
                 emit this->clearAHBdevicesList();
                 if( this->_plugin->Read((unsigned int*)pnpregs,size,(unsigned int)AHB_PLUGNPLAY_MASTER_START)==size)
                 {

ambaplugin/AHB/ahbpluginui.h 0 -1

             #define AHB_PLUGNPLAY_MASTER_START ((unsigned int)(0xFFFFF000))
             #define AHB_PLUGNPLAY_MASTER_STOP  ((unsigned int)(0xFFFFF800))
             #define AHB_PLUGNPLAY_SLAVE_START  ((unsigned int)(0xFFFFF800))
             #define AHB_PLUGNPLAY_SLAVE_STOP   ((unsigned int)(0xFFFFFFFC))

ambaplugin/APB/apbpluginui.cpp +3 -3

             void apbPluginUi::scanAPB()
             {
                 this->lockScanBp();
-                unsigned int size = APB_PLUGNPLAY_STOP - APB_PLUGNPLAY_START;
+                unsigned int size = (APB_PLUGNPLAY_STOP - APB_PLUGNPLAY_START)/4;
                 int j=0;
                 unsigned long long i = APB_PLUGNPLAY_START;
-                int pnpregs[APB_PLUGNPLAY_STOP - APB_PLUGNPLAY_START];
+                int pnpregs[size];
                 emit this->clearAPBdevicesList();
-                if(this->_plugin->Read((unsigned int*)pnpregs,size/4,(unsigned int)APB_PLUGNPLAY_START)==(size/4))
+                if(this->_plugin->Read((unsigned int*)pnpregs,size,(unsigned int)APB_PLUGNPLAY_START)==size)
                 {
                     while(i<APB_PLUGNPLAY_STOP)
                     {

ambaplugin/APB/apbpluginui.h +1 -2

             #define APB_BUS_START        ((unsigned int)(0x80000000))
             #define APB_PLUGNPLAY_START  ((unsigned int)(0x800FF000))
+            #define APB_PLUGNPLAY_STOP   ((unsigned int)(0x800FFFFF))
-            #define APB_PLUGNPLAY_STOP   ((unsigned int)(0x800FF000+(512*8)))
             class apbPluginUi : public QWidget

spwplugin/GR-ESB/gr_esb_bridge.cpp +23 -6

             unsigned int GR_ESB_bridge::Write(unsigned int *Value, unsigned int count, unsigned int address)
             {
+                // TODO write ME!
+                Q_UNUSED(count)
+                Q_UNUSED(Value)
+                Q_UNUSED(address)
+                return 0;
             }
             unsigned int GR_ESB_bridge::Read(unsigned int *Value, unsigned int count, unsigned int address)
             {
+                // TODO write ME!
+                Q_UNUSED(Value)
+                Q_UNUSED(count)
+                Q_UNUSED(address)
+                return 0;
             }
             int GR_ESB_bridge::pushRMAPPacket(char *packet, int size)
             int GR_ESB_Manager::getRMAPtransactionID()
             {
+                // TODO write ME!
+                return -1;
             }
             int GR_ESB_Manager::getRMAPanswer(int transactionID, char **buffer)
             {
+                // TODO write ME!
+                Q_UNUSED(transactionID)
+                Q_UNUSED(buffer)
+                return -1;
             }
             bool GR_ESB_Manager::sendPacket(char *packet, int size)
             {
+                // TODO write ME!
+                Q_UNUSED(packet)
+                Q_UNUSED(size)
+                return false;
             }
             void GR_ESB_Manager::pushRmapPacket(char *packet, int len)
             {
+                // TODO write ME!
+                Q_UNUSED(packet)
+                Q_UNUSED(len)
             }

spwplugin/SpwTcpPacketServer/spwtcppacketserver.cpp +2 -2

             void SpwTcpPacketServer::sendTCUsingSpaceWire(QByteArray data)
             {
                 onePacketReceived();
-                if(data[0]==0)  // Protocole = 0 => Host to SpaceWire packet transmission
+                if(data[0]==(char)0)  // Protocole = 0 => Host to SpaceWire packet transmission
                 {
                     int size = (data[1]*256*256) + (data[2]*256) + data[3];
                     char* SPWpacket = (char*)malloc(size);
                             {
                                 QByteArray data = soc->readAll();
                                 onePacketReceived();
-                                if(data[0]==0)  // Protocole = 0 => Host to SpaceWire packet transmission
+                                if(data[0]==(char)0)  // Protocole = 0 => Host to SpaceWire packet transmission
                                 {
                                     int size = (data[1]*256*256) + (data[2]*256) + data[3];
                                     char* SPWpacket = (char*)malloc(size);

spwplugin/StarDundee/stardundeespw_usb.cpp +31 -17

             void stardundeeSPW_USB::makeGUI(socexplorerplugin *parent)
             {
+                Q_UNUSED(parent)
                 this->p_GUI = new StarDundeeGUI();
                 //    this->mainLayout = new QGridLayout(this->p_GUI);
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(connectClicked()),this,SLOT(toggleBridgeConnection()));
             {
                 this->RMAPtimeout = 2000;
                 this->handleMutex = new QMutex(QMutex::NonRecursive);
+            //    this->handleMutex = new QMutex(QMutex::Recursive);
                 this->RMAP_AnswersSem = new QSemaphore(0);
                 this->RMAP_AnswersMtx=new QMutex(QMutex::Recursive);
                 this->RMAP_pending_transaction_IDsMtx=new QMutex(QMutex::Recursive);
                 this->plugin = plugin;
                 connected = false;
-                this->moveToThread(this);
+                // TODO remove this crap!
+                this->initDialog();
+            //    this->moveToThread(this);
             }
             stardundeeSPW_USB_Manager::~stardundeeSPW_USB_Manager()
                 {
                     if(this->connected)
                     {
-                        handleMutex->lock();
+                        this->handleMutex->lock();
                         SocExplorerEngine::message(this->plugin,"Looking for new RMAP packets",4);
                         if(USBSpaceWire_WaitOnReadPacketAvailable(hDevice,0.01))
                         {
                                             memcpy(packetbuffer,buffer,properties.len);
                                             USBSpaceWire_FreeRead(hDevice, pIdentifier);
                                             pIdentifier = NULL;
-                                            handleMutex->unlock();
+                                            this->handleMutex->unlock();
                                             if(properties.len==8)
                                             {
                                                 packet=new RMAP_Answer(RMAP_get_transactionID(buffer),packetbuffer,properties.len);
                                             memcpy(packetbuffer,buffer,properties.len);
                                             emit emitPacket(packetbuffer,properties.len);
                                             USBSpaceWire_FreeRead(hDevice, pIdentifier);
-                                            handleMutex->unlock();
+                                            this->handleMutex->unlock();
                                             SocExplorerEngine::message(this->plugin,"Got SPW packet",2);
                                         }
                                     }
                                     else
                                     {
                                         SocExplorerEngine::message(this->plugin,"No EOP received",2);
+                                        this->handleMutex->unlock();
                                     }
                                 }
                             else
                             {
                                 USBSpaceWire_FreeRead(hDevice, pIdentifier);
-                                handleMutex->unlock();
+                                this->handleMutex->unlock();
                             }
                         }
                         else
                         {
                             USBSpaceWire_FreeRead(hDevice, pIdentifier);
-                            handleMutex->unlock();
+                            this->handleMutex->unlock();
                         }
                     }
                     else
             bool stardundeeSPW_USB_Manager::connectBridgeAsInterface()
             {
-                QMutexLocker mlock(this->handleMutex);
+            //    QMutexLocker mlock(&this->handleMutex);
+                this->handleMutex->lock();
                 int status;
                 U32 statusControl;
                 this->connected = false;
                 if (!USBSpaceWire_Open(&hDevice, this->selectedBrick)) // Open the USB device
                 {
                     SocExplorerEngine::message(this->plugin,"stardundee *** Open *** ERROR: USBSpaceWire_Open(&hDevice, 0))",0);
+                    this->handleMutex->unlock();
                     return false;
                 }
                 SocExplorerEngine::message(this->plugin,"stardundee *** Open *** USBSpaceWire_Open successful",0);
                 if (status != CFG_TRANSFER_SUCCESS)
                 {
                     SocExplorerEngine::message(this->plugin,"ERROR CFGSpaceWire_SetBrickBaseTransmitRate",1);
+                    this->handleMutex->unlock();
                     return false;
                 }
                 else
                 if (CFGSpaceWire_GetLinkStatusControl(hDevice, this->linkNumber, &statusControl) != CFG_TRANSFER_SUCCESS)
                 {
                     SocExplorerEngine::message(this->plugin,"Could not read link status control for link " + QString::number(this->linkNumber),1);
+                    this->handleMutex->unlock();
                     return false;
                 }
                 else
                     if (CFGSpaceWire_SetLinkStatusControl(hDevice, this->linkNumber, statusControl) != CFG_TRANSFER_SUCCESS)
                     {
                         SocExplorerEngine::message(this->plugin,"Could not set the link status control for link " + QString::number(this->linkNumber),1);
+                        this->handleMutex->unlock();
                         return false;
                     }
                     else
                 if (CFGSpaceWire_SetAsInterface(hDevice, 1, 0) != CFG_TRANSFER_SUCCESS)
                 {
                     SocExplorerEngine::message(this->plugin,"Could not set the device to be an interface",1);
+                    this->handleMutex->unlock();
                     return false;
                 }
                 else
                 USBSpaceWire_RegisterReceiveOnAllPorts(hDevice);    // Register to receive on all ports
                 USBSpaceWire_ClearEndpoints(hDevice);               // clear the USB endpoints
                 USBSpaceWire_SetTimeout(hDevice,1.0);
+                this->handleMutex->unlock();
                 SocExplorerEngine::message(this->plugin,"The driver's current send buffer size is " + QString::number(USBSpaceWire_GetDriverSendBufferSize(hDevice)) + " bytes",1);
                 SocExplorerEngine::message(this->plugin,"The driver's current read buffer size is " + QString::number(USBSpaceWire_GetDriverReadBufferSize(hDevice)) + " bytes",1);
                 SocExplorerEngine::message(this->plugin,"USBSpaceWire_IsReadThrottling is " + QString::number(USBSpaceWire_IsReadThrottling(hDevice)),1);
             bool stardundeeSPW_USB_Manager::connectBridgeAsRouter()
             {
-                QMutexLocker mlock(this->handleMutex);
+            //    QMutexLocker mlock(&this->handleMutex);
+                this->handleMutex->lock();
                 int status;
                 U32 statusControl;
                 unsigned int linkStatus1;
                 if (!USBSpaceWire_Open(&hDevice, this->selectedBrick)) // Open the USB device
                 {
                     SocExplorerEngine::message(this->plugin,"stardundee *** Open *** ERROR: USBSpaceWire_Open(&hDevice, 0))");
+                    this->handleMutex->unlock();
                     return false;
                 }
                 SocExplorerEngine::message(this->plugin,"stardundee *** Open *** USBSpaceWire_Open successful, device number: "
                 // test Link 1 and Link 2
                 linkStatus1 = getLinkStatus(0x01);
                 linkStatus2 = getLinkStatus(0x02);
+                this->handleMutex->unlock();
                 if ((linkStatus1==1) || (linkStatus2==1))
                 {
             bool stardundeeSPW_USB_Manager::sendPacket(char *packet, int size)
             {
                 char protocoleIdentifier;
-                USB_SPACEWIRE_STATUS result;
+                USB_SPACEWIRE_STATUS result=TRANSFER_ERROR_NOT_FOUND;
                 USB_SPACEWIRE_ID pIdentifier;
                 SocExplorerEngine::message(this->plugin,"Sending SPW packet",2);
                 this->handleMutex->lock();
                 result = USBSpaceWire_SendPacket(hDevice,packet,size,1, &pIdentifier);
+                USBSpaceWire_FreeSend(hDevice, pIdentifier);
+                this->handleMutex->unlock();
                 if (result != TRANSFER_SUCCESS)
                 {
                     SocExplorerEngine::message(this->plugin,"ERR sending the READ command ",2);
-                    this->handleMutex->unlock();
                     return false;
                 }
                 else
                 {
                     emit bytesTransmittedToSpw( size-1 ); // -1 is for removing the first bytes added to the packet to route to the right link
                     // read the protocole identifier
                     protocoleIdentifier = packet[2];
                     if (protocoleIdentifier == SPW_PROTO_ID_CCSDS)
                             emit ccsdsPacketTransmittedToSpw();
                     SocExplorerEngine::message(this->plugin,"Packet sent",2);
-                    USBSpaceWire_FreeSend(hDevice, pIdentifier);
                 }
-                this->handleMutex->unlock();
+            //    this->handleMutex->unlock();
                 return true;
             }
             void stardundeeSPW_USB_Manager::setTimecodeFrequency(double requestedFrequency)
             {
-                U32 rtr_clk_freq;
+                U32 rtr_clk_freq=0;
-                U32 freqCount;
+                U32 freqCount=0;
-                double freqCountInDouble;
+                double freqCountInDouble=0.0;
-                double currentFrequency;
+                double currentFrequency=0.0;
                 rtr_clk_freq = USBSpaceWire_TC_GetClockFrequency(hDevice);
                 freqCountInDouble = ((double) rtr_clk_freq) / requestedFrequency;

spwplugin/StarDundee/stardundeespw_usb.h +1 -1

                 int getLinkNumber( void );
             private:
-                QMutex* handleMutex,*RMAP_AnswersMtx,*RMAP_pending_transaction_IDsMtx;
+                QMutex *handleMutex,*RMAP_AnswersMtx,*RMAP_pending_transaction_IDsMtx;
                 QSemaphore* RMAP_AnswersSem;
                 void pushRmapPacket(char* packet,int len);
                 star_device_handle hDevice;

spwplugin/abstractspwbridge.cpp +1 -1

             abstractSpwBridge::~abstractSpwBridge()
             {
-                    delete this->p_GUI;
+            //        delete this->p_GUI;
             }
             QWidget *abstractSpwBridge::getGUI()

spwplugin/spwplugin.pro +1 -6

             win32:CONFIG += dll
             win32:CONFIG -= static
-            CONFIG(debug, debug|release) {
+            TARGET = spwplugin
-              DEBUG_EXT = _d
-            } else {
-              DEBUG_EXT =
-            TARGET = spwplugin$${DEBUG_EXT}
             DEFINES += PLUGIN=spwplugin
             DEFINES += PLUGINHEADER="\"\\\"spwplugin.h"\\\"\"
             DEFINES += driver_Name="\"\\\"SpwPlugin"\\\"\"

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages