Remove ghosts of syscall access method

* pciutils.h, common.c, lspci.man, setpci.man, lib/internal.h:
Remove shadows of the syscall access method which was never
implemented.
git-archimport-id: mj@ucw.cz--public/pciutils--main--2.2--patch-25

diff --git a/ChangeLog b/ChangeLog
index baef1df9f88984357c7a83f07140fc3cc14fbf3b..11ae1e5a186f39be2eaa0993c4a042a00f751216 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-12-27  Martin Mares  <mj@ucw.cz>
 
+       * pciutils.h, common.c, lspci.man, setpci.man, lib/internal.h:
+       Remove shadows of the syscall access method which was never
+       implemented.
+
        * update-pciids.sh: Try to preserve permissions of the old file
        if chmod supports --reference. Should close Debian Bug #223740.
 

diff --git a/TODO b/TODO
index 9077600764bd861b0aff7fb4f921f15f6f0fc7f7..cb231c45f466df48ea2a041eebb8bf2c2cfbc46b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
-- lib: "syscall" access method
-
 - lspci: don't die when non-root tries to dump cardbus data
 
 - pci.ids: "Unknown mass storage controller" -> "Mass storage controller".

diff --git a/common.c b/common.c
index 846b1e60204653ecaa29703287befe13b0c964d0..723d66b66a882728f28a5e15d77cbde9bdd8af40 100644 (file)
--- a/common.c
+++ b/common.c
@@ -56,11 +56,6 @@ parse_generic_option(int i, struct pci_access *pacc, char *optarg)
        die("Unknown hardware configuration type %s", optarg);
       break;
 #endif
-#ifdef HAVE_PM_SYSCALLS
-    case 'S':
-      pacc->method = PCI_ACCESS_SYSCALLS;
-      break;
-#endif
 #ifdef HAVE_PM_DUMP
     case 'F':
       pacc->method_params[PCI_ACCESS_DUMP] = optarg;

diff --git a/lib/internal.h b/lib/internal.h
index 63f3c9ebaeb2b7f85efa201044ba90e5c2030bd1..8f1f8f8a37608fe0f6eed9f22dac11dae7282b25 100644 (file)
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -99,4 +99,4 @@ struct pci_dev *pci_alloc_dev(struct pci_access *);
 int pci_link_dev(struct pci_access *, struct pci_dev *);
 
 extern struct pci_methods pm_intel_conf1, pm_intel_conf2, pm_linux_proc,
-  pm_syscalls, pm_fbsd_device, pm_aix_device, pm_nbsd_libpci, pm_dump;
+  pm_fbsd_device, pm_aix_device, pm_nbsd_libpci, pm_dump;

diff --git a/lspci.man b/lspci.man
index 18d032c9c7775672cd3212a9f4746fa65d0c41d9..92cf4b62edc2c17af7ddc5c35368920802a8b7cd 100644 (file)
--- a/lspci.man
+++ b/lspci.man
@@ -117,9 +117,6 @@ Use direct hardware access via Intel configuration mechanism 2. Warning: This me
 is able to address only first 16 devices on any bus and it seems to be very
 unrealiable in many cases. (i386 and compatible only)
 .TP
-.B -S
-Use PCI access syscalls. (Linux on Alpha and UltraSparc only)
-.TP
 .B -F <file>
 Extract all information from given file containing output of lspci -x. This is very
 useful for analysis of user-supplied bug reports, because you can display the

diff --git a/pciutils.h b/pciutils.h
index 96313581a81ec3b428e921639d3e049d37be3a1a..9cd5ada7b7bac79bfc07cd097dc722d633c6b9ea 100644 (file)
--- a/pciutils.h
+++ b/pciutils.h
@@ -35,13 +35,6 @@ int parse_generic_option(int i, struct pci_access *pacc, char *optarg);
 #define GENOPT_INTEL
 #define GENHELP_INTEL
 #endif
-#ifdef HAVE_PM_SYSCALLS
-#define GENOPT_SYSCALLS "S"
-#define GENHELP_SYSCALLS "-S\t\tUse direct hardware access via syscalls\n"
-#else
-#define GENOPT_SYSCALLS
-#define GENHELP_SYSCALLS
-#endif
 #ifdef HAVE_PM_DUMP
 #define GENOPT_DUMP "F:"
 #define GENHELP_DUMP "-F <file>\tRead configuration data from given file\n"
@@ -50,6 +43,6 @@ int parse_generic_option(int i, struct pci_access *pacc, char *optarg);
 #define GENHELP_DUMP
 #endif
 
-#define GENERIC_OPTIONS "G" GENOPT_PROC GENOPT_INTEL GENOPT_SYSCALLS GENOPT_DUMP
-#define GENERIC_HELP GENHELP_PROC GENHELP_INTEL GENHELP_SYSCALLS GENHELP_DUMP \
+#define GENERIC_OPTIONS "G" GENOPT_PROC GENOPT_INTEL GENOPT_DUMP
+#define GENERIC_HELP GENHELP_PROC GENHELP_INTEL GENHELP_DUMP \
        "-G\t\tEnable PCI access debugging\n"

diff --git a/setpci.man b/setpci.man
index 486dc77af87f12687234cb2c47e1ba5b9f6e3b99..ce52753cf81a4134abd55a50c881d901ab76a037 100644 (file)
--- a/setpci.man
+++ b/setpci.man
@@ -182,9 +182,6 @@ Use direct hardware access via Intel configuration mechanism 2. Warning: This me
 is able to address only first 16 devices on any bus and it seems to be very
 unrealiable in many cases. (i386 and compatible only)
 .TP
-.B -S
-Use PCI access syscalls. (Linux on Alpha and UltraSparc only)
-.TP
 .B -F <file>
 Extract all information from given file containing output of lspci -x. This is very
 useful for analysis of user-supplied bug reports, because you can display the