HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorerPlugins Commit - r51:87980339c225

Updated plugin version management....

jeandet -

r51:87980339c225 default

parent child

Context file:

r51:87980339c225

SocExplorer-plugins.spec created 755 +80 0

@@ -0,0 +1,80
	1	%global upstream_name socexplorer-plugins-0.5
	2
	3	Name: socexplorer-plugins
	4	Version: 0.5
	5	Release: 0%{?dist}
	6	Summary: Base plugins for SocExplorer.
	7	Group: Development/Tools
	8	License: GPLv2
	9	URL: https://hephaistos.lpp.polytechnique.fr/redmine/projects/socexplorer
	10	Source0: https://hephaistos.lpp.polytechnique.fr/redmine/attachments/download/381/socexplorer-plugins-0.5.zip
	11
	12	BuildRequires: python2-devel
	13	BuildRequires: qt5-qtbase-devel
	14	BuildRequires: qt5-qtwebkit-devel
	15	BuildRequires: qt5-qttools-static
	16	BuildRequires: qt5-qttools-devel
	17	BuildRequires: qt5-qtsvg-devel
	18	BuildRequires: qt5-qtxmlpatterns-devel
	19	BuildRequires: elfutils-libelf-devel
	20	BuildRequires: qt5-pythonqt-devel
	21	BuildRequires: socexplorer-devel
	22
	23	%description
	24	SocExplorer is an open source generic System On Chip testing software/framework. This package contains the base plugins for SocExplorer such as AHBUARTplugin for connecting to any grlib based design with an AHBUART.
	25	You will get:
	26	- AHB UART plugin
	27	- APB UART plugin
	28	- AMBA plugin
	29	- DSU3 plugin
	30	- Generic rw plugin
	31	- Memcheck & Memectr plugins
	32
	33	%prep
	34	%setup -q -n %{upstream_name}
	35
	36	%build
	37	%{_qt5_qmake}
	38
	39	make %{?_smp_mflags}
	40
	41	%install
	42	make install INSTALL_ROOT=%{buildroot}
	43
	44	%post -p /sbin/ldconfig
	45
	46	%postun -p /sbin/ldconfig
	47
	48	%files
	49	%{_qt5_libdir}/SocExplorer/plugins/libApbUartPlugin.so*
	50	%{_qt5_libdir}/SocExplorer/plugins/libahbuartplugin.so*
	51	%{_qt5_libdir}/SocExplorer/plugins/libambaplugin.so*
	52	%{_qt5_libdir}/SocExplorer/plugins/libdsu3plugin.so*
	53	%{_qt5_libdir}/SocExplorer/plugins/libgenericrwplugin.so*
	54	%{_qt5_libdir}/SocExplorer/plugins/libmemcheckplugin.so*
	55	%{_qt5_libdir}/SocExplorer/plugins/libmemctrlrplugin.so*
	56
	57	%changelog
	58	* Thu Mar 26 2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.5
	59	-Uses r51 as source.
	60
	61	* Wed Mar 25 2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
	62	-Uses r50 as source.
	63
	64	* Fri Mar 20 2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
	65	-Uses r49 as source.
	66
	67	* Mon Mar 9 2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
	68	-Uses r48 as source.
	69
	70	* Wed Feb 18 2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
	71	-Uses r45 as source.
	72
	73	* Tue Feb 10 2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
	74	-Uses r44 as source.
	75
	76	* Tue Dec 30 2014 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
	77	- Uses r42 as source.
	78
	79	* Sat Jun 28 2014 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.4
	80	- Initial Fedora packaging

spwplugin/SpwTcpPacketServer/incomingpacketparser.cpp created 644 +43 0

@@ -0,0 +1,43
	1	#include "incomingpacketparser.h"
	2
	3	IncomingPacketParser::IncomingPacketParser(QObject *parent) :
	4	QObject(parent)
	5	{
	6	incompleteData = false;
	7	localDataArray.clear();
	8	}
	9
	10	void IncomingPacketParser::processIncomingQByteArray(QByteArray incomingQByteArray)
	11	{
	12	int ccsdsSize;
	13	bool keepParsing;
	14	QByteArray tcPacket;
	15
	16	keepParsing = true;
	17
	18	localDataArray.append( incomingQByteArray );
	19
	20	if (localDataArray.size() >= 4 )
	21	{
	22	while(keepParsing == true)
	23	{
	24	ccsdsSize = ( (unsigned char) localDataArray[1] ) * 256 * 256
	25	+ ( (unsigned char) localDataArray[2] ) * 256
	26	+ ( (unsigned char) localDataArray[3] );
	27
	28	if (localDataArray.size() < (ccsdsSize+4) ) keepParsing = false;
	29	else
	30	{
	31	tcPacket = QByteArray( localDataArray );
	32	tcPacket.resize( ccsdsSize + 4 );
	33
	34	emit sendPacketUsingSpaceWire( tcPacket );
	35
	36	localDataArray.remove(0, ccsdsSize + 4);
	37	}
	38
	39	if (localDataArray.size() >= 4 ) keepParsing = true;
	40	else keepParsing = false;
	41	}
	42	}
	43	}

spwplugin/SpwTcpPacketServer/incomingpacketparser.h created 644 +26 0

@@ -0,0 +1,26
	1	#ifndef INCOMINGTCPARSER_H
	2	#define INCOMINGTCPARSER_H
	3
	4	#include <QObject>
	5
	6	class IncomingPacketParser : public QObject
	7	{
	8	Q_OBJECT
	9	public:
	10	explicit IncomingPacketParser(QObject *parent = 0);
	11
	12	void processIncomingQByteArray(QByteArray incomingQByteArray);
	13
	14	signals:
	15	void sendMessage( QString );
	16	void sendPacketUsingSpaceWire( QByteArray packet );
	17
	18	public slots:
	19
	20	private:
	21	QByteArray localDataArray;
	22	bool incompleteData;
	23
	24	};
	25
	26	#endif // INCOMINGTCPARSER_H

APBUARTPLUGIN/APBUARTPLUGIN.pro +1 -8

             win32:CONFIG += dll
             win32:CONFIG -= static
+            VERSION=1.0.0
-            #CONFIG(debug, debug|release) {
-            #  DEBUG_EXT = _d
-            #} else {
-            #  DEBUG_EXT =
-            #}
             TARGET = ApbUartPlugin  #$${DEBUG_EXT}
             DEFINES += PLUGIN=ApbUartPlugin
             DEFINES += PLUGINHEADER="\"\\\"APBUARTPLUGIN.h"\\\"\"
             DEFINES += driver_Name="\"\\\"APB_UART_PLUGIN"\\\"\"
             DEFINES += driver_Author="\"\\\"Alexis Jeandet alexis.jeandet@member.fsf.org"\\\"\"
-            DEFINES += driver_Version="\"\\\"0.0.1"\\\"\"
             DEFINES += driver_Description="\"\\\"This plugin provides a terminal widget connected to Gaisler\'s APBUART with or without loop-back mode."\\\"\"
             DEFINES += driver_can_be_root=0
             DEFINES += driver_can_be_child=1

SocExplorer_Plugins.pro +1 0

                 memctrlrplugin \
                 memcheckplugin
+            OTHER_FILES += SocExplorer-plugins.spec
             #unix:SUBDIRS +=  spwplugin

ahbuartplugin/ahbuartplugin.pro +1 -6

             TEMPLATE = lib
             CONFIG += dll
             CONFIG -= static
-            #CONFIG(debug, debug|release) {
+            VERSION=1.4.0
-            #  DEBUG_EXT = _d
-            #} else {
-            #  DEBUG_EXT =
-            #}
             TARGET = ahbuartplugin #$${DEBUG_EXT}
             DEFINES += PLUGIN=ahbuartplugin
             DEFINES += PLUGINHEADER="\"\\\"ahbuartplugin.h"\\\"\"
             DEFINES += driver_Name="\"\\\"AHBUARTplugin"\\\"\"
             DEFINES += driver_Author="\"\\\"Alexis Jeandet alexis.jeandet@lpp.polytechnique.fr"\\\"\"
-            DEFINES += driver_Version="\"\\\"1.3.2"\\\"\"
             DEFINES += driver_Description="\"\\\"Gaisler's AHBUART driver, gives master access to AHB bus."\\\"\"
             DEFINES += driver_can_be_root=1
             DEFINES += driver_can_be_child=0

ambaplugin/ambaplugin.pro +1 -6

             CONFIG += socexplorerplugin
             CONFIG += dll
             CONFIG -= static
-            #CONFIG(debug, debug|release) {
+            VERSION=0.2.0
-            #  DEBUG_EXT = _d
-            #} else {
-            #  DEBUG_EXT =
-            #}
             TARGET = ambaplugin #$${DEBUG_EXT}
             DEFINES += PLUGIN=ambaplugin
             DEFINES += PLUGINHEADER="\"\\\"ambaplugin.h"\\\"\"
             DEFINES += driver_Name="\"\\\"AMBA_PLUGIN"\\\"\"
             DEFINES += driver_Author="\"\\\"Alexis Jeandet alexis.jeandet@lpp.polytechnique.fr"\\\"\"
-            DEFINES += driver_Version="\"\\\"0.0.1"\\\"\"
             DEFINES += driver_Description="\"\\\"This driver handles the Gaisler AMBA plugn' play system."\\\"\"
             DEFINES += driver_can_be_root=0
             DEFINES += driver_can_be_child=1

dsu3plugin/dsu3plugin.pro +1 -8

             TEMPLATE = lib
-            #CONFIG(debug, debug|release) {
-            #  DEBUG_EXT = _d
-            #} else {
-            #  DEBUG_EXT =
-            #}
             QMAKE_LFLAGS_RELEASE += --enable-auto-import -mstackrealign
             QMAKE_LFLAGS_DEBUG += --enable-auto-import -mstackrealign
+            VERSION=0.2.0
             TARGET = dsu3plugin #$${DEBUG_EXT}
             DEFINES += PLUGIN=dsu3plugin
             DEFINES += PLUGINHEADER="\"\\\"dsu3plugin.h"\\\"\"
             DEFINES += driver_Name="\"\\\"dsu3plugin"\\\"\"
             DEFINES += driver_Author="\"\\\"Alexis Jeandet alexis.jeandet@lpp.polytechnique.fr"\\\"\"
-            DEFINES += driver_Version="\"\\\"0.0.1"\\\"\"
             DEFINES += driver_Description="\"\\\"DSU driver, works with GAISLER's DSU3 unit."\\\"\"
             DEFINES += driver_can_be_root=0
             DEFINES += driver_can_be_child=1

genericrwplugin/genericrwplugin.pro +2 -7

             CONFIG += dll
             CONFIG -= static
-            #CONFIG(debug, debug|release) {
+            VERSION=1.1.0
-            #  DEBUG_EXT = _d
+            TARGET = genericrwplugin
-            #} else {
-            #  DEBUG_EXT =
-            #}
-            TARGET = genericrwplugin   #$${DEBUG_EXT}
             DEFINES += PLUGIN=genericrwplugin
             DEFINES += PLUGINHEADER="\"\\\"genericrwplugin.h"\\\"\"
             DEFINES += driver_Name="\"\\\"GenericRWplugin"\\\"\"
             DEFINES += driver_Author="\"\\\"Alexis Jeandet alexis.jeandet@lpp.polytechnique.fr"\\\"\"
-            DEFINES += driver_Version="\"\\\"1.1.0"\\\"\"
             DEFINES += driver_Description="\"\\\"Generic plugin, gives you R/W access to any memory area."\\\"\"
             DEFINES += driver_can_be_root=0
             DEFINES += driver_can_be_child=1

memcheckplugin/memcheckplugin.pro +2 -9

             CONFIG += dll
             CONFIG -= static
-            #CONFIG(debug, debug|release) {
+            VERSION=0.1.0
-            #  DEBUG_EXT = _d
+            TARGET = memcheckplugin
-            #} else {
-            #  DEBUG_EXT =
-            #}
-            TARGET = memcheckplugin #$${DEBUG_EXT}
             DEFINES += PLUGIN=memcheckplugin
             DEFINES += PLUGINHEADER="\"\\\"memcheckplugin.h"\\\"\"
             DEFINES += driver_Name="\"\\\"MemChecker"\\\"\"
             DEFINES += driver_Author="\"\\\"Alexis Jeandet alexis.jeandet@lpp.polytechnique.fr"\\\"\"
-            DEFINES += driver_Version="\"\\\"1.0.1"\\\"\"
             DEFINES += driver_Description="\"\\\"Memory controler driver, works with ESA's LEON2 memory controler."\\\"\"
             DEFINES += driver_can_be_root=0
             DEFINES += driver_can_be_child=1

memctrlrplugin/memctrlrplugin.pro +2 -8

             CONFIG += dll
             CONFIG -= static
-            #CONFIG(debug, debug|release) {
+            VERSION=1.0.1
-            #  DEBUG_EXT = _d
+            TARGET = memctrlrplugin
-            #} else {
-            #  DEBUG_EXT =
-            #}
-            TARGET = memctrlrplugin #$${DEBUG_EXT}
             DEFINES += PLUGIN=memctrlrplugin
             DEFINES += PLUGINHEADER="\"\\\"memctrlrplugin.h"\\\"\"
             DEFINES += driver_Name="\"\\\"MemControler"\\\"\"
             DEFINES += driver_Author="\"\\\"Alexis Jeandet alexis.jeandet@lpp.polytechnique.fr"\\\"\"
-            DEFINES += driver_Version="\"\\\"1.0.1"\\\"\"
             DEFINES += driver_Description="\"\\\"Memory controler driver, works with ESA's LEON2 memory controler."\\\"\"
             DEFINES += driver_can_be_root=0
             DEFINES += driver_can_be_child=1

spwplugin/SpwTcpPacketServer/spwtcppacketserver.cpp +7 -7

                 ui->setupUi(this);
                 this->p_bridge = NULL;
                 this->p_server = new QTcpServer();
-                this->incomingTCParser = new IncomingTCParser();
+                this->incomingPacketParser = new IncomingPacketParser();
                 connect(this->ui->startServeQpb,SIGNAL(clicked(bool)),SLOT(toggleServer()));
                 updateHostIP();
                 connect(this->p_server,SIGNAL(newConnection()),this,SLOT(newConnection()));
                 resetStatististics();
-                connect( this->incomingTCParser, SIGNAL(sendPacketUsingSpaceWire(QByteArray)),
+                connect( this->incomingPacketParser, SIGNAL(sendPacketUsingSpaceWire(QByteArray)),
-                         this, SLOT(sendTCUsingSpaceWire(QByteArray)));
+                         this, SLOT(sendSPWPacketUsingSpaceWireaceWire(QByteArray)));
             }
             SpwTcpPacketServer::~SpwTcpPacketServer()
                 QTcpSocket* soc=this->p_server->nextPendingConnection();
                 this->connectedClients.append(soc);
                 this->ui->listWidget->addItem(this->connectedClients.last()->peerAddress().toString());
-                connect(soc,SIGNAL(readyRead()),this,SLOT(parseIncomingTC()));
+                connect(soc,SIGNAL(readyRead()),this,SLOT(parseIncomingPacket()));
             }
-            void SpwTcpPacketServer::parseIncomingTC()
+            void SpwTcpPacketServer::parseIncomingPacket()
             {
                 for(int i=0;i<connectedClients.count();i++)
                 {
                             do
                             {
                                 QByteArray data = soc->readAll();
-                                incomingTCParser->processIncomingQByteArray( data );
+                                incomingPacketParser->processIncomingQByteArray( data );
                             }while(soc->bytesAvailable()!=0);
                         }
                     }
                 }
             }
-            void SpwTcpPacketServer::sendTCUsingSpaceWire(QByteArray data)
+            void SpwTcpPacketServer::sendSPWPacketUsingSpaceWire(QByteArray data)
             {
                 onePacketReceived();
                 if(data[0]==(char)0)  // Protocole = 0 => Host to SpaceWire packet transmission

spwplugin/SpwTcpPacketServer/spwtcppacketserver.h +4 -4

             #include <QTcpServer>
             #include <QList>
             #include <QTcpSocket>
-            #include <incomingtcparser.h>
+            #include <incomingpacketparser.h>
             namespace Ui {
             class SpwTcpPacketServer;
                 void setServerPort(qint32 port);
                 void setServerSetIP(QString ip);
                 void newConnection();
-                void parseIncomingTC();
+                void parseIncomingPacket();
-                void sendTCUsingSpaceWire(QByteArray data );
+                void sendSPWPacketUsingSpaceWire(QByteArray data );
                 void readReady();
                 void resetStatististics();
             private:
                 QList<QTcpSocket*> connectedClients;
                 unsigned int receivedPackets;
                 unsigned int transmittedPackets;
-                IncomingTCParser *incomingTCParser;
+                IncomingPacketParser *incomingPacketParser;
             };
             #endif // SPWTCPPACKETSERVER_H

spwplugin/StarDundee/stardundeespw_usb.cpp 0 -1

             bool stardundeeSPW_USB_Manager::connectBridgeAsInterface()
             {
-            //    QMutexLocker mlock(&this->handleMutex);
                 this->handleMutex->lock();
                 int status;
                 U32 statusControl;

spwplugin/spwplugin.pro +6 -5

             win32:CONFIG += dll
             win32:CONFIG -= static
+            VERSION=0.5.0
             TARGET = spwplugin
             DEFINES += PLUGIN=spwplugin
             DEFINES += PLUGINHEADER="\"\\\"spwplugin.h"\\\"\"
             DEFINES += driver_Name="\"\\\"SpwPlugin"\\\"\"
-            DEFINES += driver_Author="\"\\\"Alexis Jeandet alexis.jeandet@member.fsf.org"\\\"\"
+            DEFINES += driver_Author="\"\\\"Alexis Jeandet alexis.jeandet@member.fsf.org; Paul Leroy paul.leroy@lpp.polytechnique.fr"\\\"\"
-            DEFINES += driver_Version="\"\\\"0.0.1"\\\"\"
+            DEFINES += driver_Description="\"\\\"This plugin allows you to use spacewire's RMAP protocol with Stardundee USB brick v1"\\\"\"
-            DEFINES += driver_Description="\"\\\"Driver description"\\\"\"
             DEFINES += driver_can_be_root=1
             DEFINES += driver_can_be_child=0
             DEFINES += driver_VID=0
                     $${PWD} \
                     $$STARTDUNDEEPATH/inc \
                     StarDundee \
+                    SpwTcpPacketServer \
                     GR-ESB
             HEADERS += \
                 spwpywrapper.h \
                 GR-ESB/gr_esb_bridge.h \
                 GR-ESB/gr_esb_ui.h \
-                incomingtcparser.h
+                SpwTcpPacketServer/incomingpacketparser.h
             SOURCES += \
                 spwpywrapper.cpp \
                 GR-ESB/gr_esb_bridge.cpp \
                 GR-ESB/gr_esb_ui.cpp \
-                incomingtcparser.cpp
+                SpwTcpPacketServer/incomingpacketparser.cpp
             FORMS += \
                 StarDundee/stardundeeGUI.ui \

spwplugin/incomingtcparser.cpp removed 0 -43

NO CONTENT: file was removed

spwplugin/incomingtcparser.h removed 0 -26

NO CONTENT: file was removed

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