[kde-doc-english] [kinfocenter] /: Remove all remaining bits of SCSI module
Sebastian Kügler
sebas at kde.org
Wed Mar 9 19:19:28 UTC 2016
Git commit e12f4a04a3fb9afdaf8998a039c63d136df35276 by Sebastian Kügler.
Committed on 09/03/2016 at 19:17.
Pushed by sebas into branch 'master'.
Remove all remaining bits of SCSI module
M +0 -4 Modules/base/info_aix.cpp
M +0 -41 Modules/base/info_fbsd.cpp
M +0 -4 Modules/base/info_generic.cpp
M +0 -3 Modules/base/info_hpux.cpp
M +0 -6 Modules/base/info_linux.cpp
M +0 -23 Modules/base/info_netbsd.cpp
M +0 -9 Modules/base/info_openbsd.cpp
M +0 -4 Modules/base/info_osx.cpp
M +0 -4 Modules/base/info_sgi.cpp
M +0 -4 Modules/base/info_solaris.cpp
M +0 -11 Modules/base/os_current.h
M +0 -25 doc/index.docbook
http://commits.kde.org/kinfocenter/e12f4a04a3fb9afdaf8998a039c63d136df35276
diff --git a/Modules/base/info_aix.cpp b/Modules/base/info_aix.cpp
index 4875c3a..e8428ec 100644
--- a/Modules/base/info_aix.cpp
+++ b/Modules/base/info_aix.cpp
@@ -187,10 +187,6 @@ bool GetInfo_IO_Ports(QListView *) {
return false;
}
-bool GetInfo_SCSI(QListView *lBox) {
- return list_devices(lBox, (char *)"PdDvLn like '*/scsi/*'");
-}
-
/* Parts taken from fsusage.c from the Midnight Commander (mc)
Copyright (C) 1991, 1992 Free Software Foundation, In
diff --git a/Modules/base/info_fbsd.cpp b/Modules/base/info_fbsd.cpp
index beb1ca2..3c571d3 100644
--- a/Modules/base/info_fbsd.cpp
+++ b/Modules/base/info_fbsd.cpp
@@ -81,47 +81,6 @@ bool GetInfo_IO_Ports(QTreeWidget* tree) {
#endif
}
-bool GetInfo_SCSI(QTreeWidget* tree) {
- FILE *pipe;
- QTextStream *t;
- QString s;
-
- if (!QFileInfo(QLatin1String("/sbin/camcontrol")).exists()) {
- s = i18n("SCSI subsystem could not be queried: /sbin/camcontrol could not be found");
- QStringList list;
- list << s;
- new QTreeWidgetItem(tree, list);
- } else if ((pipe = popen("/sbin/camcontrol devlist 2>&1", "r")) == NULL) {
- s = i18n("SCSI subsystem could not be queried: /sbin/camcontrol could not be executed");
- QStringList list;
- list << s;
- new QTreeWidgetItem(tree, list);
- } else {
-
- /* This prints out a list of all the scsi devies, perhaps eventually we could
- parse it as opposed to schlepping it into a listbox */
-
- t = new QTextStream(pipe, QIODevice::ReadOnly);
-
- while (true) {
- s = t->readLine();
- if (s.isEmpty() )
- break;
- QStringList list;
- list << s;
- new QTreeWidgetItem(tree, list);
- }
-
- delete t;
- pclose(pipe);
- }
-
- if (!tree->topLevelItemCount())
- return false;
-
- return true;
-}
-
bool GetInfo_PCI(QTreeWidget* tree) {
FILE *pipe;
QString s, cmd;
diff --git a/Modules/base/info_generic.cpp b/Modules/base/info_generic.cpp
index 3bf7176..c3f30af 100644
--- a/Modules/base/info_generic.cpp
+++ b/Modules/base/info_generic.cpp
@@ -40,10 +40,6 @@ bool GetInfo_IO_Ports(QTreeWidget*) {
return false;
}
-bool GetInfo_SCSI(QTreeWidget*) {
- return false;
-}
-
bool GetInfo_XServer_and_Video(QTreeWidget* tree) {
return GetInfo_XServer_Generic(tree);
}
diff --git a/Modules/base/info_hpux.cpp b/Modules/base/info_hpux.cpp
index 366e14b..aec89fd 100644
--- a/Modules/base/info_hpux.cpp
+++ b/Modules/base/info_hpux.cpp
@@ -182,9 +182,6 @@ bool GetInfo_IO_Ports(QListView *lBox) {
return GetInfo_ReadfromPipe(lBox, INFO_IOPORTS_2, false);
}
-bool GetInfo_SCSI(QListView *lBox) {
- return GetInfo_ReadfromPipe(lBox, INFO_DEVICES, false);
-}
/* Parts taken from fsusage.c from the Midnight Commander (mc)
Copyright (C) 1991, 1992 Free Software Foundation, In
diff --git a/Modules/base/info_linux.cpp b/Modules/base/info_linux.cpp
index ee22cf4..7a0e410 100644
--- a/Modules/base/info_linux.cpp
+++ b/Modules/base/info_linux.cpp
@@ -50,8 +50,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define INFO_MISC "/proc/misc"
-#define INFO_SCSI "/proc/scsi/scsi"
-
#define MAXCOLUMNWIDTH 600
bool GetInfo_ReadfromFile(QTreeWidget* tree, const char *FileName, const QChar& splitChar) {
@@ -158,10 +156,6 @@ bool GetInfo_IO_Ports(QTreeWidget* tree) {
return GetInfo_ReadfromFile(tree, INFO_IOPORTS, ':');
}
-bool GetInfo_SCSI(QTreeWidget* tree) {
- return GetInfo_ReadfromFile(tree, INFO_SCSI, 0);
-}
-
bool GetInfo_XServer_and_Video(QTreeWidget* tree) {
return GetInfo_XServer_Generic(tree);
}
diff --git a/Modules/base/info_netbsd.cpp b/Modules/base/info_netbsd.cpp
index 0e58756..7ba080b 100644
--- a/Modules/base/info_netbsd.cpp
+++ b/Modules/base/info_netbsd.cpp
@@ -150,29 +150,6 @@ bool GetInfo_IO_Ports(QTreeWidget* tree) {
return true;
}
-bool GetInfo_SCSI(QTreeWidget* tree) {
- if (!GetDmesgInfo(tree, "scsibus", NULL)) {
- QStringList list;
- list << i18n("No SCSI devices found.");
- new QTreeWidgetItem(tree, list);
- }
-
- // remove the 'waiting %d seconds for devices to settle' message
- QTreeWidgetItemIterator it(tree, QTreeWidgetItemIterator::All);
- while ( *it != NULL) {
- QString s = (*it)->text(0);
-
- if (s.contains("seconds for devices to settle")) {
- delete tree->takeTopLevelItem( tree->indexOfTopLevelItem(*it) );
- break;
- }
-
- ++it;
- }
-
- return true;
-}
-
bool GetInfo_XServer_and_Video(QTreeWidget* tree) {
return GetInfo_XServer_Generic(tree);
}
diff --git a/Modules/base/info_openbsd.cpp b/Modules/base/info_openbsd.cpp
index 715644c..4bd033f 100644
--- a/Modules/base/info_openbsd.cpp
+++ b/Modules/base/info_openbsd.cpp
@@ -156,15 +156,6 @@ bool GetInfo_IO_Ports(QTreeWidget* tree) {
return true;
}
-bool GetInfo_SCSI(QTreeWidget* tree) {
- if (!GetDmesgInfo(tree, "scsibus", NULL)) {
- QStringList list;
- list << i18n("No SCSI devices found.");
- new QTreeWidgetItem(tree, list);
- }
- return true;
-}
-
bool GetInfo_XServer_and_Video(QTreeWidget* tree) {
return GetInfo_XServer_Generic(tree);
}
diff --git a/Modules/base/info_osx.cpp b/Modules/base/info_osx.cpp
index d786ad8..9b7cc0a 100644
--- a/Modules/base/info_osx.cpp
+++ b/Modules/base/info_osx.cpp
@@ -57,10 +57,6 @@ bool GetInfo_IO_Ports(QTreeWidget*) {
return false;
}
-bool GetInfo_SCSI(QTreeWidget*) {
- return false;
-}
-
bool GetInfo_XServer_and_Video(QTreeWidget* tree) {
#if HAVE_X11
return GetInfo_XServer_Generic(tree);
diff --git a/Modules/base/info_sgi.cpp b/Modules/base/info_sgi.cpp
index 6635738..9d5f7d9 100644
--- a/Modules/base/info_sgi.cpp
+++ b/Modules/base/info_sgi.cpp
@@ -26,10 +26,6 @@ bool GetInfo_IO_Ports(QListView *) {
return false;
}
-bool GetInfo_SCSI(QListView *) {
- return false;
-}
-
bool GetInfo_XServer_and_Video(QListView *lBox) {
return GetInfo_XServer_Generic(lBox);
}
diff --git a/Modules/base/info_solaris.cpp b/Modules/base/info_solaris.cpp
index 135d8d5..61f871b 100644
--- a/Modules/base/info_solaris.cpp
+++ b/Modules/base/info_solaris.cpp
@@ -30,10 +30,6 @@ bool GetInfo_IO_Ports(QTreeWidget*) {
return false;
}
-bool GetInfo_SCSI(QTreeWidget*) {
- return false;
-}
-
bool GetInfo_XServer_and_Video(QTreeWidget* tree) {
return GetInfo_XServer_Generic(tree);
}
diff --git a/Modules/base/os_current.h b/Modules/base/os_current.h
index d9ca241..884f3fe 100644
--- a/Modules/base/os_current.h
+++ b/Modules/base/os_current.h
@@ -31,7 +31,6 @@ bool GetInfo_IRQ(QTreeWidget* tree);
bool GetInfo_DMA(QTreeWidget* tree);
bool GetInfo_PCI(QTreeWidget* tree);
bool GetInfo_IO_Ports(QTreeWidget* tree);
-bool GetInfo_SCSI(QTreeWidget* tree);
bool GetInfo_XServer_and_Video(QTreeWidget* tree);
bool GetInfo_Wayland(QTreeWidget* tree);
@@ -41,7 +40,6 @@ bool GetInfo_Wayland(QTreeWidget* tree);
#define INFO_IRQ_AVAILABLE
#define INFO_DMA_AVAILABLE
#define INFO_IOPORTS_AVAILABLE
- #define INFO_SCSI_AVAILABLE
#define INFO_XSERVER_AVAILABLE
#define INFO_WAYLAND_AVAILABLE
@@ -54,7 +52,6 @@ bool GetInfo_Wayland(QTreeWidget* tree);
#define INFO_IRQ_AVAILABLE
#define INFO_DMA_AVAILABLE
#define INFO_IOPORTS_AVAILABLE
- #define INFO_SCSI_AVAILABLE
#define INFO_XSERVER_AVAILABLE
#define DEFAULT_ERRORSTRING i18n("This system may not be completely supported yet.")
@@ -64,7 +61,6 @@ bool GetInfo_Wayland(QTreeWidget* tree);
#define INFO_IRQ_AVAILABLE
#define INFO_DMA_AVAILABLE
#define INFO_IOPORTS_AVAILABLE
- #define INFO_SCSI_AVAILABLE
#define INFO_XSERVER_AVAILABLE
#define DEFAULT_ERRORSTRING i18n("This system may not be completely supported yet.")
@@ -75,7 +71,6 @@ bool GetInfo_Wayland(QTreeWidget* tree);
#define INFO_DMA_AVAILABLE
#define INFO_IOPORTS_AVAILABLE
- #define INFO_SCSI_AVAILABLE
#define INFO_XSERVER_AVAILABLE
@@ -86,7 +81,6 @@ bool GetInfo_Wayland(QTreeWidget* tree);
#define INFO_IRQ_AVAILABLE
#define INFO_DMA_AVAILABLE
#define INFO_IOPORTS_AVAILABLE
- #define INFO_SCSI_AVAILABLE
#define INFO_XSERVER_AVAILABLE
#define DEFAULT_ERRORSTRING i18n("This system may not be completely supported yet.")
@@ -96,7 +90,6 @@ bool GetInfo_Wayland(QTreeWidget* tree);
#define INFO_IRQ_AVAILABLE
#define INFO_DMA_AVAILABLE
#define INFO_IOPORTS_AVAILABLE
- #define INFO_SCSI_AVAILABLE
#define INFO_XSERVER_AVAILABLE
#define DEFAULT_ERRORSTRING i18n("This system may not be completely supported yet.")
@@ -106,14 +99,12 @@ bool GetInfo_Wayland(QTreeWidget* tree);
#define INFO_IRQ_AVAILABLE
#define INFO_DMA_AVAILABLE
#define INFO_IOPORTS_AVAILABLE
- #define INFO_SCSI_AVAILABLE
#define INFO_XSERVER_AVAILABLE
#define DEFAULT_ERRORSTRING i18n("This system may not be completely supported yet.")
#elif defined(_AIX)
- #define INFO_SCSI_AVAILABLE
#define INFO_IRQ_AVAILABLE
#define INFO_DMA_AVAILABLE
@@ -127,7 +118,6 @@ bool GetInfo_Wayland(QTreeWidget* tree);
//#define INFO_IRQ_AVAILABLE
//#define INFO_DMA_AVAILABLE
//#define INFO_IOPORTS_AVAILABLE
- #define INFO_SCSI_AVAILABLE
#define INFO_XSERVER_AVAILABLE
#define DEFAULT_ERRORSTRING i18n("This system may not be completely supported yet.")
@@ -137,7 +127,6 @@ bool GetInfo_Wayland(QTreeWidget* tree);
#define INFO_IRQ_AVAILABLE
#define INFO_DMA_AVAILABLE
#define INFO_IOPORTS_AVAILABLE
- #define INFO_SCSI_AVAILABLE
#define INFO_XSERVER_AVAILABLE
#define DEFAULT_ERRORSTRING i18n("This system may not be completely supported yet.")
diff --git a/doc/index.docbook b/doc/index.docbook
index 53f6e43..d56af09 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -512,31 +512,6 @@ second column identifies the device that uses these I/O ports.</para>
<!--****************************************-->
-<sect1 id="scsi">
-<title><acronym>SCSI</acronym> Interface Information Module</title>
-
-<para>This page displays information about Small Computer Systems
-Interface (<acronym>SCSI</acronym>) Interfaces and the attached
-<acronym>SCSI</acronym> devices.</para>
-
-<note><para>The exact information displayed is system-dependent. On
-some systems <acronym>SCSI</acronym> information cannot be displayed
-yet.</para></note>
-
-<para>On &Linux;, this information is read from <filename
-class="devicefile">/proc/scsi/scsi</filename>, which is only available
-if the <filename class="directory">/proc</filename> pseudo-filesystem is
-compiled into the kernel. A listing of all <acronym>SCSI</acronym>
-devices known to the kernel is shown.</para>
-
-<para>The devices are sorted numerically by their host, channel, and
-<acronym>ID</acronym> numbers.</para>
-
-<para>The user cannot modify any settings on this page.</para>
-</sect1>
-
-<!--****************************************-->
-
<sect1 id="kcmusb">
<title><acronym>USB</acronym> Controller/<acronym>USB</acronym> Devices Information Module</title>
More information about the kde-doc-english
mailing list