summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/devicesinfo.cpp34
-rw-r--r--noncore/settings/sysinfo/devicesinfo.h2
2 files changed, 35 insertions, 1 deletions
diff --git a/noncore/settings/sysinfo/devicesinfo.cpp b/noncore/settings/sysinfo/devicesinfo.cpp
index 6508d3c..b463e43 100644
--- a/noncore/settings/sysinfo/devicesinfo.cpp
+++ b/noncore/settings/sysinfo/devicesinfo.cpp
@@ -247,49 +247,73 @@ void UsbCategory::populate()
if ( !usbinfofile.exists() || !usbinfofile.open( IO_ReadOnly ) )
{
new UsbDevice( this, "ERROR: /proc/bus/usb/devices not found or unaccessible" );
return;
}
QTextStream usbinfo( &usbinfofile );
int _bus, _level, _parent, _port, _count, _device, _channels, _power;
float _speed;
QString _manufacturer, _product, _serial;
int usbcount = 0;
+ UsbDevice* lastDev = 0;
+ UsbDevice* dev = 0;
while ( !usbinfo.atEnd() )
{
QString line = usbinfo.readLine();
odebug << "got line '" << line << "'" << oendl;
if ( line.startsWith( "T:" ) )
{
sscanf(line.local8Bit().data(), "T: Bus=%2d Lev=%2d Prnt=%2d Port=%d Cnt=%2d Dev#=%3d Spd=%3f MxCh=%2d", &_bus, &_level, &_parent, &_port, &_count, &_device, &_speed, &_channels);
- new UsbDevice( this, QString( "USB Device #%1" ).arg( usbcount++ ) );
+ if ( !_level )
+ {
+ odebug << "adding new bus" << oendl;
+ dev = new UsbDevice( this, QString( "Generic USB Hub Device" ) );
+ lastDev = dev;
+ }
+ else
+ {
+ odebug << "adding new dev" << oendl;
+ dev = new UsbDevice( lastDev, QString( "Generic USB Hub Device" ) );
+ lastDev = dev;
+ }
+ }
+ else if ( line.startsWith( "S: Product" ) )
+ {
+ int dp = line.find( '=' );
+ dev->setText( 0, dp != -1 ? line.right( line.length()-1-dp ) : "<unknown>" );
}
else
{
continue;
}
}
}
//=================================================================================================
Device::Device( Category* parent, const QString& name )
:OListViewItem( parent, name )
{
devinfo = static_cast<QWidget*>( listView()->parent() );
}
+Device::Device( Device* parent, const QString& name )
+ :OListViewItem( parent, name )
+{
+ devinfo = static_cast<QWidget*>( listView()->parent() );
+}
+
Device::~Device()
{
}
QWidget* Device::detailsWidget()
{
return details;
}
//=================================================================================================
CpuDevice::CpuDevice( Category* parent, const QString& name )
@@ -338,15 +362,23 @@ InputDevice::InputDevice( Category* parent, const QString& name )
InputDevice::~InputDevice()
{
}
//=================================================================================================
UsbDevice::UsbDevice( Category* parent, const QString& name )
:Device( parent, name )
{
details = new QPushButton( name, devinfo );
details->hide();
}
+//=================================================================================================
+UsbDevice::UsbDevice( UsbDevice* parent, const QString& name )
+ :Device( parent, name )
+{
+ details = new QPushButton( name, devinfo );
+ details->hide();
+}
+
UsbDevice::~UsbDevice()
{
}
diff --git a/noncore/settings/sysinfo/devicesinfo.h b/noncore/settings/sysinfo/devicesinfo.h
index 586d204..c601a96 100644
--- a/noncore/settings/sysinfo/devicesinfo.h
+++ b/noncore/settings/sysinfo/devicesinfo.h
@@ -112,24 +112,25 @@ class UsbCategory : public Category
public:
UsbCategory( DevicesView* parent );
virtual ~UsbCategory();
virtual void populate();
};
//=================================================================================================
class Device : public Opie::Ui::OListViewItem
{
public:
Device( Category* parent, const QString& name );
+ Device( Device* parent, const QString& name );
~Device();
QWidget* devinfo;
QWidget* details;
virtual QWidget* detailsWidget();
};
//=================================================================================================
class CpuDevice : public Device
{
public:
@@ -157,18 +158,19 @@ class CardDevice : public Device
public:
CardDevice( Category* parent, const QString& name );
~CardDevice();
// virtual QWidget* detailsWidget();
};
//=================================================================================================
class UsbDevice : public Device
{
public:
UsbDevice( Category* parent, const QString& name );
+ UsbDevice( UsbDevice* parent, const QString& name );
~UsbDevice();
// virtual QWidget* detailsWidget();
};
#endif