HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorerPlugins Commit - r78:61fd409c32ee

Backported SPW work from GRESB branch.

Alexis Jeandet -

r78:61fd409c32ee default

parent child

Context file:

r78:61fd409c32ee

Collapse all files

SocExplorer_Plugins.pro +1 0

             TEMPLATE = subdirs
             CONFIG   += ordered
             SUBDIRS = \
                 ahbuartplugin \
                 ambaplugin \
                 APBUARTPLUGIN \
                 dsu3plugin \
                 genericrwplugin \
                 memctrlrplugin \
                 memcheckplugin
             unix:SUBDIRS +=  spwplugin
             OTHER_FILES += SocExplorer-plugins.spec

spwplugin/GR-ESB/gr_esb_bridge.cpp +330 -58

@@ -1,242 +1,514
1	/*------------------------------------------------------------------------------	1	/*------------------------------------------------------------------------------
2	-- This file is a part of the SocExplorer Software	2	-- This file is a part of the SocExplorer Software
3	-- Copyright (C) 2014, Plasma Physics Laboratory - CNRS	3	-- Copyright (C) 2014, Plasma Physics Laboratory - CNRS
4	--	4	--
5	-- This program is free software; you can redistribute it and/or modify	5	-- This program is free software; you can redistribute it and/or modify
6	-- it under the terms of the GNU General Public License as published by	6	-- it under the terms of the GNU General Public License as published by
7	-- the Free Software Foundation; either version 3 of the License, or	7	-- the Free Software Foundation; either version 3 of the License, or
8	-- (at your option) any later version.	8	-- (at your option) any later version.
9	--	9	--
10	-- This program is distributed in the hope that it will be useful,	10	-- This program is distributed in the hope that it will be useful,
11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of	11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	-- GNU General Public License for more details.	13	-- GNU General Public License for more details.
14	--	14	--
15	-- You should have received a copy of the GNU General Public License	15	-- You should have received a copy of the GNU General Public License
16	-- along with this program; if not, write to the Free Software	16	-- along with this program; if not, write to the Free Software
17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18	-------------------------------------------------------------------------------*/	18	-------------------------------------------------------------------------------*/
19	/*-- Author : Alexis Jeandet	19	/*-- Author : Alexis Jeandet
20	-- Mail : alexis.jeandet@member.fsf.org	20	-- Mail : alexis.jeandet@member.fsf.org
21	----------------------------------------------------------------------------*/	21	----------------------------------------------------------------------------*/
22	#include "gr_esb_bridge.h"	22	#include "gr_esb_bridge.h"
23	#include "gr_esb_ui.h"	23	#include "gr_esb_ui.h"
24	#include <unistd.h>	24	#include <unistd.h>
25	#include "spw.h"	25	#include "spw.h"
26	#include <socexplorerengine.h>	26	#include <socexplorerengine.h>
27		27
28	GR_ESB_bridge::GR_ESB_bridge(socexplorerplugin *parent) :	28	GR_ESB_bridge::GR_ESB_bridge(socexplorerplugin *parent) :
29	abstractSpwBridge(parent)	29	abstractSpwBridge(parent)
30	{	30	{
31	this->p_GUI = new GR_ESB_ui();	31	this->p_GUI = new GR_ESB_ui();
32	this->manager = new GR_ESB_Manager(parent,this);	32	this->manager = new GR_ESB_Manager(parent,this);
33		33
34	connect((GR_ESB_ui*)(this->p_GUI),SIGNAL(ipchanged(QString)),this,SLOT(setIP(QString)));	34	connect((GR_ESB_ui*)(this->p_GUI),SIGNAL(ipchanged(QString)),this,SLOT(setIP(QString)));
35	connect((GR_ESB_ui*)(this->p_GUI),SIGNAL(vlinkchanged(QString)),this,SLOT(setVirtualLink(QString)));	35	connect((GR_ESB_ui*)(this->p_GUI),SIGNAL(vlinkchanged(QString)),this,SLOT(setVirtualLink(QString)));
36	connect((GR_ESB_ui*)(this->p_GUI),SIGNAL(connectClicked()),this,SLOT(toggleBridgeConnection()));	36	connect((GR_ESB_ui*)(this->p_GUI),SIGNAL(connectClicked()),this,SLOT(toggleBridgeConnection()));
37	this->manager->virtualLinkIndex = 0;	37	this->manager->virtualLinkIndex = 0;
38	this->manager->start();	38	this->manager->start();
39	}	39	}
40		40
41	GR_ESB_bridge::~GR_ESB_bridge()	41	GR_ESB_bridge::~GR_ESB_bridge()
42	{	42	{
43	this->manager->requestInterruption();	43	this->manager->requestInterruption();
44	while(this->manager->isRunning());	44	while(this->manager->isRunning());
45	}	45	}
46		46
47	void GR_ESB_bridge::toggleBridgeConnection()	47	void GR_ESB_bridge::toggleBridgeConnection()
48	{	48	{
49	if(this->plugin->isConnected())	49	if(this->plugin->isConnected())
50	{	50	{
51	this->disconnectBridge();	51	this->disconnectBridge();
52	}	52	}
53	else	53	else
54	{	54	{
55	this->connectBridge();	55	this->connectBridge();
56	}	56	}
57	}	57	}
58		58
59	bool GR_ESB_bridge::connectBridge()	59	bool GR_ESB_bridge::connectBridge()
60	{	60	{
61	if(this->manager->connectBridge())	61	if(this->manager->connectBridge())
62	{	62	{
63	((GR_ESB_ui*)this->p_GUI)->lock(true);	63	((GR_ESB_ui*)this->p_GUI)->lock(true);
64	emit setConnected(true);	64	emit setConnected(true);
65	return true;	65	return true;
66	}	66	}
67	return false;	67	return false;
68	}	68	}
69		69
70	bool GR_ESB_bridge::disconnectBridge()	70	bool GR_ESB_bridge::disconnectBridge()
71	{	71	{
72	if(this->manager->disconnectBridge())	72	if(this->manager->disconnectBridge())
73	{	73	{
74	((GR_ESB_ui*)this->p_GUI)->lock(false);	74	((GR_ESB_ui*)this->p_GUI)->lock(false);
75	emit setConnected(false);	75	emit setConnected(false);
76	return true;	76	return true;
77	}	77	}
78	return false;	78	return false;
79	}	79	}
80		80
81	void GR_ESB_bridge::setIP(QString ip)	81	void GR_ESB_bridge::setIP(QString ip)
82	{	82	{
83	this->manager->IP = ip;	83	this->manager->IP = ip;
84	}	84	}
85		85
86	void GR_ESB_bridge::setVirtualLink(QString vlink)	86	void GR_ESB_bridge::setVirtualLink(QString vlink)
87	{	87	{
88	vlink = vlink.section(~~"Virtual link"~~,0,0);	88	//vlink = vlink.section(,0,0);
		89	vlink.remove("Virtual link");
89	bool success;	90	bool success;
90	int vlinkTmp = vlink.toInt(&success);	91	int vlinkTmp = vlink.toInt(&success);
91	if(success)	92	if(success)
92	{	93	{
93	setVirtualLink(vlinkTmp);	94	setVirtualLink(vlinkTmp);
94	}	95	}
95	}	96	}
96		97
97	void GR_ESB_bridge::setVirtualLink(qint32 vlink)	98	void GR_ESB_bridge::setVirtualLink(qint32 vlink)
98	{	99	{
99	if(vlink<6 && vlink>=0)	100	if(vlink<6 && vlink>=0)
100	{	101	{
101	this->manager->virtualLinkIndex = vlink;	102	this->manager->virtualLinkIndex = vlink;
102	}	103	}
103	}	104	}
104		105
105		106
106	unsigned int GR_ESB_bridge::Write(unsigned int *Value, unsigned int count, unsigned int address)	107	unsigned int GR_ESB_bridge::Write(unsigned int *Value, unsigned int count, unsigned int address)
107	{	108	{
108	// TODO write ME!	109	char writeBuffer[RMAP_WRITE_PACKET_MIN_SZ((RMAP_MAX_XFER_SIZE*4))];
109	Q_UNUSED(count)	110	char *RMAPAckBuff;
110	Q_UNUSED(Value)	111	int transactionID = 0;
111	Q_UNUSED(address)	112	int written=0;
112	return 0;	113	SocExplorerEngine::message(this->plugin,"Enter Write function",2);
		114	QProgressBar* progress=NULL;
		115	SocExplorerAutoProgressBar autopb;
		116	if(count>RMAP_MAX_XFER_SIZE)
		117	{
		118	progress= SocExplorerEngine::getProgressBar("Writing on SPW @0x"+QString::number(address,16)+" %v of "+QString::number(count)+" words ",count);
		119	autopb.setProgressBar(progress);
		120	}
		121	//Quite stupide loop, I guess that I always get the number of byte I asked for!
		122	while(count>=RMAP_MAX_XFER_SIZE)
		123	{
		124	for(int i=0;i<(RMAP_MAX_XFER_SIZE);i++)
		125	{
		126	writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+0] = (char)(((unsigned int)Value[i+written]>>24)&0xFF);
		127	writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+1] = (char)(((unsigned int)Value[i+written]>>16)&0xFF);
		128	writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+2] = (char)(((unsigned int)Value[i+written]>>8)&0xFF);
		129	writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+3] = (char)(((unsigned int)Value[i+written])&0xFF);
		130	}
		131	transactionID=manager->getRMAPtransactionID();
		132	SocExplorerEngine::message(this->plugin,QString("Sending Write request with ID=%1").arg(transactionID),2);
		133	RMAP_build_tx_request_header(
		134	this->manager->destinationLogicalAddress,
		135	this->manager->destinationKey,
		136	this->manager->sourceLogicalAddress,
		137	transactionID,
		138	address+(written*4),
		139	RMAP_MAX_XFER_SIZE*4,
		140	writeBuffer);
		141	manager->sendPacket(writeBuffer,RMAP_WRITE_PACKET_MIN_SZ(RMAP_MAX_XFER_SIZE*4));
		142	manager->getRMAPanswer(transactionID,&RMAPAckBuff);
		143	free(RMAPAckBuff);
		144	written+=RMAP_MAX_XFER_SIZE;
		145	count-=RMAP_MAX_XFER_SIZE;
		146	progress->setValue(written);
		147	qApp->processEvents();
		148	}
		149	if(count>0)
		150	{
		151	for(int i=0;i<((int)count);i++)
		152	{
		153	writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+0] = (char)(((unsigned int)Value[i+written]>>24)&0xFF);
		154	writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+1] = (char)(((unsigned int)Value[i+written]>>16)&0xFF);
		155	writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+2] = (char)(((unsigned int)Value[i+written]>>8)&0xFF);
		156	writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+3] = (char)(((unsigned int)Value[i+written])&0xFF);
		157	}
		158	transactionID=manager->getRMAPtransactionID();
		159	SocExplorerEngine::message(this->plugin,QString("Sending Write request with ID=%1").arg(transactionID),2);
		160	RMAP_build_tx_request_header(
		161	this->manager->destinationLogicalAddress,
		162	this->manager->destinationKey,
		163	this->manager->sourceLogicalAddress,
		164	transactionID,
		165	address+(written*4),
		166	count*4,
		167	writeBuffer);
		168	manager->sendPacket(writeBuffer,RMAP_WRITE_PACKET_MIN_SZ(count*4));
		169	manager->getRMAPanswer(transactionID,&RMAPAckBuff);
		170	free(RMAPAckBuff);
		171	written+=count;
		172	if(progress!=NULL)
		173	{
		174	progress->setValue(written);
		175	qApp->processEvents();
		176	}
		177	}
		178	return written;
113	}	179	}
114		180
115	unsigned int GR_ESB_bridge::Read(unsigned int *Value, unsigned int count, unsigned int address)	181	unsigned int GR_ESB_bridge::Read(unsigned int *Value, unsigned int count, unsigned int address)
116	{	182	{
117	// TODO write ME!	183	char requestBuffer[RMAP_READ_HEADER_MIN_SZ];
118	Q_UNUSED(Value)	184	char* RMAP_AnswerBuffer;
119	Q_UNUSED(count)	185	requestBuffer[0]=this->manager->linkNumber;//Link number
120	Q_UNUSED(address)	186	int transactionID = 0;
		187	int read=0;
		188	QProgressBar* progress=NULL;
		189	SocExplorerAutoProgressBar autopb;
		190	if(count>RMAP_MAX_XFER_SIZE)
		191	{
		192	progress= SocExplorerEngine::getProgressBar("Reading on SPW @0x"+QString::number(address,16)+" %v of "+QString::number(count)+" words ",count);
		193	autopb.setProgressBar(progress);
		194	}
		195	SocExplorerEngine::message(this->plugin,QString("Enter read function, count=%1, RMAP_MAX_XFER_SIZE=%2").arg(count).arg(RMAP_MAX_XFER_SIZE),2);
		196
		197	//Quite stupide loop, I guess that I always get the number of byte I asked for!
		198	while((int)count>=(int)RMAP_MAX_XFER_SIZE)
		199	{
		200	transactionID = manager->getRMAPtransactionID();
		201	SocExplorerEngine::message(this->plugin,QString("New transactionID:%1").arg(transactionID),2);
		202	RMAP_build_rx_request_header(
		203	this->manager->destinationLogicalAddress,
		204	this->manager->destinationKey,
		205	this->manager->sourceLogicalAddress,
		206	transactionID,
		207	address+(read*4),
		208	RMAP_MAX_XFER_SIZE*4,
		209	requestBuffer);
		210	manager->sendPacket(requestBuffer,RMAP_READ_HEADER_MIN_SZ);
		211	int len=manager->getRMAPanswer(transactionID,&RMAP_AnswerBuffer);
		212	if(len==-1)
		213	{
		214	this->toggleBridgeConnection();
121	return 0;	215	return 0;
122	}	216	}
		217	for(int i=0;i<((len-13)/4);i++)
		218	{
		219	Value[read+i] = 0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+12]);
		220	Value[read+i] = (Value[read+i]<<8) + (0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+13]));
		221	Value[read+i] = (Value[read+i]<<8) + (0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+14]));
		222	Value[read+i] = (Value[read+i]<<8) + (0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+15]));
		223	}
		224	free(RMAP_AnswerBuffer);
		225	read+=RMAP_MAX_XFER_SIZE;
		226	count-=RMAP_MAX_XFER_SIZE;
		227	if(progress!=NULL)
		228	{
		229	progress->setValue(read);
		230	qApp->processEvents();
		231	}
		232	}
		233	if((int)count>0)
		234	{
		235	transactionID = manager->getRMAPtransactionID();
		236	SocExplorerEngine::message(this->plugin,QString("New transactionID: %1").arg(transactionID),2);
		237	SocExplorerEngine::message(this->plugin,QString("Building request with:"),2);
		238	SocExplorerEngine::message(this->plugin,QString("Address = %1").arg(address+(read*4),8,16),2);
		239	SocExplorerEngine::message(this->plugin,QString("Size = %1").arg(count*4),2);
		240	SocExplorerEngine::message(this->plugin,QString("Size + 13 = %1").arg((count*4)+13),2);
		241	RMAP_build_rx_request_header(
		242	this->manager->destinationLogicalAddress,
		243	this->manager->destinationKey,
		244	this->manager->sourceLogicalAddress,
		245	transactionID,
		246	address+(read*4),
		247	count*4,
		248	requestBuffer);
		249	manager->sendPacket(requestBuffer,RMAP_READ_HEADER_MIN_SZ);
		250	int len=manager->getRMAPanswer(transactionID,&RMAP_AnswerBuffer);
		251	if(len==-1)
		252	{
		253	this->toggleBridgeConnection();
		254	return 0;
		255	}
		256	for(int i=0;i<((len-13)/4);i++)
		257	{
		258	Value[read+i] = 0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+12]);
		259	Value[read+i] = (Value[read+i]<<8) + (0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+13]));
		260	Value[read+i] = (Value[read+i]<<8) + (0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+14]));
		261	Value[read+i] = (Value[read+i]<<8) + (0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+15]));
		262	}
		263	free(RMAP_AnswerBuffer);
		264	read+=count;
		265	if(progress!=NULL)
		266	{
		267	progress->setValue(read);
		268	qApp->processEvents();
		269	}
		270	}
		271	return read;
		272	}
123		273
124	int GR_ESB_bridge::pushRMAPPacket(char *packet, int size)	274	int GR_ESB_bridge::pushRMAPPacket(char *packet, int size)
125	{	275	{
126	return this->manager->sendPacket(packet,size);	276	return this->manager->sendPacket(packet,size);
127	}	277	}
128		278
129		279
130	GR_ESB_Manager::GR_ESB_Manager(socexplorerplugin plugin, QObject parent)	280	GR_ESB_Manager::GR_ESB_Manager(socexplorerplugin plugin, QObject parent)
131	:QThread((QObject*)parent)	281	:abstractSpwManager(plugin, parent)
132	{	282	{
133	this->Read_soc = new QTcpSocket(this);	283	this->sourceLogicalAddress=32;
134	this->Write_soc = new QTcpSocket(this);	284	this->destinationLogicalAddress=254;
135	this->RMAPtimeout = 2000;	285	this->destinationKey=2;
136	this->handleMutex = new QMutex(QMutex::NonRecursive);	286	connect(&(this->Read_soc),SIGNAL(readyRead()),this,SLOT(readyRead()));
137	this->RMAP_AnswersSem = new QSemaphore(0);
138	this->RMAP_AnswersMtx=new QMutex(QMutex::Recursive);
139	this->RMAP_pending_transaction_IDsMtx=new QMutex(QMutex::Recursive);
140	this->plugin = plugin;
141	connected = false;
142	this->moveToThread(this);
143	}	287	}
144		288
145	GR_ESB_Manager::~GR_ESB_Manager()	289	GR_ESB_Manager::~GR_ESB_Manager()
146	{	290	{
		291	}
147		292
		293	void GR_ESB_Manager::__processPacket(packetBuffer_t *packet)
		294	{
		295	if(packet->complete)
		296	{
		297	if(packet->buffer[1]==(char)SPW_PROTO_ID_RMAP) //RMAP packet
		298	{
		299	RMAP_Answer* RMapPacket;
		300	SocExplorerEngine::message(this->plugin,"Got RMAP packet",2);
		301	SocExplorerEngine::message(this->plugin,QString("Rmap packet size %1").arg(packet->PacketLen),2);
		302	char* packetbuffer = (char*)malloc(packet->PacketLen);
		303	if(packetbuffer)
		304	{
		305	memcpy(packetbuffer,packet->buffer,packet->PacketLen);
		306	this->handleMutex->unlock();
		307	if(packet->PacketLen==8)
		308	{
		309	RMapPacket=new RMAP_Answer(RMAP_get_transactionID(packetbuffer),packetbuffer,packet->PacketLen);
		310	}
		311	else
		312	{
		313	RMapPacket=new RMAP_Answer(RMAP_get_transactionID(packetbuffer),packetbuffer,packet->PacketLen);
		314	}
		315	RMAP_AnswersMtx->lock();
		316	RMAP_Answers.append(RMapPacket);
		317	RMAP_AnswersMtx->unlock();
		318	RMAP_AnswersSem->release();
		319	}
		320	}
		321	else //any non-rmap packet will be pushed to the network
		322	{
		323	char* packetbuffer = (char*)malloc(packet->PacketLen);
		324	if(packetbuffer)
		325	{
		326	memcpy(packetbuffer,packet->buffer,packet->PacketLen);
		327	emit emitPacket(packetbuffer,packet->PacketLen);
		328	SocExplorerEngine::message(this->plugin,"Got SPW packet",2);
		329	}
		330	}
		331	}
		332
		333	}
		334
		335	QByteArray GR_ESB_Manager::__processData(const QByteArray &data, packetBuffer_t *buffer)
		336	{
		337	if(buffer->complete)
		338	{
		339	if(Q_UNLIKELY(data.size()<=4))
		340	return data;
		341	buffer->PacketLen= ((int)data.at(3)& 0x0FF) + (((int)data.at(2)& 0x0FF)<<8) + (((int)data.at(1)& 0x0FF)<<16);
		342	if(buffer->PacketLen>(data.size()-4))
		343	{
		344	memcpy(buffer->buffer,data.data()+4,data.size()-4);
		345	buffer->complete=false;
		346	buffer->index=data.size()-4;
		347	}
		348	else
		349	{
		350	memcpy(buffer->buffer,data.data()+4,data.size()-4);
		351	buffer->PacketLen = data.size()-4;
		352	buffer->index=data.size()-4;
		353	buffer->complete=true;
		354	__processPacket(buffer);
		355	int len = buffer->PacketLen;
		356	buffer->PacketLen = 0;
		357	buffer->index=0;
		358	if((data.size()-4-len))
		359	{
		360	return __processData(data.right((data.size()-4-len)),buffer);
		361	}
		362	}
		363
		364	}
		365	else
		366	{
		367	if(buffer->PacketLen>(data.size()+buffer->index))
		368	{
		369	memcpy(buffer->buffer+buffer->index,data.data(),data.size());
		370	buffer->complete=false;
		371	buffer->index+=data.size();
		372	}
		373	else
		374	{
		375	memcpy(buffer->buffer+buffer->index,data.data(),buffer->PacketLen-buffer->index);
		376	buffer->complete=true;
		377	buffer->index+=data.size();
		378	__processPacket(buffer);
		379	int len = buffer->PacketLen;
		380	buffer->PacketLen = 0;
		381	buffer->index=0;
		382	if((data.size()-len))
		383	{
		384	return __processData(data.right((data.size()-len)),buffer);
		385	}
		386	}
		387	}
		388	return QByteArray();
148	}	389	}
149		390
150	void GR_ESB_Manager::run()	391	void GR_ESB_Manager::run()
151	{	392	{
		393	char bufferData[(RMAP_MAX_XFER_SIZE*4)+50];
		394	packetBuffer_t buffer={bufferData,0,0,true};
152	SocExplorerEngine::message(this->plugin,"Starting GRESB pooling thread",1);	395	SocExplorerEngine::message(this->plugin,"Starting GRESB pooling thread",1);
		396	QByteArray data;
153	while (!this->isInterruptionRequested())	397	while (!this->isInterruptionRequested())
154	{	398	{
155	if(this->connected)	399	if(this->connected)
156	{	400	{
157	handleMutex->lock();	401	SocExplorerEngine::message(this->plugin,"Looking for new RMAP packets",8);
158	SocExplorerEngine::message(this->plugin,"Looking for new RMAP packets",4);	402	if(!incomingPackets.isEmpty())
		403	{
		404	incomingPacketsMutex.lock();
		405	data.append(incomingPackets.dequeue());
		406	this->incomingPacketsMutex.unlock();
		407	data = __processData(data,&buffer);
		408	}
159		409
160	}	410	}
161	else	411	else
162	{	412	{
163	//do some sanity checks!	413	//do some sanity checks!
164
165	usleep(RMAPtimeout/2);	414	usleep(RMAPtimeout/2);
166	}	415	}
167	usleep(1000);	416	usleep(1000);
168	}	417	}
169	SocExplorerEngine::message(this->plugin,"Exiting Startdundee USB pooling thread",1);	418	SocExplorerEngine::message(this->plugin,"Exiting Startdundee USB pooling thread",1);
170	}	419	}
171		420
172	bool GR_ESB_Manager::connectBridge()	421	bool GR_ESB_Manager::connectBridge()
173	{	422	{
174	int timeout=60;	423	int timeout=60;
175	if(this->Read_soc->state()==QTcpSocket::UnconnectedState)	424	this->connected = false;
		425	if(this->Read_soc.state()==QTcpSocket::UnconnectedState)
176	{	426	{
177	this->Read_soc->connectToHost(IP,gresb_Conf[virtualLinkIndex].Read_port);	427	this->Read_soc.connectToHost(IP,gresb_Conf[virtualLinkIndex].Receive_port);
178	this->Read_soc->waitForConnected(30000);	428	this->Read_soc.waitForConnected(30000);
179	}	429	}
180	if(this->Write_soc->state()==QTcpSocket::UnconnectedState)	430	if(this->Write_soc.state()==QTcpSocket::UnconnectedState)
181	{	431	{
182	this->Write_soc->connectToHost(IP,gresb_Conf[virtualLinkIndex].~~Write~~_port);	432	this->Write_soc.connectToHost(IP,gresb_Conf[virtualLinkIndex].Transmit_port);
183	this->Write_soc->waitForConnected(30000);	433	this->Write_soc.waitForConnected(30000);
184	}	434	}
185	while((this->Read_soc->state()!=QTcpSocket::ConnectedState) && (this->Write_soc->state()!=QTcpSocket::ConnectedState))	435	while((this->Read_soc.state()!=QTcpSocket::ConnectedState) && (this->Write_soc.state()!=QTcpSocket::ConnectedState))
186	{	436	{
187	usleep(100000);	437	usleep(100000);
188	if(timeout--==0)return false;	438	if(timeout--==0)return false;
189	}	439	}
		440	this->connected = true;
190	return true;	441	return true;
191		442
192	}	443	}
193		444
194	bool GR_ESB_Manager::disconnectBridge()	445	bool GR_ESB_Manager::disconnectBridge()
195	{	446	{
196	int timeout=60;	447	int timeout=60;
197	if(this->Read_soc->state()!=QTcpSocket::UnconnectedState)	448	if(this->Read_soc.state()!=QTcpSocket::UnconnectedState)
198	{	449	{
199	this->Read_soc->disconnectFromHost();	450	this->Read_soc.disconnectFromHost();
200	this->Read_soc->waitForDisconnected(30000);	451	this->Read_soc.waitForDisconnected(30000);
201	}	452	}
202	if(this->Write_soc->state()!=QTcpSocket::UnconnectedState)	453	if(this->Write_soc.state()!=QTcpSocket::UnconnectedState)
203	{	454	{
204	this->Write_soc->disconnectFromHost();	455	this->Write_soc.disconnectFromHost();
205	this->Write_soc->waitForDisconnected(30000);	456	this->Write_soc.waitForDisconnected(30000);
206	}	457	}
207	while((this->Read_soc->state()!=QTcpSocket::UnconnectedState) && (this->Write_soc->state()!=QTcpSocket::UnconnectedState))	458	while((this->Read_soc.state()!=QTcpSocket::UnconnectedState) && (this->Write_soc.state()!=QTcpSocket::UnconnectedState))
208	{	459	{
209	usleep(100000);	460	usleep(100000);
210	if(timeout--==0)return false;	461	if(timeout--==0)return false;
211	}	462	}
212	return true;	463	return true;
213	}	464	}
214		465
215	int GR_ESB_Manager::getRMAPtransactionID()
216	{
217	// TODO write ME!
218	return -1;
219	}
220
221	int GR_ESB_Manager::getRMAPanswer(int transactionID, char **buffer)
222	{
223	// TODO write ME!
224	Q_UNUSED(transactionID)
225	Q_UNUSED(buffer)
226	return -1;
227	}
228		466
229	bool GR_ESB_Manager::sendPacket(char *packet, int size)	467	bool GR_ESB_Manager::sendPacket(char *packet, int size)
230	{	468	{
231	// TODO write ME!	469	bool result = false;
232	Q_UNUSED(packet)	470	char protocoleIdentifier;
233	Q_UNUSED(size)	471	SocExplorerEngine::message(this->plugin,"Sending SPW packet",2);
		472	if(Q_UNLIKELY(this->Write_soc.state()!=QAbstractSocket::ConnectedState))
		473	{
		474	SocExplorerEngine::message(this->plugin,"Socket closed",2);
		475	//TODO handle disconnection
		476	}
		477	char* SPWpacket = (char*)malloc(size+4);
		478	if(SPWpacket!=NULL)
		479	{
		480	SPWpacket[0]=0; //Protocol = spw
		481	memcpy(SPWpacket+4,packet,size);
		482	SPWpacket[1]=(size>>16) & 0x0FF;
		483	SPWpacket[2]=(size>>8) & 0x0FF;
		484	SPWpacket[3]=size & 0x0FF;
		485	this->handleMutex->lock();
		486	result = ((size+4) == this->Write_soc.write(SPWpacket,size+4));
		487	this->Write_soc.flush();
		488	this->handleMutex->unlock();
		489	free(SPWpacket);
		490	}
		491	if (Q_UNLIKELY(!result))
		492	{
		493	SocExplorerEngine::message(this->plugin,"ERR sending the READ command ",2);
234	return false;	494	return false;
235	}	495	}
		496	else
		497	{
		498	emit bytesTransmittedToSpw( size-1 ); // -1 is for removing the first bytes added to the packet to route to the right link
		499	// read the protocole identifier
		500	protocoleIdentifier = packet[2];
		501	if (protocoleIdentifier == SPW_PROTO_ID_CCSDS)
		502	emit ccsdsPacketTransmittedToSpw();
		503	SocExplorerEngine::message(this->plugin,"Packet sent",2);
		504	}
		505	return true;
		506	}
236		507
237	void GR_ESB_Manager::pushRmapPacket(char *packet, int len)	508	void GR_ESB_Manager::readyRead()
238	{	509	{
239	// TODO write ME!	510	incomingPacketsMutex.lock();
240	Q_UNUSED(packet)	511	incomingPackets.append(Read_soc.readAll());
241	Q_UNUSED(len)	512	incomingPacketsMutex.unlock();
242	}	513	}
		514

spwplugin/GR-ESB/gr_esb_bridge.h +22 -14

             #ifndef GR_ESB_BRIDGE_H
             #define GR_ESB_BRIDGE_H
             #include "abstractspwbridge.h"
             #include <QTcpSocket>
             #include <QThread>
             #include <QMutex>
             #include <QSemaphore>
+            #include <QQueue>
             struct gresb_Conf_str
             {
-                qint32 Read_port;
+                qint32 Transmit_port;
-                qint32 Write_port;
+                qint32 Receive_port;
             };
             const struct gresb_Conf_str gresb_Conf[]=
             {
             {3000,3001},  //Virtual link 0
             {3002,3003},  //Virtual link 1
             {3004,3005},  //Virtual link 2
             {3006,3007},  //Virtual link 3
             {3008,3009},  //Virtual link 4
             {3010,3011}   //Virtual link 5
             };
-            class GR_ESB_Manager: public QThread
+            class GR_ESB_Manager: public abstractSpwManager
             {
                 Q_OBJECT
+                typedef struct packetBuffer_t
+                {
+                    char* buffer;
+                    int PacketLen;
+                    int index;
+                    bool complete;
+                }packetBuffer_t;
             public:
                 explicit GR_ESB_Manager(socexplorerplugin *plugin = 0,QObject* parent=0);
                 ~GR_ESB_Manager();
                 void run();
                 bool connectBridge();
                 bool disconnectBridge();
-                int getRMAPtransactionID();
-                int getRMAPanswer(int transactionID,char** buffer);
                 bool sendPacket(char* packet,int size);
             signals:
                 void emitPacket(char* packet,int size);
             private:
-                QMutex* handleMutex,*RMAP_AnswersMtx,*RMAP_pending_transaction_IDsMtx;
-                QSemaphore* RMAP_AnswersSem;
                 void pushRmapPacket(char* packet,int len);
-                socexplorerplugin* plugin;
-                bool connected;
                 char* SPWPacketBuff;
-                QList<RMAP_Answer*> RMAP_Answers;
-                QList<int> RMAP_pending_transaction_IDs;
+                void __processPacket(packetBuffer_t *packet);
+                QByteArray __processData(const QByteArray &data, packetBuffer_t* buffer);
+            private slots:
+                void readyRead();
             public:
-                QTcpSocket* Read_soc;
+                QTcpSocket Read_soc;
-                QTcpSocket* Write_soc;
+                QTcpSocket Write_soc;
+                QMutex incomingPacketsMutex;
+                QQueue<QByteArray> incomingPackets;
                 QString IP;
                 int virtualLinkIndex;
-                int RMAPtimeout;
             };
             class GR_ESB_bridge : public abstractSpwBridge
             {
                 Q_OBJECT
             public:
                 explicit GR_ESB_bridge(socexplorerplugin *parent = 0);
                 ~GR_ESB_bridge();
             signals:
             public slots:
                 void toggleBridgeConnection();
                 bool connectBridge();
                 bool disconnectBridge();
                 void setIP(QString ip);
                 void setVirtualLink(QString vlink);
                 void setVirtualLink(qint32 vlink);
                 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);
                 int pushRMAPPacket(char* packet,int size);
                 void packetReceived();
             private:
                 GR_ESB_Manager* manager;
             };
             #endif // GR_ESB_BRIDGE_H

spwplugin/GR-ESB/gr_esb_ui.ui +200 -24

@@ -1,146 +1,322
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<ui version="4.0">	2	<ui version="4.0">
3	<class>GR_ESB_ui</class>	3	<class>GR_ESB_ui</class>
4	<widget class="QWidget" name="GR_ESB_ui">	4	<widget class="QWidget" name="GR_ESB_ui">
5	<property name="geometry">	5	<property name="geometry">
6	<rect>	6	<rect>
7	<x>0</x>	7	<x>0</x>
8	<y>0</y>	8	<y>0</y>
9	<width>968</width>	9	<width>978</width>
10	<height>~~392~~</height>	10	<height>518</height>
11	</rect>	11	</rect>
12	</property>	12	</property>
13	<property name="windowTitle">	13	<property name="windowTitle">
14	<string>Form</string>	14	<string>Form</string>
15	</property>	15	</property>
16	<layout class="QVBoxLayout" name="verticalLayout">	16	<layout class="QVBoxLayout" name="verticalLayout">
17	<item>	17	<item>
18	<widget class="QTabWidget" name="tabWidget">	18	<widget class="QTabWidget" name="tabWidget">
19	<property name="toolTip">	19	<property name="toolTip">
20	<string/>	20	<string/>
21	</property>	21	</property>
22	<property name="currentIndex">	22	<property name="currentIndex">
23	<number>0</number>	23	<number>0</number>
24	</property>	24	</property>
25	<widget class="QWidget" name="Config">	25	<widget class="QWidget" name="Config">
26	<property name="toolTip">	26	<property name="toolTip">
27	<string><html><head/><body><p>The Config tab allows you to configure the Ethernet conncetion to the GR-ESB and some spacewire parameters.</p></body></html></string>	27	<string><html><head/><body><p>The Config tab allows you to configure the Ethernet conncetion to the GR-ESB and some spacewire parameters.</p></body></html></string>
28	</property>	28	</property>
29	<attribute name="title">	29	<attribute name="title">
30	<string>Config</string>	30	<string>Config</string>
31	</attribute>	31	</attribute>
32	<layout class="QGridLayout" name="gridLayout_2">	32	<layout class="QGridLayout" name="gridLayout_2">
		33	<item row="4" column="2">
		34	<widget class="QLineEdit" name="destinationAddressLineEdit">
		35	<property name="toolTip">
		36	<string><html><head/><body><p>Set the RMAP target address, this address will be used as destination address for all the RMAP transfers.</p><p>This is you SOC spw address.</p></body></html></string>
		37	</property>
		38	<property name="inputMask">
		39	<string comment="ddD"/>
		40	</property>
		41	<property name="text">
		42	<string>254</string>
		43	</property>
		44	<property name="maxLength">
		45	<number>3</number>
		46	</property>
		47	</widget>
		48	</item>
		49	<item row="11" column="0" colspan="3">
		50	<widget class="QWidget" name="widget" native="true">
		51	<layout class="QGridLayout" name="gridLayout">
		52	<item row="0" column="2">
		53	<widget class="QLabel" name="label_7">
		54	<property name="font">
		55	<font>
		56	<weight>75</weight>
		57	<bold>true</bold>
		58	</font>
		59	</property>
		60	<property name="text">
		61	<string>Transmitted</string>
		62	</property>
		63	</widget>
		64	</item>
33	<item row="1" column="1">	65	<item row="1" column="1">
		66	<widget class="QLabel" name="ReceivedPackets">
		67	<property name="text">
		68	<string>-</string>
		69	</property>
		70	</widget>
		71	</item>
		72	<item row="2" column="2">
		73	<widget class="QLabel" name="TransmittedBytes">
		74	<property name="text">
		75	<string>-</string>
		76	</property>
		77	</widget>
		78	</item>
		79	<item row="2" column="0">
		80	<widget class="QLabel" name="label_5">
		81	<property name="text">
		82	<string>Bytes</string>
		83	</property>
		84	</widget>
		85	</item>
		86	<item row="2" column="1">
		87	<widget class="QLabel" name="ReceivedBytes">
		88	<property name="text">
		89	<string>-</string>
		90	</property>
		91	</widget>
		92	</item>
		93	<item row="1" column="2">
		94	<widget class="QLabel" name="TransmittedPackets">
		95	<property name="text">
		96	<string>-</string>
		97	</property>
		98	</widget>
		99	</item>
		100	<item row="0" column="1">
		101	<widget class="QLabel" name="label_3">
		102	<property name="font">
		103	<font>
		104	<weight>75</weight>
		105	<bold>true</bold>
		106	</font>
		107	</property>
		108	<property name="text">
		109	<string>Received</string>
		110	</property>
		111	</widget>
		112	</item>
		113	<item row="1" column="0">
		114	<widget class="QLabel" name="label_4">
		115	<property name="text">
		116	<string>Packets</string>
		117	</property>
		118	</widget>
		119	</item>
		120	<item row="0" column="0">
		121	<widget class="QPushButton" name="resetStatsQpb">
		122	<property name="text">
		123	<string>Reset stats</string>
		124	</property>
		125	</widget>
		126	</item>
		127	</layout>
		128	</widget>
		129	</item>
		130	<item row="3" column="2">
		131	<widget class="QLineEdit" name="sourceAddressLineEdit">
		132	<property name="toolTip">
		133	<string><html><head/><body><p>Set the Space Wire Brick destination Key, the default value is 32 (0x20).</p></body></html></string>
		134	</property>
		135	<property name="inputMask">
		136	<string comment="ddD"/>
		137	</property>
		138	<property name="text">
		139	<string>32</string>
		140	</property>
		141	<property name="maxLength">
		142	<number>3</number>
		143	</property>
		144	</widget>
		145	</item>
		146	<item row="8" column="2">
		147	<widget class="QLineEdit" name="RMAPTimeoutLineEdit">
		148	<property name="toolTip">
		149	<string><html><head/><body><p>Set the RMAP timeout, when waiting for a RMAP answer the driver will give up after this time if it doesn't get any answer.</p></body></html></string>
		150	</property>
		151	<property name="inputMethodHints">
		152	<set>Qt::ImhDigitsOnly</set>
		153	</property>
		154	<property name="inputMask">
		155	<string comment="DDdd;"/>
		156	</property>
		157	<property name="text">
		158	<string>500</string>
		159	</property>
		160	<property name="maxLength">
		161	<number>5</number>
		162	</property>
		163	</widget>
		164	</item>
		165	<item row="2" column="2">
		166	<widget class="QComboBox" name="GRESB_LinkNum_CmBx">
		167	<item>
		168	<property name="text">
		169	<string>SPW0</string>
		170	</property>
		171	</item>
		172	<item>
		173	<property name="text">
		174	<string>SPW1</string>
		175	</property>
		176	</item>
		177	<item>
		178	<property name="text">
		179	<string>SPW2</string>
		180	</property>
		181	</item>
		182	</widget>
		183	</item>
		184	<item row="4" column="0">
		185	<widget class="QLabel" name="RMAPaddressLbl">
		186	<property name="text">
		187	<string>Destination address</string>
		188	</property>
		189	</widget>
		190	</item>
		191	<item row="6" column="2">
		192	<widget class="QLineEdit" name="destinationKeyLineEdit">
		193	<property name="toolTip">
		194	<string><html><head/><body><p>Set the RMAP target key, this key will be used for all the RMAP transfers.</p><p>This is you SOC spw key.</p></body></html></string>
		195	</property>
		196	<property name="inputMask">
		197	<string comment="ddD"/>
		198	</property>
		199	<property name="text">
		200	<string comment="ddD">2</string>
		201	</property>
		202	<property name="maxLength">
		203	<number>3</number>
		204	</property>
		205	</widget>
		206	</item>
		207	<item row="1" column="0">
		208	<widget class="QLabel" name="GRESB_Vlink_Lbl">
		209	<property name="text">
		210	<string>GR-ESB Virtual link</string>
		211	</property>
		212	</widget>
		213	</item>
		214	<item row="1" column="2">
34	<widget class="QComboBox" name="GRESB_Vlink_CmBx">	215	<widget class="QComboBox" name="GRESB_Vlink_CmBx">
35	<item>	216	<item>
36	<property name="text">	217	<property name="text">
37	<string>Virtual link 0</string>	218	<string>Virtual link 0</string>
38	</property>	219	</property>
39	</item>	220	</item>
40	<item>	221	<item>
41	<property name="text">	222	<property name="text">
42	<string>Virtual link 1</string>	223	<string>Virtual link 1</string>
43	</property>	224	</property>
44	</item>	225	</item>
45	<item>	226	<item>
46	<property name="text">	227	<property name="text">
47	<string>Virtual link 2</string>	228	<string>Virtual link 2</string>
48	</property>	229	</property>
49	</item>	230	</item>
50	<item>	231	<item>
51	<property name="text">	232	<property name="text">
52	<string>Virtual link 3</string>	233	<string>Virtual link 3</string>
53	</property>	234	</property>
54	</item>	235	</item>
55	<item>	236	<item>
56	<property name="text">	237	<property name="text">
57	<string>Virtual link 4</string>	238	<string>Virtual link 4</string>
58	</property>	239	</property>
59	</item>	240	</item>
60	<item>	241	<item>
61	<property name="text">	242	<property name="text">
62	<string>Virtual link 5</string>	243	<string>Virtual link 5</string>
63	</property>	244	</property>
64	</item>	245	</item>
65	</widget>	246	</widget>
66	</item>	247	</item>
67	<item row="1" column="0">	248	<item row="3" column="0">
68	<widget class="QLabel" name="~~GRESB_Vlink_~~Lbl">	249	<widget class="QLabel" name="setDestKeyLbl">
69	<property name="text">	250	<property name="text">
70	<string>~~GR-ESB Virtual link~~</string>	251	<string>Source address</string>
71	</property>	252	</property>
72	</widget>	253	</widget>
73	</item>	254	</item>
74	<item row="~~2" column="1~~">	255	<item row="8" column="0">
75	<widget class="Q~~ComboBox" name="GRESB_LinkNum_CmBx~~">	256	<widget class="QLabel" name="RMAPTimeoutLbl">
76	<item>
77	<property name="text">
78	<string>SPW0</string>
79	</property>
80	</item>
81	<item>
82	<property name="text">	257	<property name="text">
83	<string>~~SPW1~~</string>	258	<string>RMAP timeout(ms)</string>
84	</property>	259	</property>
85	</item>
86	<item>
87	<property name="text">
88	<string>SPW2</string>
89	</property>
90	</item>
91	</widget>	260	</widget>
92	</item>	261	</item>
93	<item row="0" column="1">	262	<item row="0" column="2">
94	<widget class="QLineEdit" name="GRESB_IP_lineEdit"/>	263	<widget class="QLineEdit" name="GRESB_IP_lineEdit"/>
95	</item>	264	</item>
96	<item row="2" column="0">	265	<item row="2" column="0">
97	<widget class="QLabel" name="GRESB_LinkNum_Lbl">	266	<widget class="QLabel" name="GRESB_LinkNum_Lbl">
98	<property name="text">	267	<property name="text">
99	<string>Select link number</string>	268	<string>Select link number</string>
100	</property>	269	</property>
101	</widget>	270	</widget>
102	</item>	271	</item>
		272	<item row="6" column="0">
		273	<widget class="QLabel" name="RMAPKeyLbl">
		274	<property name="text">
		275	<string>Destination key</string>
		276	</property>
		277	</widget>
		278	</item>
103	<item row="0" column="0">	279	<item row="0" column="0">
104	<widget class="QLabel" name="GRESB_IP_Lbl">	280	<widget class="QLabel" name="GRESB_IP_Lbl">
105	<property name="text">	281	<property name="text">
106	<string>GR-ESB IP Address</string>	282	<string>GR-ESB IP Address</string>
107	</property>	283	</property>
108	</widget>	284	</widget>
109	</item>	285	</item>
110	<item row="3" column="0" colspan="2">	286	<item row="10" column="0" colspan="3">
111	<widget class="QPushButton" name="connectQpb">	287	<widget class="QPushButton" name="connectQpb">
112	<property name="text">	288	<property name="text">
113	<string>Connect</string>	289	<string>Connect</string>
114	</property>	290	</property>
115	</widget>	291	</widget>
116	</item>	292	</item>
117	</layout>	293	</layout>
118	</widget>	294	</widget>
119	<widget class="QWidget" name="Web">	295	<widget class="QWidget" name="Web">
120	<property name="toolTip">	296	<property name="toolTip">
121	<string><html><head/><body><p>The Web tab gives access to the GR-ESB web interface.</p></body></html></string>	297	<string><html><head/><body><p>The Web tab gives access to the GR-ESB web interface.</p></body></html></string>
122	</property>	298	</property>
123	<attribute name="title">	299	<attribute name="title">
124	<string>Web</string>	300	<string>Web</string>
125	</attribute>	301	</attribute>
126	<layout class="QHBoxLayout" name="horizontalLayout">	302	<layout class="QHBoxLayout" name="horizontalLayout">
127	<item>	303	<item>
128	<widget class="QWebView" name="WebView" ~~native="true"~~/>	304	<widget class="QWebView" name="WebView"/>
129	</item>	305	</item>
130	</layout>	306	</layout>
131	</widget>	307	</widget>
132	</widget>	308	</widget>
133	</item>	309	</item>
134	</layout>	310	</layout>
135	</widget>	311	</widget>
136	<customwidgets>	312	<customwidgets>
137	<customwidget>	313	<customwidget>
138	<class>QWebView</class>	314	<class>QWebView</class>
139	<extends>QWidget</extends>	315	<extends>QWidget</extends>
140	<header ~~location="global">~~QWebView</header>	316	<header>QtWebKitWidgets/QWebView</header>
141	<container>1</container>	317	<container>1</container>
142	</customwidget>	318	</customwidget>
143	</customwidgets>	319	</customwidgets>
144	<resources/>	320	<resources/>
145	<connections/>	321	<connections/>
146	</ui>	322	</ui>

spwplugin/StarDundee/stardundeespw_usb.cpp +7 -104

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2014, Plasma Physics Laboratory - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #include "stardundeespw_usb.h"
             #include "fakestardundeespwusb_lib.h"
             #include <socexplorerengine.h>
             #include <qhexedit.h>
             const QString dwLinkStatusQString[6] = {
                 "CFG_SPACEWIRE_ERROR_RESET",
                 "CFG_SPACEWIRE_ERROR_WAIT",
                 "CFG_SPACEWIRE_READY",
                 "CFG_SPACEWIRE_STARTED",
                 "CFG_SPACEWIRE_CONNECTING",
                 "CFG_SPACEWIRE_RUN"
             };
             stardundeeSPW_USB::stardundeeSPW_USB(socexplorerplugin *parent) :
                 abstractSpwBridge(parent)
             {
                 Q_UNUSED(parent)
                 this->manager = new stardundeeSPW_USB_Manager(parent,this);
                 makeGUI(parent);
-                this->manager->start();
                 connect(this->manager,SIGNAL(emitPacket(char*,int)),this,SIGNAL(pushPacketOverTCP(char*,int)));
                 connect(this->manager, SIGNAL(bytesReceivedFromSpw(uint)), this, SIGNAL(BytesReceivedFromSpw(uint)));
                 connect(this->manager, SIGNAL(bytesTransmittedToSpw(uint)), this, SIGNAL(BytesTransmittedToSpw(uint)));
                 connect(this->manager, SIGNAL(ccsdsPacketTransmittedToSpw()), this, SIGNAL(CCSDSPacketTransmittedToSpw()));
+                this->manager->start();
             }
             stardundeeSPW_USB::~stardundeeSPW_USB()
             {
                 this->manager->requestInterruption();
                 while(this->manager->isRunning());
             }
             void stardundeeSPW_USB::toggleBridgeConnection()
             {
                 if(this->plugin->isConnected())
                 {
                     this->disconnectBridge();
                 }
                 else
                 {
                     this->connectBridge();
                 }
             }
             bool stardundeeSPW_USB::connectBridge()
             {
                 if(this->manager->connectBridge())
                 {
                     this->timecodeFrequencyChanged(   ((StarDundeeGUI*)this->p_GUI)->getTimecodeFrequency());
                     this->startSendingTimecodes(      ((StarDundeeGUI*)this->p_GUI)->getStartSendingTimecodes());
                     ((StarDundeeGUI*)this->p_GUI)->lock(true);
                     emit setConnected(true);
                     return true;
                 }
                 return false;
             }
             bool stardundeeSPW_USB::disconnectBridge()
             {
                 if(this->manager->disconnectBridge())
                 {
                     ((StarDundeeGUI*)this->p_GUI)->lock(false);
                     emit setConnected(false);
                     return true;
                 }
                 return false;
             }
             int stardundeeSPW_USB::pushRMAPPacket(char *packet, int size)
             {
                 return this->manager->sendPacket(packet,size);
             }
             unsigned int stardundeeSPW_USB::Write(unsigned int *Value, unsigned int count, unsigned int address)
             {
                 char writeBuffer[RMAP_WRITE_PACKET_MIN_SZ((RMAP_MAX_XFER_SIZE*4))+1];
                 char *RMAPAckBuff;
                 writeBuffer[0]=this->manager->linkNumber;//Link number
                 int transactionID = 0;
                 int written=0;
                 SocExplorerEngine::message(this->plugin,"Enter Write function",2);
                 QProgressBar* progress=NULL;
                 SocExplorerAutoProgressBar autopb;
                 if(count>RMAP_MAX_XFER_SIZE)
                 {
                     progress= SocExplorerEngine::getProgressBar("Writing on SPW @0x"+QString::number(address,16)+" %v of "+QString::number(count)+" words ",count);
                     autopb.setProgressBar(progress);
                 }
                 //Quite stupide loop, I guess that I always get the number of byte I asked for!
                 while(count>=RMAP_MAX_XFER_SIZE)
                 {
                     for(int i=0;i<(RMAP_MAX_XFER_SIZE);i++)
                     {
                         writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+1] = (char)(((unsigned int)Value[i+written]>>24)&0xFF);
                         writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+2] = (char)(((unsigned int)Value[i+written]>>16)&0xFF);
                         writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+3] = (char)(((unsigned int)Value[i+written]>>8)&0xFF);
                         writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+4] = (char)(((unsigned int)Value[i+written])&0xFF);
                     }
                     transactionID=manager->getRMAPtransactionID();
                     SocExplorerEngine::message(this->plugin,QString("Sending Write request with ID=%1").arg(transactionID),2);
                     RMAP_build_tx_request_header(
                                 this->manager->destinationLogicalAddress,
                                 this->manager->destinationKey,
                                 this->manager->sourceLogicalAddress,
                                 transactionID,
                                 address+(written*4),
                                 RMAP_MAX_XFER_SIZE*4,
                                 writeBuffer+1);
                     manager->sendPacket(writeBuffer,RMAP_WRITE_PACKET_MIN_SZ(RMAP_MAX_XFER_SIZE*4)+1);
                     manager->getRMAPanswer(transactionID,&RMAPAckBuff);
                     free(RMAPAckBuff);
                     written+=RMAP_MAX_XFER_SIZE;
                     count-=RMAP_MAX_XFER_SIZE;
                     progress->setValue(written);
                     qApp->processEvents();
                 }
                 if(count>0)
                 {
                     for(int i=0;i<((int)count);i++)
                     {
                         writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+1] = (char)(((unsigned int)Value[i+written]>>24)&0xFF);
                         writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+2] = (char)(((unsigned int)Value[i+written]>>16)&0xFF);
                         writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+3] = (char)(((unsigned int)Value[i+written]>>8)&0xFF);
                         writeBuffer[RMAP_WRITE_HEADER_MIN_SZ+(i*4)+4] = (char)(((unsigned int)Value[i+written])&0xFF);
                     }
                     transactionID=manager->getRMAPtransactionID();
                     SocExplorerEngine::message(this->plugin,QString("Sending Write request with ID=%1").arg(transactionID),2);
                     RMAP_build_tx_request_header(
                                 this->manager->destinationLogicalAddress,
                                 this->manager->destinationKey,
                                 this->manager->sourceLogicalAddress,
                                 transactionID,
                                 address+(written*4),
                                 count*4,
                                 writeBuffer+1);
                     manager->sendPacket(writeBuffer,RMAP_WRITE_PACKET_MIN_SZ(count*4) +1);
                     manager->getRMAPanswer(transactionID,&RMAPAckBuff);
                     free(RMAPAckBuff);
                     written+=count;
                     if(progress!=NULL)
                     {
                         progress->setValue(written);
                         qApp->processEvents();
                     }
                 }
                 return written;
             }
             unsigned int stardundeeSPW_USB::Read(unsigned int *Value, unsigned int count, unsigned int address)
             {
                 char requestBuffer[RMAP_READ_HEADER_MIN_SZ+1];
                 char* RMAP_AnswerBuffer;
                 requestBuffer[0]=this->manager->linkNumber;//Link number
                 int transactionID = 0;
                 int read=0;
                 QProgressBar* progress=NULL;
                 SocExplorerAutoProgressBar autopb;
                 if(count>RMAP_MAX_XFER_SIZE)
                 {
                     progress= SocExplorerEngine::getProgressBar("Reading on SPW @0x"+QString::number(address,16)+" %v of "+QString::number(count)+" words ",count);
                     autopb.setProgressBar(progress);
                 }
                 SocExplorerEngine::message(this->plugin,QString("Enter read function, count=%1, RMAP_MAX_XFER_SIZE=%2").arg(count).arg(RMAP_MAX_XFER_SIZE),2);
                 //Quite stupide loop, I guess that I always get the number of byte I asked for!
                 while((int)count>=(int)RMAP_MAX_XFER_SIZE)
                 {
                     transactionID = manager->getRMAPtransactionID();
                     SocExplorerEngine::message(this->plugin,QString("New transactionID:%1").arg(transactionID),2);
                     RMAP_build_rx_request_header(
                                 this->manager->destinationLogicalAddress,
                                 this->manager->destinationKey,
                                 this->manager->sourceLogicalAddress,
                                 transactionID,
                                 address+(read*4),
                                 RMAP_MAX_XFER_SIZE*4,
                                 requestBuffer+1);
                     manager->sendPacket(requestBuffer,RMAP_READ_HEADER_MIN_SZ+1);
                     int len=manager->getRMAPanswer(transactionID,&RMAP_AnswerBuffer);
                     if(len==-1)
                     {
                         this->toggleBridgeConnection();
                         return 0;
                     }
                     for(int i=0;i<((len-13)/4);i++)
                     {
                         Value[read+i] =   0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+12]);
                         Value[read+i] =  (Value[read+i]<<8) + (0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+13]));
                         Value[read+i] =  (Value[read+i]<<8) + (0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+14]));
                         Value[read+i] =  (Value[read+i]<<8) + (0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+15]));
                     }
                     free(RMAP_AnswerBuffer);
                     read+=RMAP_MAX_XFER_SIZE;
                     count-=RMAP_MAX_XFER_SIZE;
+                    if(progress!=NULL)
+                    {
                         progress->setValue(read);
                         qApp->processEvents();
                     }
+                }
                 if((int)count>0)
                 {
                     transactionID = manager->getRMAPtransactionID();
                     SocExplorerEngine::message(this->plugin,QString("New transactionID: %1").arg(transactionID),2);
                     SocExplorerEngine::message(this->plugin,QString("Building request with:"),2);
                     SocExplorerEngine::message(this->plugin,QString("Address = %1").arg(address+(read*4),8,16),2);
                     SocExplorerEngine::message(this->plugin,QString("Size = %1").arg(count*4),2);
                     SocExplorerEngine::message(this->plugin,QString("Size + 13 = %1").arg((count*4)+13),2);
                     RMAP_build_rx_request_header(
                                 this->manager->destinationLogicalAddress,
                                 this->manager->destinationKey,
                                 this->manager->sourceLogicalAddress,
                                 transactionID,
                                 address+(read*4),
                                 count*4,
                                 requestBuffer+1);
                     manager->sendPacket(requestBuffer,RMAP_READ_HEADER_MIN_SZ+1);
                     int len=manager->getRMAPanswer(transactionID,&RMAP_AnswerBuffer);
                     if(len==-1)
                     {
                         this->toggleBridgeConnection();
                         return 0;
                     }
                     for(int i=0;i<((len-13)/4);i++)
                     {
                         Value[read+i] =   0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+12]);
                         Value[read+i] =  (Value[read+i]<<8) + (0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+13]));
                         Value[read+i] =  (Value[read+i]<<8) + (0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+14]));
                         Value[read+i] =  (Value[read+i]<<8) + (0x0FF & ((unsigned int)RMAP_AnswerBuffer[(4*i)+15]));
                     }
                     free(RMAP_AnswerBuffer);
                     read+=count;
                     if(progress!=NULL)
                     {
                         progress->setValue(read);
                         qApp->processEvents();
                     }
                 }
                 return read;
             }
             void stardundeeSPW_USB::brickSelectionChanged(int brickIndex)
             {
                 this->manager->selectedBrick = brickIndex-1;
                 SocExplorerEngine::message(plugin,QString("Changing brick index: %1").arg(manager->selectedBrick),1);
             }
             void stardundeeSPW_USB::linkNumberSelectionChanged(int linkIndex)
             {
                 this->manager->linkNumber = linkIndex + 1;
                 SocExplorerEngine::message(plugin,QString("Changing Link Number: %1").arg(manager->linkNumber),1);
             }
             void stardundeeSPW_USB::linkSpeedSelectionChanged(const QString &linkSpeed)
             {
                 this->manager->linkSpeed = linkSpeed.toInt();
                 SocExplorerEngine::message(plugin,QString("Changing Link Speed: %1").arg(manager->linkSpeed),1);
             }
             void stardundeeSPW_USB::sourceLogicalAddressChanged(const QString &sourceAddress)
             {
                 this->manager->sourceLogicalAddress = sourceAddress.toInt();
                 SocExplorerEngine::message(plugin,QString("Changing Destination Key: %1").arg(manager->sourceLogicalAddress),1);
             }
             void stardundeeSPW_USB::destinationAddressChanged(const QString &rmapaddress)
             {
                 this->manager->destinationLogicalAddress = rmapaddress.toInt();
                 SocExplorerEngine::message(plugin,QString("Changing RMAP address: %1").arg(manager->destinationLogicalAddress),1);
             }
             void stardundeeSPW_USB::destinationKeyChanged(const QString &key)
             {
                 this->manager->destinationKey = key.toInt();
                 SocExplorerEngine::message(plugin,QString("Changing RMAP Key: %1").arg(manager->destinationKey),1);
             }
             void stardundeeSPW_USB::brickModeChanged( bool interfaceMode )
             {
                 this->manager->interfaceMode = interfaceMode;
             }
             void stardundeeSPW_USB::timecodeFrequencyChanged(const QString &frequency)
             {
                 this->manager->timecodeFrequency = frequency.toDouble();
                 this->manager->setTimecodeFrequency( this->manager->timecodeFrequency);
                 SocExplorerEngine::message(plugin,QString("Changing timecode frequency: %1").arg(manager->timecodeFrequency),1);
             }
             void stardundeeSPW_USB::startSendingTimecodes(bool onOff )
             {
                 this->manager->sendTimecodePeriodically( onOff );
             }
             void stardundeeSPW_USB::rmapTimeoutChanged(const QString &timeout)
             {
                 int tim=timeout.toInt();
                 if(tim<50)
                 {
                     tim = 50;
                     ((StarDundeeGUI*)this->p_GUI)->setRmapTimeout(QString("%1").arg(tim));
                 }
                 this->manager->RMAPtimeout = tim;
                 SocExplorerEngine::message(plugin,QString("Changing RMAP Timeout: %1").arg(manager->RMAPtimeout),1);
             }
             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()));
                 connect(this->manager,SIGNAL(updateAvailableBrickCount(int)),((StarDundeeGUI*)this->p_GUI),SLOT(updateAvailableBrickCount(int)));
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(brickSelectionChanged(int)),this,SLOT(brickSelectionChanged(int)));
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(linkNumberSelectionChanged(int)),this,SLOT(linkNumberSelectionChanged(int)));
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(linkSpeedSelectionChanged(QString)),this,SLOT(linkSpeedSelectionChanged(QString)));
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(sourceLogicalAddressChanged(QString)),this,SLOT(sourceLogicalAddressChanged(QString)));
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(rmapAddressChanged(QString)),this,SLOT(destinationAddressChanged(QString)));
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(destinationKeyChanged(QString)),this,SLOT(destinationKeyChanged(QString)));
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(rmapTimeoutChanged(QString)),this,SLOT(rmapTimeoutChanged(QString)));
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(brickModeChanged(bool)), this, SLOT(brickModeChanged(bool)));
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(timecodeFrequencyChange(QString)), this, SLOT(timecodeFrequencyChanged(QString)));
                 connect(((StarDundeeGUI*)this->p_GUI),SIGNAL(startSendingTimecode(bool)), this, SLOT(startSendingTimecodes(bool)));
                 this->brickSelectionChanged(      ((StarDundeeGUI*)this->p_GUI)->getBrickSelection());
                 this->linkNumberSelectionChanged( ((StarDundeeGUI*)this->p_GUI)->getLinkNumberSelection());
                 this->linkSpeedSelectionChanged(  ((StarDundeeGUI*)this->p_GUI)->getLinkSpeedSelection());
                 this->sourceLogicalAddressChanged(((StarDundeeGUI*)this->p_GUI)->getSourceAddress());
                 this->destinationAddressChanged(  ((StarDundeeGUI*)this->p_GUI)->getDestinationAddress());
                 this->destinationKeyChanged(      ((StarDundeeGUI*)this->p_GUI)->getDestinationKey());
                 this->rmapTimeoutChanged(         ((StarDundeeGUI*)this->p_GUI)->getRmapTimeout());
                 this->brickModeChanged(           ((StarDundeeGUI*)this->p_GUI)->isBrickSetAsAnInterface());
                 connect(this,SIGNAL(SelectBrick(int)),              ((StarDundeeGUI*)this->p_GUI),SLOT(selectBrick(int)));
                 connect(this,SIGNAL(SelectLinkNumber(int)),         ((StarDundeeGUI*)this->p_GUI),SLOT(selectLinkNumber(int)));
                 connect(this,SIGNAL(SelectLinkSpeed(int)),          ((StarDundeeGUI*)this->p_GUI),SLOT(selectLinkSpeed(int)));
                 connect(this,SIGNAL(SetDestinationKey(QString)),    ((StarDundeeGUI*)this->p_GUI),SLOT(setDestinationKey(QString)));
                 connect(this,SIGNAL(SetDestinationAddress(QString)),((StarDundeeGUI*)this->p_GUI),SLOT(setDestinationAddress(QString)));
                 connect(this,SIGNAL(SetSourceAddress(QString)),     ((StarDundeeGUI*)this->p_GUI),SLOT(setSourceAddress(QString)));
                 connect(this,SIGNAL(SetRmapTimeout(QString)),       ((StarDundeeGUI*)this->p_GUI),SLOT(setRmapTimeout(QString)));
                 connect(this,SIGNAL(GetAvailableBrickCount()),      ((StarDundeeGUI*)this->p_GUI),SLOT(getAvailableBrickCount()));
                 connect(this,SIGNAL(GetNbPacketsTransmittedToSpw()),((StarDundeeGUI*)this->p_GUI),SLOT(getNbPacketsTransmittedToSpw()));
                 connect(this,SIGNAL(GetNbCCSDSPacketsTransmittedToSpw()),
                         ((StarDundeeGUI*)this->p_GUI),SLOT(getNbCCSDSPacketsTransmittedToSpw()));
                 connect(this,SIGNAL(SetBrickAsAnInterface(bool)),   ((StarDundeeGUI*)this->p_GUI),SLOT(setBrickAsAnInterface(bool)));
                 connect(this,SIGNAL(SetBrickAsARouter(bool)),       ((StarDundeeGUI*)this->p_GUI),SLOT(setBrickAsARouter(bool)));
                 connect(this,SIGNAL(BytesReceivedFromSpw(uint)),    ((StarDundeeGUI*)this->p_GUI),SLOT(updateNbReceivedBytesFromSpw(uint)));
                 connect(this,SIGNAL(BytesTransmittedToSpw(uint)),   ((StarDundeeGUI*)this->p_GUI),SLOT(updateNbTransmittedBytesToSpw(uint)));
                 connect(this,SIGNAL(CCSDSPacketTransmittedToSpw()), ((StarDundeeGUI*)this->p_GUI),SLOT(updateCCSDSPacketTransmittedToSpw()));
                 connect(this,SIGNAL(SetTimecodeFrequency(double)),  ((StarDundeeGUI*)this->p_GUI),SLOT(setTimecodeFrequency(double)));
                 connect(this,SIGNAL(StartSendingTimecodes(bool)),   ((StarDundeeGUI*)this->p_GUI),SLOT(setStartSendingTimecodes(bool)));
                 connect(this,SIGNAL(SendOneTimecode(unsigned char)),this->manager, SLOT(sendOneTimecode(unsigned char)));
                 connect(this,SIGNAL(GetLinkNumber()),               this->manager, SLOT(getLinkNumber()));
             }
             void stardundeeSPW_USB::sendPacketComingFromTCPServer(char *packet, int size)
             {
                 char* data;
                 int i;
                 data = (char *) malloc( size + 5 );
                 data[0] = this->manager->linkNumber;
                 data[1] = this->manager->destinationLogicalAddress; // target logical address
                 data[2] = SPW_PROTO_ID_CCSDS;                       // protocol identifier
                 data[3] = 0x00;                                     // reserved
                 data[4] = 0x00;                                     // user application
                 for ( i=0; i<size; i++ )
                 {
                     data[i+5] = packet[i];
                 }
                 this->manager->sendPacket( data, size + 5);
                 free(data);
                 free(packet);
             }
             stardundeeSPW_USB_Manager::stardundeeSPW_USB_Manager(socexplorerplugin *plugin, QObject *parent)
-                :QThread((QObject*)parent)
+                :abstractSpwManager(plugin, parent)
             {
-                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;
                 // TODO remove this crap!
                 this->initDialog();
             //    this->moveToThread(this);
             }
             stardundeeSPW_USB_Manager::~stardundeeSPW_USB_Manager()
             {
-                this->terminate();
-                while (!this->isFinished()) {
-                    this->usleep(1000);
             }
             void stardundeeSPW_USB_Manager::run()
             {
                 USB_SPACEWIRE_PACKET_PROPERTIES properties;
                 USB_SPACEWIRE_ID pIdentifier=NULL;
                 USB_SPACEWIRE_STATUS stat;
                 SocExplorerEngine::message(this->plugin,"Starting Startdundee USB pooling thread",1);
                 char buffer[(RMAP_MAX_XFER_SIZE*4)+50];
                 while (!this->isInterruptionRequested())
                 {
                     if(this->connected)
                     {
                         this->handleMutex->lock();
                         SocExplorerEngine::message(this->plugin,"Looking for new RMAP packets",4);
                         if(USBSpaceWire_WaitOnReadPacketAvailable(hDevice,0.01))
                         {
                             SocExplorerEngine::message(this->plugin,"Got packet",2);
                             stat = USBSpaceWire_ReadPackets(hDevice, buffer, (RMAP_MAX_XFER_SIZE*4)+50,1, 1, &properties, &pIdentifier);
                             if (stat == TRANSFER_SUCCESS)
                             {
                                 if(USBSpaceWire_GetReadTrafficType(&properties, 0) ==SPACEWIRE_TRAFFIC_PACKET)
                                 {
                                     SocExplorerEngine::message(this->plugin,"It's a SPW packet",2);
                                     if(USBSpaceWire_GetReadEOPStatus(&properties, 0)== SPACEWIRE_USB_EOP)
                                     {
                                         SocExplorerEngine::message(this->plugin,"Got end of packet",2);
                                         emit bytesReceivedFromSpw( properties.len );
                                         if(buffer[1]==(char)SPW_PROTO_ID_RMAP) //RMAP packet
                                         {
                                             RMAP_Answer* packet;
                                             SocExplorerEngine::message(this->plugin,"Got RMAP packet",2);
                                             SocExplorerEngine::message(this->plugin,QString("Rmap packet size %1").arg(properties.len),2);
                                             char* packetbuffer = (char*)malloc(properties.len);
                                             memcpy(packetbuffer,buffer,properties.len);
                                             USBSpaceWire_FreeRead(hDevice, pIdentifier);
                                             pIdentifier = NULL;
                                             this->handleMutex->unlock();
                                             if(properties.len==8)
                                             {
                                                 packet=new RMAP_Answer(RMAP_get_transactionID(buffer),packetbuffer,properties.len);
                                             }
                                             else
                                             {
                                                 packet=new RMAP_Answer(RMAP_get_transactionID(buffer+1),packetbuffer,properties.len);
                                             }
                                             RMAP_AnswersMtx->lock();
                                             RMAP_Answers.append(packet);
                                             RMAP_AnswersMtx->unlock();
                                             RMAP_AnswersSem->release();
                                         }
                                         else //any non-rmap packet will be pushed to the network
                                         {
                                             char* packetbuffer = (char*)malloc(properties.len);
                                             memcpy(packetbuffer,buffer,properties.len);
                                             emit emitPacket(packetbuffer,properties.len);
                                             USBSpaceWire_FreeRead(hDevice, pIdentifier);
                                             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);
                                 this->handleMutex->unlock();
                             }
                         }
                         else
                         {
                             USBSpaceWire_FreeRead(hDevice, pIdentifier);
                             this->handleMutex->unlock();
                         }
                     }
                     else
                     {
                         //do some sanity checks!
                         int list = USBSpaceWire_ListDevices();
                         if(this->brickList!=list)
                         {
                             this->brickList = list;
                             emit updateAvailableBrickCount(this->brickList);
                         }
                         usleep(RMAPtimeout/2);
                     }
                     usleep(1000);
                 }
                 SocExplorerEngine::message(this->plugin,"Exiting Startdundee USB pooling thread",1);
             }
             bool stardundeeSPW_USB_Manager::connectBridge()
             {
                 bool ret;
                 if (this->interfaceMode == BRICK_IS_SET_AS_AN_INTERFACE)
                 {
                     ret = connectBridgeAsInterface();
                 }
                 else if (this->interfaceMode == BRICK_IS_SET_AS_A_ROUTER)
                 {
                     ret = connectBridgeAsRouter();
                 }
                 else
                 {
                     ret = false;
                 }
                 return ret;
             }
             bool stardundeeSPW_USB_Manager::connectBridgeAsInterface()
             {
                 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);
                 USBSpaceWire_EnableNetworkMode(hDevice, 0); // deactivate the network mode
                 CFGSpaceWire_EnableRMAP(1);                 // Enable the use of RMAP for the StarDundee brick configuration
                 CFGSpaceWire_SetRMAPDestinationKey(0x20);   // Set the destination key expected by STAR-Dundee devices
                 // Set the path and return path to the device
                 CFGSpaceWire_StackClear();
                 CFGSpaceWire_AddrStackPush(0);
                 CFGSpaceWire_AddrStackPush(254);
                 CFGSpaceWire_RetAddrStackPush(254);
                 // set the base transmit rate to 100 MHz
                 status = CFGSpaceWire_SetBrickBaseTransmitRate( hDevice, CFG_BRK_CLK_100_MHZ, CFG_BRK_DVDR_1, 0xff);
                 if (status != CFG_TRANSFER_SUCCESS)
                 {
                     SocExplorerEngine::message(this->plugin,"ERROR CFGSpaceWire_SetBrickBaseTransmitRate",1);
                     this->handleMutex->unlock();
                     return false;
                 }
                 else
                 {
                     SocExplorerEngine::message(this->plugin,"OK CFGSpaceWire_SetBrickBaseTransmitRate, base rate = 100 MHz",1);
                 }
                 // read the link status
                 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
                 {
                     SocExplorerEngine::message(this->plugin,"OK CFGSpaceWire_GetLinkStatusControl of link " + QString::number(this->linkNumber),1);
                     // Set the link status control register properties
                     CFGSpaceWire_LSEnableAutoStart(&statusControl, 1);
                     CFGSpaceWire_LSEnableStart(&statusControl, 1);
                     CFGSpaceWire_LSEnableDisabled(&statusControl, 0);
                     CFGSpaceWire_LSEnableTristate(&statusControl, 0);
                     CFGSpaceWire_LSSetOperatingSpeed(&statusControl, 9);    // sets the link speed to ( 100 MHz / (9+1) ) = 10 MHz
                     // Set the link status control register
                     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
                     {
                         SocExplorerEngine::message(this->plugin,"Set the link status control for link " + QString::number(this->linkNumber),1);
                     }
                 }
                 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
                 {
                     SocExplorerEngine::message(this->plugin,"Device set to be an interface",1);
                 }
                 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);
                 this->connected = true;
                 return true;
             }
             bool stardundeeSPW_USB_Manager::connectBridgeAsRouter()
             {
             //    QMutexLocker mlock(&this->handleMutex);
                 this->handleMutex->lock();
                 int status;
                 U32 statusControl;
                 unsigned int linkStatus1;
                 unsigned int linkStatus2;
                 unsigned char linkNumber;
                 unsigned char deviceIsAnInterface;
                 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: "
                                  + QString::number(this->selectedBrick));
                 USBSpaceWire_EnableNetworkMode(hDevice, 0); // deactivate the network mode
                 CFGSpaceWire_EnableRMAP(1);                 // Enable the use of RMAP for the StarDundee brick configuration
                 CFGSpaceWire_SetRMAPDestinationKey(0x20);   // Set the destination key expected by STAR-Dundee devices
                 // Set the path and return path to the device
                 // This affects just the operations performed by the Configuration Library and does not affect the packets
                 // sent and received using the driver API.
                 CFGSpaceWire_StackClear();
                 CFGSpaceWire_AddrStackPush(0);
                 CFGSpaceWire_AddrStackPush(254);
                 CFGSpaceWire_RetAddrStackPush(254);
                 // set the base transmit rate to 100 MHz
                 status = CFGSpaceWire_SetBrickBaseTransmitRate( hDevice, CFG_BRK_CLK_100_MHZ, CFG_BRK_DVDR_1, 0xff);
                 if (status != CFG_TRANSFER_SUCCESS)
                 {
                     SocExplorerEngine::message(this->plugin,"ERROR CFGSpaceWire_SetBrickBaseTransmitRate");
                 }
                 else SocExplorerEngine::message(this->plugin,"OK CFGSpaceWire_SetBrickBaseTransmitRate, base rate = 100 MHz");
                 //*********************
                 // LINK 1 CONFIGURATION
                 linkNumber = 1;
                 if (CFGSpaceWire_GetLinkStatusControl(hDevice, linkNumber, &statusControl) != CFG_TRANSFER_SUCCESS)
                     SocExplorerEngine::message(this->plugin,"Could not read link status control for link " + QString::number(linkNumber));
                 else
                 {
                     SocExplorerEngine::message(this->plugin,"OK CFGSpaceWire_GetLinkStatusControl of link " + QString::number(linkNumber));
                     // Set the link status control register properties
                     CFGSpaceWire_LSEnableAutoStart(&statusControl, 1);
                     CFGSpaceWire_LSEnableStart(&statusControl, 1);
                     CFGSpaceWire_LSEnableDisabled(&statusControl, 0);
                     CFGSpaceWire_LSEnableTristate(&statusControl, 0);
                     CFGSpaceWire_LSSetOperatingSpeed(&statusControl, 9);    // sets the link speed to ( 100 MHz / (9+1) ) = 10 MHz
                     // Set the link status control register
                     if (CFGSpaceWire_SetLinkStatusControl(hDevice, linkNumber, statusControl) != CFG_TRANSFER_SUCCESS)
                         SocExplorerEngine::message(this->plugin,"Could not set the link status control for link " + QString::number(linkNumber));
                     else
                         SocExplorerEngine::message(this->plugin,"link status control for link " + QString::number(0x01) + " is set");
                 }
                 //*********************
                 // LINK 2 CONFIGURATION
                 linkNumber = 2;
                 if (CFGSpaceWire_GetLinkStatusControl(hDevice, linkNumber, &statusControl) != CFG_TRANSFER_SUCCESS)
                     SocExplorerEngine::message(this->plugin,"Could not read link status control for link " + QString::number(linkNumber));
                 else
                 {
                     SocExplorerEngine::message(this->plugin,"OK CFGSpaceWire_GetLinkStatusControl of link " + QString::number(linkNumber));
                     // Set the link status control register properties
                     CFGSpaceWire_LSEnableAutoStart(&statusControl, 1);
                     CFGSpaceWire_LSEnableStart(&statusControl, 1);
                     CFGSpaceWire_LSEnableDisabled(&statusControl, 0);
                     CFGSpaceWire_LSEnableTristate(&statusControl, 0);
                     CFGSpaceWire_LSSetOperatingSpeed(&statusControl, 9);    // sets the link speed to ( 100 MHz / (9+1) ) = 10 MHz
                     // Set the link status control register
                     if (CFGSpaceWire_SetLinkStatusControl(hDevice, linkNumber, statusControl) != CFG_TRANSFER_SUCCESS)
                         SocExplorerEngine::message(this->plugin,"Could not set the link status control for link " + QString::number(linkNumber));
                     else
                         SocExplorerEngine::message(this->plugin,"link status control for link " + QString::number(linkNumber) + " is set");
                 }
                 //***************************
                 // SET THE DEVICE AS A ROUTER
                 deviceIsAnInterface = 0;    // 0 = router, 1 = interface
                 if (CFGSpaceWire_SetAsInterface(hDevice, deviceIsAnInterface, 0) != CFG_TRANSFER_SUCCESS)
                     SocExplorerEngine::message(this->plugin,"Could not set the device to be an interface");
                 else
                     SocExplorerEngine::message(this->plugin,"Device is an interface: " + QString::number(deviceIsAnInterface) + " (1 => true, 0 => false)");
                 setRoutingTableEntry(0xfe, 0x02, 0); // [0010] => route 0xfe on port 1
                 setRoutingTableEntry(32  , 0x08, 0); // [1000] => route 32   on port 3
                 USBSpaceWire_RegisterReceiveOnAllPorts(hDevice);  // Register to receive on port 1 only
                 USBSpaceWire_ClearEndpoints(hDevice);               // clear the USB endpoints
                 SocExplorerEngine::message(this->plugin,"The driver's current send buffer size is " + QString::number(USBSpaceWire_GetDriverSendBufferSize(hDevice)) + " bytes");
                 SocExplorerEngine::message(this->plugin,"The driver's current read buffer size is " + QString::number(USBSpaceWire_GetDriverReadBufferSize(hDevice)) + " bytes");
                 SocExplorerEngine::message(this->plugin,"USBSpaceWire_IsReadThrottling is " + QString::number(USBSpaceWire_IsReadThrottling(hDevice)));
                 //************
                 // test Link 1 and Link 2
                 linkStatus1 = getLinkStatus(0x01);
                 linkStatus2 = getLinkStatus(0x02);
                 this->handleMutex->unlock();
                 if ((linkStatus1==1) || (linkStatus2==1))
                 {
                     initializeTimecodeGeneration();
                     this->connected=true;
                     return true;
                 }
                 else
                 {
                     statusLink1->setText("Link 1 status code: " + QString::number(linkStatus1));
                     statusLink2->setText("Link 2 status code: " + QString::number(linkStatus2));
                     starDundeeStatusQueryDialog->exec();
                     this->connected = false;
                     return false;
                 }
             }
             void stardundeeSPW_USB_Manager::initDialog( void )
             {
                 // STAR DUNDEE STATUS QUERY DIALOG
                 starDundeeStatusQueryDialog         = new QDialog;
                 starDundeeStatusQueryDialogLayout   = new QGridLayout;
                 starDundeeStatusQueryDialogLabel    = new QLabel(tr("SpaceWire links state"));
                 starDundeeStatusQueryContinueButton = new QPushButton(tr("Continue"));
                 starDundeeStatusQueryRetryButton    = new QPushButton(tr("Retry"));
                 starDundeeStatusQueryAbortButton    = new QPushButton(tr("Abort"));
                 statusLink1 = new QLabel(tr("Link 1 status code: -"));
                 statusLink2 = new QLabel(tr("Link 2 status code: -"));
                 starDundeeStatusQueryDialogLayout->addWidget(starDundeeStatusQueryDialogLabel, 0, 0, 1, 2);
                 starDundeeStatusQueryDialogLayout->addWidget(starDundeeStatusQueryContinueButton, 1, 0, 0);
                 starDundeeStatusQueryDialogLayout->addWidget(starDundeeStatusQueryRetryButton, 1, 1, 0);
                 starDundeeStatusQueryDialogLayout->addWidget(starDundeeStatusQueryAbortButton, 1, 2, 0);
                 starDundeeStatusQueryDialogLayout->addWidget(statusLink1, 2, 0, 0);
                 starDundeeStatusQueryDialogLayout->addWidget(statusLink2, 3, 0, 0);
                 starDundeeStatusQueryDialog->setLayout(starDundeeStatusQueryDialogLayout);
             }
             unsigned char stardundeeSPW_USB_Manager::setRoutingTableEntry(int tableEntry, U32 dwOutputPorts, char bDelHead)
             {
                 U32 routingTableEntry;
                 // SET THE ROUTING TABLE ENTRY FOR LOGICAL ADDRESSING, TARGET entryNumber
                 if (CFGSpaceWire_ClearRoutingTableEntry(hDevice, tableEntry) != CFG_TRANSFER_SUCCESS)
                 {
                     SocExplorerEngine::message(this->plugin,"Could not clear routing table entry " + QString::number(tableEntry));
                 }
                 // Build the routing table entry
                 CFGSpaceWire_RTBuildRoutingTableEntry(&routingTableEntry,
                                                       dwOutputPorts,        // route out of port dwOutputPorts
                                                       bDelHead,             // header deletion is enabled [1] or disabled [0]
 );                   // priority normal
                 // Set the routing table entry for logical address tableEntry
                 if (CFGSpaceWire_SetRoutingTableEntry(hDevice, tableEntry, routingTableEntry) != CFG_TRANSFER_SUCCESS)
                 {
                     SocExplorerEngine::message(this->plugin,"Could not set routing table entry [" + QString::number(tableEntry) + "]");
                 }
                 else SocExplorerEngine::message(this->plugin,"Routing table entry [" + QString::number(tableEntry) + "] set" );
                 return 1;
             }
             unsigned int stardundeeSPW_USB_Manager::getRoutingTableEntry(int tableEntry)
             {
                 U32 routingTableEntry, outputPorts;
                 char enabled, delHead, priority;
                 int portNum;
                 SocExplorerEngine::message(this->plugin,"GetRoutingTableEntry [" + QString::number(tableEntry) + "]");
                 // Read the routing table entry
                 if (CFGSpaceWire_GetRoutingTableEntry(hDevice, tableEntry, &routingTableEntry) != CFG_TRANSFER_SUCCESS)
                 {
                     SocExplorerEngine::message(this->plugin,"Could not read routing table entry [" + QString::number(tableEntry) + "]");
                 }
                 else
                 {
                     // Display the routing table entry properties
                     CFGSpaceWire_RTIsEnabled(routingTableEntry, &enabled);
                     CFGSpaceWire_RTIsDelHead(routingTableEntry, &delHead);
                     CFGSpaceWire_RTIsPriority(routingTableEntry, &priority);
                     CFGSpaceWire_RTGetOutputPorts(routingTableEntry, &outputPorts);
                     SocExplorerEngine::message(this->plugin,"CFGSpaceWire_RTIsEnabled      : " + QString::number(enabled));
                     SocExplorerEngine::message(this->plugin,"CFGSpaceWire_RTIsDelHead      : " + QString::number(delHead));
                     SocExplorerEngine::message(this->plugin,"CFGSpaceWire_RTIsPriority     : " + QString::number(priority));
                     SocExplorerEngine::message(this->plugin,"CFGSpaceWire_RTGetOutputPorts : ");
                     for (portNum = 0; portNum < 32; portNum++)
                     {
                         if (outputPorts & (1 << portNum))
                         {
                             SocExplorerEngine::message(this->plugin,QString::number(portNum));
                         }
                     }
                 }
                 return 1;
             }
             void stardundeeSPW_USB_Manager::initializeTimecodeGeneration()
             {
                 U32 dwTickEnableStatus;
                 U32 rtr_clk_freq;
                 // (1) RESET
                 if (!USBSpaceWire_TC_Reset(hDevice))
                     SocExplorerEngine::message(this->plugin,"ERR *** in Open *** Could not reset timecodes\n");
                 // (2) Clear the tick enable register
                 if (CFGSpaceWire_SetTickEnableStatus(hDevice, 6) != CFG_TRANSFER_SUCCESS)
                     SocExplorerEngine::message(this->plugin,"Could not clear the tick enable register");
                 else
                     SocExplorerEngine::message(this->plugin,"Cleared the tick enable register");
                 // (3) get the tick status
                 CFGSpaceWire_GetTickEnableStatus(hDevice, &dwTickEnableStatus);
                 SocExplorerEngine::message(this->plugin,"OK *** in Open *** CFGSpaceWire_GetTickEnableStatus, code is " + QString::number(dwTickEnableStatus, 2));
                 // (4) enable external timecode selection
                 if(!USBSpaceWire_TC_EnableExternalTimecodeSelection(hDevice,0))
                     SocExplorerEngine::message(this->plugin,"ERR *** disable external timecode selection");
                 rtr_clk_freq = USBSpaceWire_TC_GetClockFrequency(hDevice);
                 SocExplorerEngine::message(this->plugin,"clock frequency = " + QString::number(rtr_clk_freq) );
                 //**************************************************
                 // auto _ tick _ freq = rtr _ clk _ freq / freqCount
                 if (!USBSpaceWire_TC_SetAutoTickInFrequency(hDevice, rtr_clk_freq) )
                     SocExplorerEngine::message(this->plugin,"Could not set the tick-in frequency");
             }
             unsigned int stardundeeSPW_USB_Manager::getLinkStatus(unsigned char link)
             {
                 U32 statusControl, errorStatus, portType;
-                U32 linkStatus, operatingSpeed, outputPortConnection;
+                U32 linkStatus=0, operatingSpeed, outputPortConnection;
                 char isLinkRunning, isAutoStart, isStart, isDisabled, isTristate;
                 // Read the link status control register
                 if (CFGSpaceWire_GetLinkStatusControl(hDevice, link, &statusControl) != CFG_TRANSFER_SUCCESS)
                 {
                     SocExplorerEngine::message(this->plugin,"Could not read link status control for link" + QString::number(link));
                 }
                 else
                 {
                     // Display the link status control register properties
                     CFGSpaceWire_LSPortType(statusControl, &portType);
                     if (portType == CFG_CONFIGURATION_PORT)
                     {
                         CFGSpaceWire_LSConfigErrorStatus(statusControl, &errorStatus);
                     }
                     else if (portType == CFG_SPACEWIRE_EXTERNAL_PORT)
                     {
                         CFGSpaceWire_LSExternalErrorStatus(statusControl, &errorStatus);
                     }
                     else
                     {
                         CFGSpaceWire_LSErrorStatus(statusControl, &errorStatus);
                     }
                     CFGSpaceWire_LSLinkState(statusControl, &linkStatus);
                     CFGSpaceWire_LSIsLinkRunning(statusControl, &isLinkRunning);
                     CFGSpaceWire_LSIsAutoStart(statusControl, &isAutoStart);
                     CFGSpaceWire_LSIsStart(statusControl, &isStart);
                     CFGSpaceWire_LSIsDisabled(statusControl, &isDisabled);
                     CFGSpaceWire_LSIsTristate(statusControl, &isTristate);
                     CFGSpaceWire_LSOperatingSpeed(statusControl, &operatingSpeed);
                     CFGSpaceWire_LSOutputPortConnection(statusControl, &outputPortConnection);
                 }
                 SocExplorerEngine::message(this->plugin,"status of link " + QString::number(link)
                                            +" is " + dwLinkStatusQString[linkStatus]);
                 if (linkStatus == 5)
                 {
                     return 1;
                 }
                 else return 0;
             }
             bool stardundeeSPW_USB_Manager::disconnectBridge()
             {
                 this->handleMutex->lock();
+                USBSpaceWire_UnregisterReceiveOnAllPorts(hDevice);  // Stop receiving on all ports
                 USBSpaceWire_Close(hDevice); // Close the device
                 SocExplorerEngine::message(this->plugin,"stardundee *** Close *** USBSpaceWire_Close, device: " + QString::number(0),0);
-                USBSpaceWire_UnregisterReceiveOnAllPorts(hDevice);  // Stop receiving on all ports
                 this->handleMutex->unlock();
                 this->RMAP_pending_transaction_IDsMtx->lock();
                 this->RMAP_pending_transaction_IDs.clear();
                 this->RMAP_pending_transaction_IDsMtx->unlock();
                 this->RMAP_AnswersMtx->lock();
                 this->RMAP_Answers.clear();
                 this->RMAP_AnswersMtx->unlock();
                 this->RMAP_AnswersSem->acquire(this->RMAP_AnswersSem->available());
                 return true;
             }
-            int stardundeeSPW_USB_Manager::getRMAPtransactionID()
-                this->RMAP_pending_transaction_IDsMtx->lock();
-                int  ID=0;
-                bool found=true;
-                while(ID<511)
-                    for(int i=0;i<RMAP_pending_transaction_IDs.count();i++)
-                        if(RMAP_pending_transaction_IDs[i]==ID)found=false;
-                    if(found==true)break;
-                    ID++;
-                    found = true;
-                if(found)
-                    RMAP_pending_transaction_IDs.append(ID);
-                this->RMAP_pending_transaction_IDsMtx->unlock();
-                return ID;
-            int stardundeeSPW_USB_Manager::getRMAPanswer(int transactionID, char **buffer)
-                QTime timeout;
-                *buffer=NULL;
-                int count=0;
-                SocExplorerEngine::message(this->plugin,"Looking for RMAP answer",2);
-                timeout.start();
-                while (*buffer==NULL)
-                    this->RMAP_AnswersMtx->lock();
-                    SocExplorerEngine::message(this->plugin,"Got exclusive access on RMAP_Answers stack",2);
-                    SocExplorerEngine::message(this->plugin,QString("%1 packet(s) available in RMAP_Answers stack").arg(RMAP_Answers.count()),2);
-                    for(int i=0;i<RMAP_Answers.count();i++)
-                        SocExplorerEngine::message(this->plugin,QString("Packet %1 ID=%2").arg(i).arg(RMAP_Answers[i]->transactionID),2);
-                        if(RMAP_Answers[i]->transactionID==transactionID)
-                            this->RMAP_pending_transaction_IDsMtx->lock();
-                            SocExplorerEngine::message(this->plugin,"Got exclusive access on RMAP_pending_transaction_ID stack",2);
-                            for(int j=0;j<RMAP_pending_transaction_IDs.count();j++)
-                                if(RMAP_pending_transaction_IDs[j]==transactionID)
-                                    RMAP_pending_transaction_IDs.removeAt(j);
-                            this->RMAP_pending_transaction_IDsMtx->unlock();
-                            *buffer = RMAP_Answers[i]->data;
-                            count = RMAP_Answers[i]->len;
-                            RMAP_Answer* tmp=RMAP_Answers[i];
-                            RMAP_Answers.removeAt(i);
-                            delete tmp;
-                    this->RMAP_AnswersMtx->unlock();
-                    //if no answer found in the stack wait until a new packet is pushed
-                    SocExplorerEngine::message(this->plugin,"waiting until a new packet is pushed",2);
-                    if(*buffer==NULL)
-                        while (0==this->RMAP_AnswersSem->available())
-                            SocExplorerEngine::message(this->plugin,QString("this->RMAP_AnswersSem->available() = %1").arg(this->RMAP_AnswersSem->available()),2);
-                            if(timeout.elapsed()>=RMAPtimeout)
-                                SocExplorerEngine::message(this->plugin,"Timeout reached giving up!",2);
-                                return -1;
-                            usleep(1000);
-                        this->RMAP_AnswersSem->acquire();
-                return count;
             bool stardundeeSPW_USB_Manager::sendPacket(char *packet, int size)
             {
                 char protocoleIdentifier;
                 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);
                     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);
                 }
                 return true;
             }
-            void stardundeeSPW_USB_Manager::pushRmapPacket(char *packet, int len)
-                char* packetbuffer = (char*)malloc(len);
-                memcpy(packetbuffer,packet,len);
-                RMAP_Answer* RMPAPpacket=new RMAP_Answer(RMAP_get_transactionID(packetbuffer+1),packetbuffer,len);
-                RMAP_AnswersMtx->lock();
-                RMAP_Answers.append(RMPAPpacket);
-                RMAP_AnswersMtx->unlock();
             void stardundeeSPW_USB_Manager::sendTimecodePeriodically( bool onOff )
             {
                 this->handleMutex->lock();
                 if (onOff == true)
                 {
                     if (!USBSpaceWire_TC_EnableAutoTickIn(hDevice, 1, 1))
                         SocExplorerEngine::message(this->plugin,"Could not enable auto tick-in");
                 }
                 else
                 {
                     if (!USBSpaceWire_TC_EnableAutoTickIn(hDevice, 0, 0))
                         SocExplorerEngine::message(this->plugin,"Could not disable auto tick-in");
                 }
                 this->handleMutex->unlock();
             }
             int stardundeeSPW_USB_Manager::getLinkNumber( void )
             {
                 return this->linkNumber;
             }
             void stardundeeSPW_USB_Manager::setTimecodeFrequency(double requestedFrequency)
             {
                 U32 rtr_clk_freq=0;
                 U32 freqCount=0;
                 double freqCountInDouble=0.0;
                 double currentFrequency=0.0;
                 this->handleMutex->lock();
                 rtr_clk_freq = USBSpaceWire_TC_GetClockFrequency(hDevice);
                 freqCountInDouble = ((double) rtr_clk_freq) / requestedFrequency;
                 freqCount = (unsigned int) freqCountInDouble;
                 currentFrequency = ((double) rtr_clk_freq) / ((double) freqCount);
                 //**************************************************
                 // auto _ tick _ freq = rtr _ clk _ freq / freqCount
                 if (!USBSpaceWire_TC_SetAutoTickInFrequency(hDevice, freqCount) )
                     SocExplorerEngine::message(this->plugin,"Could not set the tick-in frequency");
                 else
                     SocExplorerEngine::message(this->plugin,"tick frequency set to " + QString::number(currentFrequency) +" Hz"
                                                + " (freqCount set to " + QString::number(freqCount) + ")" );
                 this->handleMutex->unlock();
             }
             void stardundeeSPW_USB_Manager::sendOneTimecode( unsigned char nTimein )
             {
                 this->handleMutex->lock();
                 // enable external timecode selection
                 if(!USBSpaceWire_TC_EnableExternalTimecodeSelection(hDevice,1))
                     SocExplorerEngine::message(this->plugin,"sendOneTimecode *** ERR *** enable external timecode selection");
                 if (!USBSpaceWire_TC_PerformTickIn( hDevice, nTimein) )
                     SocExplorerEngine::message( this->plugin,"sendOneTimecode *** ERR *** Could not send the requested timecode: " + QString::number(nTimein) );
                 else
                     SocExplorerEngine::message( this->plugin,"sendOneTimecode *** OK *** timecode sent " + QString::number(nTimein) );
                 // disable external timecode selection
                 if(!USBSpaceWire_TC_EnableExternalTimecodeSelection(hDevice,0))
                     SocExplorerEngine::message(this->plugin,"sendOneTimecode *** ERR *** disable external timecode selection");
                 this->handleMutex->unlock();
             }

spwplugin/StarDundee/stardundeespw_usb.h +2 -16

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2014, Plasma Physics Laboratory - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #ifndef STARDUNDEESPW_USB_H
             #define STARDUNDEESPW_USB_H
             #include <QObject>
             //#include <spw_usb_api.h>
             //#include <spw_config_library.h>
             #include "fakestardundeespwusb_lib.h"
             #include <socexplorerplugin.h>
             #include <abstractspwbridge.h>
             #include <QThread>
             #include <QMutex>
             #include <QSemaphore>
             #include <QGridLayout>
             #include <QPushButton>
             #include <QComboBox>
             #include <QLabel>
             #include "stardundeegui.h"
             #define BRICK_IS_SET_AS_AN_INTERFACE true
             #define BRICK_IS_SET_AS_A_ROUTER false
-            class stardundeeSPW_USB_Manager: public QThread
+            class stardundeeSPW_USB_Manager: public abstractSpwManager
             {
                 Q_OBJECT
             public:
                 explicit stardundeeSPW_USB_Manager(socexplorerplugin *plugin = 0,QObject* parent=0);
                 ~stardundeeSPW_USB_Manager();
                 void run();
                 bool connectBridge();
                 bool connectBridgeAsInterface();
                 bool connectBridgeAsRouter();
                 void initDialog( void );
                 unsigned char setRoutingTableEntry(int tableEntry, U32 dwOutputPorts, char bDelHead);
                 unsigned int getRoutingTableEntry(int tableEntry);
                 void initializeTimecodeGeneration();
                 void setTimecodeFrequency(double requestedFrequency);
                 unsigned int getLinkStatus(unsigned char link);
                 bool disconnectBridge();
-                int getRMAPtransactionID();
-                int getRMAPanswer(int transactionID,char** buffer);
                 bool sendPacket(char* packet,int size);
             signals:
                 void updateAvailableBrickCount(int count);
                 void emitPacket(char* packet,int size);
                 void bytesReceivedFromSpw( unsigned int );
                 void bytesTransmittedToSpw( unsigned int);
                 void ccsdsPacketTransmittedToSpw( void );
             public slots:
                 void sendTimecodePeriodically( bool onOff );
                 void sendOneTimecode(unsigned char nTimein);
                 int getLinkNumber( void );
             private:
-                QMutex *handleMutex,*RMAP_AnswersMtx,*RMAP_pending_transaction_IDsMtx;
+                //QSemaphore* RMAP_AnswersSem;
-                QSemaphore* RMAP_AnswersSem;
-                void pushRmapPacket(char* packet,int len);
                 star_device_handle hDevice;
-                socexplorerplugin* plugin;
-                bool connected;
-                char* SPWPacketBuff;
-                QList<RMAP_Answer*> RMAP_Answers;
-                QList<int> RMAP_pending_transaction_IDs;
                 QLabel *starDundeeStatusQueryDialogLabel;
                 QPushButton *starDundeeStatusQueryRetryButton;
                 QPushButton *starDundeeStatusQueryAbortButton;
                 QLabel *statusLink1;
                 QLabel *statusLink2;
                 QPushButton *starDundeeStatusQueryContinueButton;
                 QDialog *starDundeeStatusQueryDialog;
                 QGridLayout *starDundeeStatusQueryDialogLayout;
             public:
                 int selectedBrick;
-                int linkNumber;
                 int brickList;
                 int linkSpeed;
-                int sourceLogicalAddress;
-                int destinationLogicalAddress;
-                int destinationKey;
-                int RMAPtimeout;
                 double timecodeFrequency;
                 bool interfaceMode; // 1 => interface mode, 0 => router mode
             };
             class stardundeeSPW_USB : public abstractSpwBridge
             {
                 Q_OBJECT
             public:
                 explicit stardundeeSPW_USB(socexplorerplugin *parent = 0);
                 ~stardundeeSPW_USB();
             signals:
                 void setRmapTimeout(const QString & timeout);
                 void SelectBrick(int brickIndex);
                 void SelectLinkNumber(int linkIndex);
                 void SelectLinkSpeed(int linkSpeed);
                 void SetDestinationKey(const QString & destKey);
                 void SetSourceAddress(const QString & address);
                 void SetDestinationAddress(const QString & address);
                 void SetRmapTimeout(const QString & timeout);
                 void SetTimecodeFrequency( double );
                 void SetBrickAsAnInterface( bool );
                 void SetBrickAsARouter( bool );
                 int GetAvailableBrickCount( void );
                 unsigned int GetNbPacketsTransmittedToSpw( void );
                 unsigned int GetNbCCSDSPacketsTransmittedToSpw( void );
                 void BytesReceivedFromSpw( unsigned int );
                 void BytesTransmittedToSpw( unsigned int );
                 void CCSDSPacketTransmittedToSpw( void );
                 void StartSendingTimecodes( bool );
                 void SendOneTimecode( unsigned char );
                 int GetLinkNumber();
             public slots:
                 void toggleBridgeConnection();
                 bool connectBridge();
                 bool disconnectBridge();
                 int  pushRMAPPacket(char* packet,int size);
                 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);
                 void brickSelectionChanged(int brickIndex);
                 void linkNumberSelectionChanged(int linkIndex);
                 void linkSpeedSelectionChanged(const QString & linkSpeed);
                 void sourceLogicalAddressChanged(const QString & destKey);
                 void destinationAddressChanged(const QString & rmapaddress);
                 void brickModeChanged( bool interfaceMode );
                 void destinationKeyChanged(const QString & key);
                 void rmapTimeoutChanged(const QString & timeout);
                 void sendPacketComingFromTCPServer(char *packet, int size);
                 void timecodeFrequencyChanged(const QString &frequency);
                 void startSendingTimecodes( bool onOff );
             private:
                 void makeGUI(socexplorerplugin *parent);
                 stardundeeSPW_USB_Manager* manager;
             };
             #endif // STARDUNDEESPW_USB_H

spwplugin/abstractspwbridge.cpp +123 0

@@ -1,56 +1,179
1	/*------------------------------------------------------------------------------	1	/*------------------------------------------------------------------------------
2	-- This file is a part of the SocExplorer Software	2	-- This file is a part of the SocExplorer Software
3	-- Copyright (C) 2014, Plasma Physics Laboratory - CNRS	3	-- Copyright (C) 2014, Plasma Physics Laboratory - CNRS
4	--	4	--
5	-- This program is free software; you can redistribute it and/or modify	5	-- This program is free software; you can redistribute it and/or modify
6	-- it under the terms of the GNU General Public License as published by	6	-- it under the terms of the GNU General Public License as published by
7	-- the Free Software Foundation; either version 3 of the License, or	7	-- the Free Software Foundation; either version 3 of the License, or
8	-- (at your option) any later version.	8	-- (at your option) any later version.
9	--	9	--
10	-- This program is distributed in the hope that it will be useful,	10	-- This program is distributed in the hope that it will be useful,
11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of	11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	-- GNU General Public License for more details.	13	-- GNU General Public License for more details.
14	--	14	--
15	-- You should have received a copy of the GNU General Public License	15	-- You should have received a copy of the GNU General Public License
16	-- along with this program; if not, write to the Free Software	16	-- along with this program; if not, write to the Free Software
17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18	-------------------------------------------------------------------------------*/	18	-------------------------------------------------------------------------------*/
19	/*-- Author : Alexis Jeandet	19	/*-- Author : Alexis Jeandet
20	-- Mail : alexis.jeandet@member.fsf.org	20	-- Mail : alexis.jeandet@member.fsf.org
21	----------------------------------------------------------------------------*/	21	----------------------------------------------------------------------------*/
22	#include "abstractspwbridge.h"	22	#include "abstractspwbridge.h"
		23	#include <QTime>
		24	#include <socexplorerengine.h>
23		25
24	abstractSpwBridge::abstractSpwBridge(socexplorerplugin *parent)	26	abstractSpwBridge::abstractSpwBridge(socexplorerplugin *parent)
25	:QObject((QObject*)parent)	27	:QObject((QObject*)parent)
26	{	28	{
27	this->plugin = parent;	29	this->plugin = parent;
28	this->p_GUI=NULL;	30	this->p_GUI=NULL;
29	}	31	}
30		32
31	abstractSpwBridge::~abstractSpwBridge()	33	abstractSpwBridge::~abstractSpwBridge()
32	{	34	{
33	// delete this->p_GUI;	35	// delete this->p_GUI;
34	}	36	}
35		37
36	QWidget *abstractSpwBridge::getGUI()	38	QWidget *abstractSpwBridge::getGUI()
37	{	39	{
38	return this->p_GUI;	40	return this->p_GUI;
39	}	41	}
40		42
41	bool abstractSpwBridge::connectBridge()	43	bool abstractSpwBridge::connectBridge()
42	{	44	{
43	return false;	45	return false;
44	}	46	}
45		47
46	bool abstractSpwBridge::disconnectBridge()	48	bool abstractSpwBridge::disconnectBridge()
47	{	49	{
48	return false;	50	return false;
49	}	51	}
50		52
51		53
52		54
53		55
54		56
55		57
56		58
		59
		60
		61
		62	abstractSpwManager::abstractSpwManager(socexplorerplugin plugin, QObject parent)
		63	:QThread((QObject*)parent)
		64	{
		65	this->RMAPtimeout = 2000;
		66	this->handleMutex = new QMutex(QMutex::NonRecursive);
		67	this->RMAP_AnswersSem = new QSemaphore(0);
		68	this->RMAP_AnswersMtx=new QMutex(QMutex::Recursive);
		69	this->RMAP_pending_transaction_IDsMtx=new QMutex(QMutex::Recursive);
		70	this->plugin = plugin;
		71	connected = false;
		72	}
		73
		74	abstractSpwManager::~abstractSpwManager()
		75	{
		76	this->terminate();
		77	while (!this->isFinished())
		78	{
		79	this->usleep(1000);
		80	}
		81	}
		82
		83	int abstractSpwManager::getRMAPtransactionID()
		84	{
		85	this->RMAP_pending_transaction_IDsMtx->lock();
		86	int ID=0;
		87	bool found=true;
		88	while(ID<511)
		89	{
		90	for(int i=0;i<RMAP_pending_transaction_IDs.count();i++)
		91	{
		92	if(RMAP_pending_transaction_IDs[i]==ID)found=false;
		93	}
		94	if(found==true)break;
		95	ID++;
		96	found = true;
		97	}
		98	if(found)
		99	{
		100	RMAP_pending_transaction_IDs.append(ID);
		101	}
		102	this->RMAP_pending_transaction_IDsMtx->unlock();
		103	return ID;
		104	}
		105
		106	int abstractSpwManager::getRMAPanswer(int transactionID, char **buffer)
		107	{
		108
		109	QTime timeout;
		110	*buffer=NULL;
		111	int count=0;
		112	SocExplorerEngine::message(this->plugin,"Looking for RMAP answer",2);
		113	qApp->processEvents();
		114	timeout.start();
		115	while (*buffer==NULL)
		116	{
		117	this->RMAP_AnswersMtx->lock();
		118	SocExplorerEngine::message(this->plugin,"Got exclusive access on RMAP_Answers stack",2);
		119	SocExplorerEngine::message(this->plugin,QString("%1 packet(s) available in RMAP_Answers stack").arg(RMAP_Answers.count()),2);
		120	for(int i=0;i<RMAP_Answers.count();i++)
		121	{
		122	SocExplorerEngine::message(this->plugin,QString("Packet %1 ID=%2").arg(i).arg(RMAP_Answers[i]->transactionID),2);
		123	if(RMAP_Answers[i]->transactionID==transactionID)
		124	{
		125	this->RMAP_pending_transaction_IDsMtx->lock();
		126	SocExplorerEngine::message(this->plugin,"Got exclusive access on RMAP_pending_transaction_ID stack",2);
		127	for(int j=0;j<RMAP_pending_transaction_IDs.count();j++)
		128	{
		129	if(RMAP_pending_transaction_IDs[j]==transactionID)
		130	{
		131	RMAP_pending_transaction_IDs.removeAt(j);
		132	}
		133	}
		134	this->RMAP_pending_transaction_IDsMtx->unlock();
		135	*buffer = RMAP_Answers[i]->data;
		136	count = RMAP_Answers[i]->len;
		137	RMAP_Answer* tmp=RMAP_Answers[i];
		138	RMAP_Answers.removeAt(i);
		139	delete tmp;
		140	}
		141	}
		142	this->RMAP_AnswersMtx->unlock();
		143	//if no answer found in the stack wait until a new packet is pushed
		144	SocExplorerEngine::message(this->plugin,"waiting until a new packet is pushed",2);
		145	if(*buffer==NULL)
		146	{
		147	while (0==this->RMAP_AnswersSem->available())
		148	{
		149	SocExplorerEngine::message(this->plugin,QString("this->RMAP_AnswersSem->available() = %1").arg(this->RMAP_AnswersSem->available()),2);
		150	if(timeout.elapsed()>=RMAPtimeout)
		151	{
		152	SocExplorerEngine::message(this->plugin,"Timeout reached giving up!",2);
		153	return -1;
		154	}
		155	usleep(1000);
		156	qApp->processEvents();
		157	}
		158	this->RMAP_AnswersSem->acquire();
		159	}
		160	}
		161	return count;
		162	}
		163
		164	int abstractSpwManager::getLinkNumber()
		165	{
		166	return this->linkNumber;
		167	}
		168
		169	void abstractSpwManager::pushRmapPacket(char *packet, int len)
		170	{
		171	char* packetbuffer = (char*)malloc(len);
		172	memcpy(packetbuffer,packet,len);
		173	RMAP_Answer* RMPAPpacket=new RMAP_Answer(RMAP_get_transactionID(packetbuffer+1),packetbuffer,len);
		174	RMAP_AnswersMtx->lock();
		175	RMAP_Answers.append(RMPAPpacket);
		176	RMAP_AnswersMtx->unlock();
		177	}
		178
		179

spwplugin/abstractspwbridge.h +42 0

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2014, Plasma Physics Laboratory - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #ifndef ABSTRACTSPWBRIDGE_H
             #define ABSTRACTSPWBRIDGE_H
             #include <QObject>
+            #include <QThread>
+            #include <QMutex>
+            #include <QSemaphore>
             #include <socexplorerplugin.h>
             #define RMAP_MAX_XFER_SIZE 4000 //slightly less than 16kBytes
             #include <spw.h>
             class RMAP_Answer
             {
               public:
                 RMAP_Answer(int ID,char* data,int len)
                 {
                     transactionID = ID;
                     this->data = data;
                     this->len = len;
                 }
                 int transactionID;
                 char* data;
                 int len;
             };
             class abstractSpwBridge : public QObject
             {
                 Q_OBJECT
             public:
                 explicit abstractSpwBridge(socexplorerplugin *parent);
                 ~abstractSpwBridge();
                 QWidget *getGUI();
             public slots:
                 virtual bool connectBridge();
                 virtual bool disconnectBridge();
                 virtual unsigned int Write(unsigned int *Value,unsigned int count, unsigned int address=0)=0;
                 virtual unsigned int Read(unsigned int *Value,unsigned int count, unsigned int address=0)=0;
                 virtual int pushRMAPPacket(char* packet,int size)=0;
             signals:
                 void setConnected(bool connected);
                 void pushPacketOverTCP(char* packet,int size);
             protected:
                 socexplorerplugin* plugin;
                 QWidget* p_GUI;
             private:
             };
+            class abstractSpwManager: public QThread
+            {
+                Q_OBJECT
+            public:
+                explicit abstractSpwManager(socexplorerplugin *plugin = 0,QObject* parent=0);
+                ~abstractSpwManager();
+                virtual void run(){}
+                virtual bool connectBridge()=0;
+                virtual bool disconnectBridge()=0;
+                int getRMAPtransactionID();
+                int getRMAPanswer(int transactionID,char** buffer);
+                virtual bool sendPacket(char* packet,int size)=0;
+                int RMAPtimeout;
+                int linkNumber;
+                int sourceLogicalAddress;
+                int destinationLogicalAddress;
+                int destinationKey;
+            signals:
+                void emitPacket(char* packet,int size);
+                void bytesReceivedFromSpw( unsigned int );
+                void bytesTransmittedToSpw( unsigned int);
+                void ccsdsPacketTransmittedToSpw( void );
+            public slots:
+                int getLinkNumber();
+            protected:
+                QList<RMAP_Answer*> RMAP_Answers;
+                QList<int> RMAP_pending_transaction_IDs;
+                QMutex *handleMutex,*RMAP_AnswersMtx,*RMAP_pending_transaction_IDsMtx;
+                QSemaphore* RMAP_AnswersSem;
+                socexplorerplugin* plugin;
+                bool connected;
+                void pushRmapPacket(char* packet,int len);
+            };
             #endif // ABSTRACTSPWBRIDGE_H

spwplugin/spwplugin.pro +1 -5

             #
             # Project created by QtCreator 2011-09-20T08:15:30
             #
             #-------------------------------------------------
             CONFIG += socexplorerplugin
             QT += network webkit
             greaterThan(QT_MAJOR_VERSION, 4): QT += webkitwidgets
             QMAKE_CXXFLAGS +=  -std=c++11
             QMAKE_CFLAGS +=  -std=c++11
             win32:CONFIG += dll
             win32:CONFIG -= static
-            VERSION=0.6.1
+            VERSION=0.6.2
             TARGET = spwplugin
             DEFINES += PLUGIN=spwplugin
             DEFINES += PLUGINHEADER="\"\\\"spwplugin.h"\\\"\"
             DEFINES += driver_Name="\"\\\"SpwPlugin"\\\"\"
             DEFINES += driver_Author="\"\\\"Alexis Jeandet alexis.jeandet@member.fsf.org; Paul Leroy paul.leroy@lpp.polytechnique.fr"\\\"\"
             DEFINES += driver_Description="\"\\\"This plugin allows you to use spacewire's RMAP protocol with Stardundee USB brick v1"\\\"\"
             DEFINES += driver_can_be_root=1
             DEFINES += driver_can_be_child=0
             DEFINES += driver_VID=0
             DEFINES += driver_PID=0
-            #STARTDUNDEEPATH=/home/spacewire/usb/spw_usb_driver_v2.68/
-            #LIBS += $$STARTDUNDEEPATH/lib/x86_64/libSpaceWireUSBAPI.so \
-            #    $$STARTDUNDEEPATH/lib/x86_64/libConfigLibraryUSB.so
             INCLUDEPATH += \
                     $${PWD} \
                     $$STARTDUNDEEPATH/inc \
                     StarDundee \
                     SpwTcpPacketServer \
                     GR-ESB
             HEADERS += \
                 spwplugin.h \
                 StarDundee/stardundeespw_usb.h \
                 abstractspwbridge.h \
                 spw.h \
                 StarDundee/stardundeegui.h \
                 SpwTcpPacketServer/spwtcppacketserver.h \
                 GR-ESB/gr_esb_bridge.h \
                 GR-ESB/gr_esb_ui.h \
                 SpwTcpPacketServer/incomingpacketparser.h \
                 StarDundee/fakestardundeespwusb_lib.h \
                 StarDundee/fakestardundeespwusbgui.h
             SOURCES += \
                 spwplugin.cpp \
                 StarDundee/stardundeespw_usb.cpp \
                 abstractspwbridge.cpp \
                 StarDundee/stardundeegui.cpp \
                 SpwTcpPacketServer/spwtcppacketserver.cpp \
                 GR-ESB/gr_esb_bridge.cpp \
                 GR-ESB/gr_esb_ui.cpp \
                 SpwTcpPacketServer/incomingpacketparser.cpp \
                 StarDundee/fakestardundeespwusb_lib.cpp \
                 StarDundee/fakestardundeespwusbgui.cpp
             FORMS += \
                 StarDundee/stardundeeGUI.ui \
                 SpwTcpPacketServer/spwtcppacketserver.ui \
                 GR-ESB/gr_esb_ui.ui \
                 StarDundee/fakestardundeespwusbgui.ui
             RESOURCES += \
                 spwRessources.qrc

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