[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/apps/kinfocenter/usbview
From:       Raphael Kubo da Costa <kubito () gmail ! com>
Date:       2009-11-27 14:12:32
Message-ID: 1259331152.431826.21579.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1055175 by rkcosta:

For now, disable usbdevices on FreeBSD >= 8.0; the USB subsytem has changed a lot, so \
we need a new patch for it.


 M  +6 -2      usbdevices.cpp  
 M  +9 -3      usbdevices.h  


--- trunk/KDE/kdebase/apps/kinfocenter/usbview/usbdevices.cpp #1055174:1055175
@@ -199,7 +199,7 @@
 
 	r += i18n("<tr><td><i>Speed</i></td><td>%1 Mbit/s</td></tr>", _speed);
 	r += i18n("<tr><td><i>Channels</i></td><td>%1</td></tr>", _channels);
-#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+#if (defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)) && \
!defined(DISABLE_USBDEVICES_FREEBSD)  if ( _power )
 	r += i18n("<tr><td><i>Power Consumption</i></td><td>%1 mA</td></tr>", _power);
 	else
@@ -290,7 +290,11 @@
 	return d.count();
 }
 
-#else
+#elif (defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)) && \
!defined(DISABLE_USBDEVICES_FREEBSD) +/*
+ * FIXME: The USB subsystem has changed a lot in FreeBSD 8.0
+ *        Support for it must be written.
+ */
 
 /*
  * FreeBSD support by Markus Brueffer <markus@brueffer.de>
--- trunk/KDE/kdebase/apps/kinfocenter/usbview/usbdevices.h #1055174:1055175
@@ -18,8 +18,14 @@
 #include <bus/usb/usb.h>
 #include <QStringList>
 #elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
-#include <dev/usb/usb.h>
-#include <QStringList>
+#include <sys/param.h>
+# if defined(__FreeBSD_version) && __FreeBSD_version >= 800100
+#  define DISABLE_USBDEVICES_FREEBSD
+#  warning "The USB subsystem has changed in 8.0. Disabling."
+# else
+#  include <dev/usb/usb.h>
+#  include <QStringList>
+# endif
 #endif
 
 class USBDB;
@@ -76,7 +82,7 @@
 
 	unsigned int _vendorID, _prodID, _revMajor, _revMinor;
 
-#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+#if (defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)) && \
!defined(DISABLE_USBDEVICES_FREEBSD)  void collectData( int fd, int level, \
usb_device_info &di, int parent );  QStringList _devnodes;
 #endif


[prev in list] [next in list] [prev in thread] [next in thread]