Attachment 90741 Details for Bug 179690

[patch] sysfs parsing code

use-sysfs.diff (text/plain), 4.11 KB, created by Dirk Mueller on 2006-06-20 23:11:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dirk Mueller

Created: 2006-06-20 23:11:29 UTC

Size: 4.11 KB

patch

obsolete

>Index: kcontrol/usbview/usbdevices.h
>===================================================================
>--- kcontrol/usbview/usbdevices.h	(revision 552073)
>+++ kcontrol/usbview/usbdevices.h	(working copy)
>@@ -30,6 +30,7 @@ public:
>   USBDevice();
> 
>   void parseLine(QString line);
>+  void parseSysDir(int bus, int parent, int level, QString line);
> 
>   int level() { return _level; };
>   int device() { return _device; };
>@@ -42,6 +43,7 @@ public:
>   static QPtrList<USBDevice> &devices() { return _devices; };
>   static USBDevice *find(int bus, int device);
>   static bool parse(QString fname);
>+  static bool parseSys(QString fname);
> 
> 
> private:
>Index: kcontrol/usbview/kcmusb.cpp
>===================================================================
>--- kcontrol/usbview/kcmusb.cpp	(revision 552073)
>+++ kcontrol/usbview/kcmusb.cpp	(working copy)
>@@ -117,7 +117,7 @@ void USBViewer::refresh()
>   QIntDict<QListViewItem> new_items;
> 
>   if (!USBDevice::parse("/proc/bus/usb/devices"))
>-    USBDevice::parse("/proc/bus/usb/devices_please-use-sysfs-instead");
>+    USBDevice::parseSys("/sys/bus/usb/devices");
> 
>   int level = 0;
>   bool found = true;
>Index: kcontrol/usbview/usbdevices.cpp
>===================================================================
>--- kcontrol/usbview/usbdevices.cpp	(revision 552073)
>+++ kcontrol/usbview/usbdevices.cpp	(working copy)
>@@ -16,6 +16,7 @@
> #include <stdio.h>
> 
> #include <qfile.h>
>+#include <qdir.h>
> #include <qregexp.h>
> 
> #include <klocale.h>
>@@ -24,6 +25,8 @@
> #include "usbdb.h"
> #include "usbdevices.h"
> 
>+#include <math.h>
>+
> #ifdef Q_OS_FREEBSD
> #include <sys/ioctl.h>
> #include <sys/param.h>
>@@ -47,6 +50,66 @@ USBDevice::USBDevice()
>     _db = new USBDB;
> }
> 
>+static QString catFile(QString fname)
>+{
>+  char buffer[256];
>+  QString result;
>+  int fd = ::open(QFile::encodeName(fname), O_RDONLY);
>+  if (fd<0)
>+	return QString::null;
>+
>+  if (fd >= 0)
>+    {
>+      ssize_t count;
>+      while ((count = ::read(fd, buffer, 256)) > 0)
>+	result.append(QString(buffer).left(count));
>+
>+      ::close(fd);
>+    }
>+  return result.stripWhiteSpace();
>+}
>+
>+void USBDevice::parseSysDir(int bus, int parent, int level, QString dname)
>+{
>+  _level = level;
>+  _parent = parent;
>+  _manufacturer = catFile(dname + "/manufacturer");
>+  _product = catFile(dname + "/product");
>+
>+  _bus = bus;
>+  _device = catFile(dname + "/devnum").toUInt();
>+
>+  if (_device == 1)
>+    _product += QString(" (%1)").arg(_bus);
>+
>+  _vendorID = catFile(dname + "/idVendor").toUInt(0, 16);
>+  _prodID = catFile(dname + "/idProduct").toUInt(0, 16);
>+
>+  _class = catFile(dname + "/bDeviceClass").toUInt(0, 16);
>+  _sub = catFile(dname + "/bDeviceSubClass").toUInt(0, 16);
>+  _maxPacketSize = catFile(dname + "/bMaxPacketSize0").toUInt();
>+
>+  _speed = catFile(dname + "/speed").toDouble();
>+  _serial = catFile(dname + "/serial");
>+  _channels = catFile(dname + "/maxchild").toUInt();
>+
>+  double version = catFile(dname + "/version").toDouble();
>+  _verMajor = int(version);
>+  _verMinor = int(10*(version - floor(version)));
>+
>+  QDir dir(dname);
>+  dir.setNameFilter(QString("%1-*").arg(bus));
>+  dir.setFilter(QDir::Dirs);
>+  QStringList list = dir.entryList();
>+
>+  for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
>+    if ((*it).contains(':'))
>+      continue;
>+
>+    USBDevice* dev = new USBDevice();
>+    dev->parseSysDir(bus, ++level, _device, dname + "/" + *it);
>+  }
>+}
> 
> void USBDevice::parseLine(QString line)
> {
>@@ -230,6 +293,27 @@ bool USBDevice::parse(QString fname)
>   return true;
> }
> 
>+bool USBDevice::parseSys(QString dname)
>+{
>+   QDir d(dname);
>+   d.setNameFilter("usb*");
>+   QStringList list = d.entryList();
>+
>+   for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
>+     USBDevice* device = new USBDevice();
>+
>+     int bus = 0;
>+     QRegExp bus_reg("[a-z]*([0-9]+)");
>+     if (bus_reg.search(*it) != -1)
>+         bus = bus_reg.cap(1).toInt();
>+
>+
>+     device->parseSysDir(bus, 0, 0, d.absPath() + "/" + *it);
>+  }
>+
>+  return d.count();
>+}
>+
> #else
> 
> /*
>@@ -302,6 +386,7 @@ void USBDevice::collectData( int fd, int
> }
> 
> 
>+
> bool USBDevice::parse(QString fname)
> {
> 	static bool showErrorMessage = true;

Actions: View | Diff

Attachments on bug 179690: 87056 | 90741