HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorerPlugins Commit - r64:c92c4a05386a

Improved AHB plugn'play decoding.

jeandet -

r64:c92c4a05386a default

parent child

Context file:

r64:c92c4a05386a

SocExplorer_Plugins.pro +1 -1

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

ambaplugin/AHB/ahbdevicelist.cpp +23 -2

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2011, 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@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #include "ahbdevicelist.h"
+            #include "ahbpluginui.h"
             ahbdevicelist::ahbdevicelist(QWidget *parent):QTableWidget(parent)
             {
                 this->setColumnCount(7);
                 this->setHorizontalHeaderLabels(QStringList() << tr("Device Name")<<tr("BAR0")<<tr("BAR1")<<tr("BAR2")<<tr("BAR3")<<tr("Vendor ID")<<tr("Product ID"));
             }
             void ahbdevicelist::clearAHBdevicesList()
             {
                 this->clear();
                 this->setRowCount(0);
                 this->setHorizontalHeaderLabels(QStringList() << tr("Device Name")<<tr("BAR0")<<tr("BAR1")<<tr("BAR2")<<tr("BAR3")<<tr("Vendor ID")<<tr("Product ID"));
             }
+            QString decodeType(int type)
+            {
+                switch (type) {
+                case AHB_PLUGNPLAY_APB_IO_SPACE:
+                    return "APB IO space";
+                    break;
+                case AHB_PLUGNPLAY_MEMORY_SPACE:
+                    return "Memory space";
+                    break;
+                case AHB_PLUGNPLAY_AHB_IO_SPACE:
+                    return "AHB IO space";
+                    break;
+                default:
+                    return "Unknown type";
+                    break;
+                }
+            }
             void ahbdevicelist::addAHBdevice(ahbdeviceInfo* device)
             {
                 if(this->rowCount()==0)
                 {
                     this->setRowCount(1);
                 }
                 else
                 {
                     this->insertRow(this->rowCount());
                 }
                 this->ahbdevices.append(device);
                 QTableWidgetItem *newItem = new QTableWidgetItem(*device->deviceName);
                 newItem->setFlags(newItem->flags() &~ Qt::ItemIsEditable);
                 this->setItem(this->rowCount()-1, 0, newItem);
                 for(int i=0;i<4;i++)
                 {
                     if(device->BAR[i].size!=0)
                     {
-                        newItem = new QTableWidgetItem("0x" + QString::number(device->BAR[i].address, 16)+" -> 0x"+ QString::number(device->BAR[i].address + device->BAR[i].size-1, 16)+" size = "+device->barAdressSize(i));
+                        newItem = new QTableWidgetItem("0x" + QString::number(device->BAR[i].address, 16)
+                                                       +" -> 0x"+ QString::number(device->BAR[i].address + device->BAR[i].size-1, 16)
+                                                       +" size = "+device->barAdressSize(i)
+                                                       +" "+ decodeType(device->BAR[i].type));
                         newItem->setFlags(newItem->flags() &~ Qt::ItemIsEditable);
                         this->setItem(this->rowCount()-1, i+1, newItem);
                     }
                 }
                 newItem = new QTableWidgetItem("0x" + QString::number(device->VID , 16));
                 newItem->setFlags(newItem->flags() &~ Qt::ItemIsEditable);
                 this->setItem(this->rowCount()-1, 5, newItem);
                 newItem = new QTableWidgetItem("0x" + QString::number(device->PID , 16));
                 newItem->setFlags(newItem->flags() &~ Qt::ItemIsEditable);
                 this->setItem(this->rowCount()-1, 6, newItem);
                 this->resizeColumnsToContents();
             }

ambaplugin/AHB/ahbpluginui.cpp +26 -5

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2011, 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@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #include "ahbpluginui.h"
             #include <socexplorerengine.h>
             ahbPluginUi::ahbPluginUi(socexplorerplugin *plugin, QWidget *parent) :
                 QWidget(parent)
             {
                 this->mainlayout = new QHBoxLayout;
                 this->scanBp = new QPushButton(tr("Scan AHB"));
                 this->deviceslst = new ahbdevicelist;
                 this->mainlayout->addWidget(this->deviceslst);
                 this->mainlayout->addWidget(this->scanBp);
                 this->setLayout(this->mainlayout);
                 this->_plugin = plugin;
                 connect(this,SIGNAL(addAHBdevice(ahbdeviceInfo*)),this->deviceslst,SLOT(addAHBdevice(ahbdeviceInfo*)));
                 connect(this,SIGNAL(clearAHBdevicesList()),this->deviceslst,SLOT(clearAHBdevicesList()));
                 connect(this->scanBp,SIGNAL(clicked()),this,SLOT(scanAHB()));
             }
-            ahbdeviceInfo* ahbPluginUi::extractInfos(int *pnpregs)
+            ahbdeviceInfo* ahbPluginUi::extractInfos(unsigned int *pnpregs)
             {
                 AHBbarreg BAR[4];
                 int VID;
                 int PID;
                 for(int i=0;i<4;i++)
                 {
-                    BAR[i].address = pnpregs[i+4] & 0xfff00000;
+                    unsigned int addr=(pnpregs[i+4] & 0xfff00000)>>20;
-                    BAR[i].size = (pnpregs[i+4] & 0x0000fff0)<<16;
+                    unsigned int mask=(pnpregs[i+4] & 0x0FFF0)>>4;
+                    BAR[i].type = (unsigned char)(pnpregs[i+4]&0x0f);
+                    printf("%x\n",addr);
+                    BAR[i].size = 0;
+                    BAR[i].address = 0;
+                    switch ((int)(BAR[i].type))
+                    {
+                    case AHB_PLUGNPLAY_APB_IO_SPACE:
+                        break;
+                    case AHB_PLUGNPLAY_MEMORY_SPACE:
+                        BAR[i].address = addr<<20;
+                        BAR[i].size = (mask)<<20;
+                        break;
+                    case AHB_PLUGNPLAY_AHB_IO_SPACE:
+                        BAR[i].address = 0xfff00000 + (addr<<8);
+                        BAR[i].size = (mask)<<8;
+                        break;
+                    default:
+                        break;
+                    }
                     if(BAR[i].size!=0)
                         BAR[i].size = (((-1^BAR[i].size)|BAR[i].address)-BAR[i].address)+1;
                     BAR[i].cacheable = (bool)((pnpregs[i+4]&0x00010000)>>16);
                     BAR[i].prefectchable = (bool)((pnpregs[i+4]&0x00020000)>>17);
-                    BAR[i].type = (unsigned char)(pnpregs[i+4]&0xf);
                 }
                 VID = (pnpregs[0]>>24)&0xff;
                 PID = (pnpregs[0]>>12)&0xfff;
                 QString devname = SocExplorerEngine::getDevName(VID,PID);
                 return new ahbdeviceInfo(devname,BAR[0],BAR[1],BAR[2],BAR[3],VID,PID);
             }
             void ahbPluginUi::scanAHB()
             {
                 unsigned int size = (AHB_PLUGNPLAY_SLAVE_STOP - AHB_PLUGNPLAY_MASTER_START)/4;
                 int j=0;
                 unsigned long long i = AHB_PLUGNPLAY_MASTER_START;
                 int pnpregs[size];
                 emit this->clearAHBdevicesList();
                 if( this->_plugin->Read((unsigned int*)pnpregs,size,(unsigned int)AHB_PLUGNPLAY_MASTER_START)==size)
                 {
                     while(i<AHB_PLUGNPLAY_SLAVE_STOP)
                     {
                         if(pnpregs[j]!=0)
                         {
-                            ahbdeviceInfo* devinfo=this->extractInfos(pnpregs+j);
+                            ahbdeviceInfo* devinfo=this->extractInfos((unsigned int*)(pnpregs+j));
                             if(!devinfo->deviceName->compare("DSU3"))
                                 SocExplorerEngine::addEnumDevice(this->_plugin,devinfo->VID,devinfo->PID,devinfo->BAR[0].address,*devinfo->deviceName);
+                            if(!devinfo->deviceName->compare("SDCTRL"))
+                                SocExplorerEngine::addEnumDevice(this->_plugin,devinfo->VID,devinfo->PID,devinfo->BAR[1].address,*devinfo->deviceName);
                             emit this->addAHBdevice(devinfo);
                         }
                         i+=32;
                         j+=8;
                     }
                 }
             }

ambaplugin/AHB/ahbpluginui.h +8 -2

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2011, 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@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #ifndef AHBPLUGINUI_H
             #define AHBPLUGINUI_H
             #include <QWidget>
             #include <QHBoxLayout>
             #include <QPushButton>
             #include "ahbdevicelist.h"
             #include <socexplorerplugin.h>
             #define AHB_PLUGNPLAY_MASTER_START ((unsigned int)(0xFFFFF000))
             #define AHB_PLUGNPLAY_MASTER_STOP  ((unsigned int)(0xFFFFF800))
             #define AHB_PLUGNPLAY_SLAVE_START  ((unsigned int)(0xFFFFF800))
             #define AHB_PLUGNPLAY_SLAVE_STOP   ((unsigned int)(0xFFFFFFFC))
+            /*0001 = APB I/O space
+= AHB Memory space
+= AHB I/O space
+            */
+            #define AHB_PLUGNPLAY_APB_IO_SPACE 0x01
+            #define AHB_PLUGNPLAY_MEMORY_SPACE 0x02
+            #define AHB_PLUGNPLAY_AHB_IO_SPACE 0x03
             class ahbPluginUi : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit ahbPluginUi(socexplorerplugin* plugin,QWidget *parent = 0);
-                ahbdeviceInfo* extractInfos(int* pnpregs);
+                ahbdeviceInfo* extractInfos(unsigned int* pnpregs);
             public slots:
                 void scanAHB();
             signals:
                 void addAHBdevice(ahbdeviceInfo* device);
                 void clearAHBdevicesList();
                 unsigned int WriteSig(unsigned int* Value,unsigned int count,unsigned int address);
                 unsigned int ReadSig(unsigned int* Value,unsigned int count,unsigned int address);
             private:
                 QHBoxLayout* mainlayout;
                 QPushButton* scanBp;
                 ahbdevicelist* deviceslst;
                 socexplorerplugin* _plugin;
             };
             #endif // AHBPLUGINUI_H

ambaplugin/APB/apbpluginui.cpp +7 -2

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2011, 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@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #include "apbpluginui.h"
             #include <stdint.h>
             #include <socexplorerengine.h>
             apbPluginUi::apbPluginUi(socexplorerplugin *plugin, QWidget *parent) :
                 QWidget(parent)
             {
                 this->setWindowTitle(tr("APB Driver"));
                 this->mainlayout = new QHBoxLayout;
                 this->scanBp = new QPushButton(tr("Scan APB"));
                 this->deviceslst = new apbdevicelist;
                 this->mainlayout->addWidget(this->deviceslst);
                 this->mainlayout->addWidget(this->scanBp);
                 this->setLayout(this->mainlayout);
                 this->_plugin = plugin;
                 connect(this,SIGNAL(addAPBdevice(apbdeviceInfo*)),this->deviceslst,SLOT(addAPBdevice(apbdeviceInfo*)));
                 connect(this,SIGNAL(clearAPBdevicesList()),this->deviceslst,SLOT(clearAPBdevicesList()));
                 connect(this->scanBp,SIGNAL(clicked()),this,SLOT(scanAPB()));
             }
             void apbPluginUi::lockScanBp()
             {
                 this->scanBp->setEnabled(false);
             }
             void apbPluginUi::unlockScanBp()
             {
                 this->scanBp->setEnabled(true);
             }
             apbdeviceInfo* apbPluginUi::extractInfos(int *pnpregs)
             {
                 APBbarreg BAR[1];
                 int VID;
                 int PID;
                 for(int i=0;i<1;i++)
                 {
                     BAR[i].address = ((uint32_t)(pnpregs[i+1] & 0xfff00000)>>12)+ APB_BUS_START;
                     BAR[i].size = ((pnpregs[i+1] & 0x00000ff0)>>4 )+1;
                     BAR[i].type = (unsigned char)(pnpregs[i+1]&0xf);
                 }
                 VID = (pnpregs[0]>>24)&0xff;
                 PID = (pnpregs[0]>>12)&0xfff;
                 QString devname = SocExplorerEngine::getDevName(VID,PID);
                 return new apbdeviceInfo(devname,BAR[0],VID,PID);
             }
             void apbPluginUi::scanAPB()
             {
                 this->lockScanBp();
                 unsigned int size = (APB_PLUGNPLAY_STOP - APB_PLUGNPLAY_START)/4;
                 int j=0;
                 unsigned long long i = APB_PLUGNPLAY_START;
                 int pnpregs[size];
                 emit this->clearAPBdevicesList();
+                this->devList.clear();
                 if(this->_plugin->Read((unsigned int*)pnpregs,size,(unsigned int)APB_PLUGNPLAY_START)==size)
                 {
                     while(i<APB_PLUGNPLAY_STOP)
                     {
                         if(pnpregs[j]!=0)
                         {
                             apbdeviceInfo* devinfos=this->extractInfos(pnpregs+j);
                             SocExplorerEngine::addEnumDevice(this->_plugin,devinfos->VID,devinfos->PID,devinfos->BAR[0].address,devinfos->deviceName);
-                            emit this->addAPBdevice(devinfos);
+                            if(!this->devList.contains(devinfos->BAR[0].address))
+                            {
+                                this->devList.append(devinfos->BAR[0].address);
+                                emit this->addAPBdevice(devinfos);
+                            }
                         }
                         i+=8;
                         j+=2;
-                        if(pnpregs[0]==pnpregs[j]&&pnpregs[1]==pnpregs[j+1])break;
+            //            if(pnpregs[0]!=0&&pnpregs[0]==pnpregs[j]&&pnpregs[1]==pnpregs[j+1])break;
                     }
                 }
                 this->unlockScanBp();
             }

ambaplugin/APB/apbpluginui.h +1 0

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2011, 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@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #ifndef APBPLUGINUI_H
             #define APBPLUGINUI_H
             #include <QWidget>
             #include <QHBoxLayout>
             #include <QPushButton>
             #include "apbdevicelist.h"
             #include <socexplorerplugin.h>
             #define APB_BUS_START        ((unsigned int)(0x80000000))
             #define APB_PLUGNPLAY_START  ((unsigned int)(0x800FF000))
             #define APB_PLUGNPLAY_STOP   ((unsigned int)(0x800FFFFF))
             class apbPluginUi : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit apbPluginUi(socexplorerplugin* plugin,QWidget *parent = 0);
                 void lockScanBp();
                 void unlockScanBp();
                 apbdeviceInfo* extractInfos(int* pnpregs);
             signals:
                 void addAPBdevice(apbdeviceInfo* device);
                 void clearAPBdevicesList();
                 unsigned int WriteSig(unsigned int* Value,unsigned int count,unsigned int address);
                 unsigned int ReadSig(unsigned int* Value,unsigned int count,unsigned int address);
             public slots:
                 void scanAPB();
             private:
                 QHBoxLayout* mainlayout;
                 QPushButton* scanBp;
                 apbdevicelist* deviceslst;
                 socexplorerplugin* _plugin;
+                QList<int> devList;
             };
             #endif // APBPLUGINUI_H

ambaplugin/ambaplugin.pro +1 -1

             #
             # Project created by QtCreator 2011-09-20T08:15:30
             #
             #-------------------------------------------------
             CONFIG += socexplorerplugin
             CONFIG += dll
             CONFIG -= static
             VERSION=0.2.0
-            TARGET = ambaplugin #$${DEBUG_EXT}
+            TARGET = ambaplugin
             DEFINES += PLUGIN=ambaplugin
             DEFINES += PLUGINHEADER="\"\\\"ambaplugin.h"\\\"\"
             DEFINES += driver_Name="\"\\\"AMBA_PLUGIN"\\\"\"
             DEFINES += driver_Author="\"\\\"Alexis Jeandet alexis.jeandet@lpp.polytechnique.fr"\\\"\"
             DEFINES += driver_Description="\"\\\"This driver handles the Gaisler AMBA plugn' play system."\\\"\"
             DEFINES += driver_can_be_root=0
             DEFINES += driver_can_be_child=1
             DEFINES += driver_VID=0
             DEFINES += driver_PID=0
             INCLUDEPATH += \
                     $${PWD}
             HEADERS += \
                 ambaplugin.h \
                 AHB/ahbpluginui.h \
                 AHB/ahbdevicelist.h \
                 APB/apbpluginui.h \
                 APB/apbdevicelist.h \
                 ambapluginui.h
             SOURCES += \
                 ambaplugin.cpp \
                 AHB/ahbpluginui.cpp \
                 AHB/ahbdevicelist.cpp \
                 APB/apbpluginui.cpp \
                 APB/apbdevicelist.cpp \
                 ambapluginui.cpp

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