Remove lspci.

This makes no sense right now, not least because we don't have the database.

Change-Id: I7d56386e81b1995577a9813663a9594357618a02

diff --git a/.config b/.config
index d32351e..f89f1c8 100644 (file)
--- a/.config
+++ b/.config
@@ -204,7 +204,7 @@ CONFIG_LOSETUP=y
 CONFIG_LSATTR=y
 CONFIG_CHATTR=y
 CONFIG_LSMOD=y
-CONFIG_LSPCI=y
+# CONFIG_LSPCI is not set
 CONFIG_LSPCI_TEXT=y
 CONFIG_LSUSB=y
 CONFIG_MAKEDEVS=y

diff --git a/Android.mk b/Android.mk
index 2592b72..fa54f05 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -96,7 +96,6 @@ LOCAL_SRC_FILES := \
     toys/other/losetup.c \
     toys/other/lsattr.c \
     toys/other/lsmod.c \
-    toys/other/lspci.c \
     toys/other/lsusb.c \
     toys/other/makedevs.c \
     toys/other/mkswap.c \
@@ -270,7 +269,6 @@ ALL_TOOLS := \
     logname \
     losetup \
     lsmod \
-    lspci \
     lsusb \
     md5sum \
     mkdir \

diff --git a/generated/config.h b/generated/config.h
index 9127751..cc1ac50 100644 (file)
--- a/generated/config.h
+++ b/generated/config.h
@@ -376,8 +376,8 @@
 #define USE_CHATTR(...) __VA_ARGS__
 #define CFG_LSMOD 1
 #define USE_LSMOD(...) __VA_ARGS__
-#define CFG_LSPCI 1
-#define USE_LSPCI(...) __VA_ARGS__
+#define CFG_LSPCI 0
+#define USE_LSPCI(...)
 #define CFG_LSPCI_TEXT 1
 #define USE_LSPCI_TEXT(...) __VA_ARGS__
 #define CFG_LSUSB 1

diff --git a/generated/flags.h b/generated/flags.h
index be77bbd..47e22f2 100644 (file)
--- a/generated/flags.h
+++ b/generated/flags.h
@@ -1250,9 +1250,9 @@
 #undef FOR_lsmod
 #endif
 
-// lspci emkn@i: emkn@i:
+// lspci   emkn@i:
 #undef OPTSTR_lspci
-#define OPTSTR_lspci "emkn@i:"
+#define OPTSTR_lspci  0 
 #ifdef CLEANUP_lspci
 #undef CLEANUP_lspci
 #undef FOR_lspci
@@ -3734,11 +3734,11 @@
 #ifndef TT
 #define TT this.lspci
 #endif
-#define FLAG_i (1<<0)
-#define FLAG_n (1<<1)
-#define FLAG_k (1<<2)
-#define FLAG_m (1<<3)
-#define FLAG_e (1<<4)
+#define FLAG_i (FORCED_FLAG<<0)
+#define FLAG_n (FORCED_FLAG<<1)
+#define FLAG_k (FORCED_FLAG<<2)
+#define FLAG_m (FORCED_FLAG<<3)
+#define FLAG_e (FORCED_FLAG<<4)
 #endif
 
 #ifdef FOR_lsusb

diff --git a/generated/help.h b/generated/help.h
index 5987648..100f4a0 100644 (file)
--- a/generated/help.h
+++ b/generated/help.h
@@ -160,7 +160,9 @@
 
 #define help_lsusb "usage: lsusb\n\nList USB hosts/devices.\n\n"
 
-#define help_lspci "usage: lspci [-ekmn] [-i FILE ] \n\nList PCI devices.\n-e  Print all 6 digits in class\n-i PCI ID database (default /usr/share/misc/pci.ids)\n-k   Print kernel driver\n-m Machine parseable format\n-n    Numeric output (repeat for readable and numeric)\n"
+#define help_lspci_text "usage: lspci [-n] [-i FILE ]\n\n-n    Numeric output (repeat for readable and numeric)\n-i    PCI ID database (default /usr/share/misc/pci.ids)\n\n\n"
+
+#define help_lspci "usage: lspci [-ekm]\n\nList PCI devices.\n\n-e     Print all 6 digits in class\n-k Print kernel driver\n-m Machine parseable format\n\n"
 
 #define help_lsmod "usage: lsmod\n\nDisplay the currently loaded modules, their sizes and their dependencies.\n\n"