List the devices for all supported programmers in "flashrom -L" output
Fix PCI device ID printing.
Remove personal e-mail addresses from the man page, point people to
flashrom@flashrom.org instead.
Corresponding to flashrom svn r1200.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
diff --git a/flashrom.8 b/flashrom.8
index 8cdad6e..667e06b 100644
--- a/flashrom.8
+++ b/flashrom.8
@@ -476,6 +476,9 @@
.B " http://www.flashrom.org/trac/flashrom/newticket"
.sp
or on the flashrom mailing list at
+.B "<flashrom@flashrom.org>"
+.sp
+We recommend to subscribe first at
.sp
.B " http://www.flashrom.org/mailman/listinfo/flashrom"
.sp
@@ -492,73 +495,75 @@
.br
Please see the individual files.
.SH AUTHORS
-Andrew Morgan <ziltro@ziltro.com>
+Andrew Morgan
.br
Carl-Daniel Hailfinger
.br
-Claus Gindhart <claus.gindhart@kontron.com>
+Claus Gindhart
.br
-David Borg <borg.db@gmail.com>
+David Borg
.br
-David Hendricks <dhendrix@google.com>
+David Hendricks
.br
-Dominik Geyer <dominik.geyer@kontron.com>
+Dominik Geyer
.br
Eric Biederman
.br
-Giampiero Giancipoli <gianci@email.it>
+Giampiero Giancipoli
.br
-Helge Wagner <helge.wagner@ge.com>
+Helge Wagner
.br
-Idwer Vollering <vidwer+flashrom@gmail.com>
+Idwer Vollering
.br
-Joe Bao <Zheng.Bao@amd.com>
+Joe Bao
.br
-Jörg Fischer <turboj@gmx.de>
+Jörg Fischer
.br
-Joshua Roys <roysjosh@gmail.com>
+Joshua Roys
.br
-Luc Verhaegen <libv@skynet.be>
+Luc Verhaegen
.br
Li-Ta Lo
.br
-Markus Boas <ryven@ryven.de>
+Markus Boas
.br
-Mattias Mattsson <vitplister@gmail.com>
+Mattias Mattsson
.br
-Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
+Michael Karcher
.br
-Nikolay Petukhov <nikolay.petukhov@gmail.com>
+Nikolay Petukhov
.br
-Patrick Georgi <patrick.georgi@coresystems.de>
+Patrick Georgi
.br
-Peter Lemenkov <lemenkov@gmail.com>
+Peter Lemenkov
.br
-Peter Stuge <peter@stuge.se>
+Peter Stuge
.br
-Reinder E.N. de Haan <lb_reha@mveas.com>
+Reinder E.N. de Haan
.br
-Ronald G. Minnich <rminnich@gmail.com>
+Ronald G. Minnich
.br
-Ronald Hoogenboom <ronald@zonnet.nl>
+Ronald Hoogenboom
.br
-Sean Nelson <audiohacked@gmail.com>
+Sean Nelson
.br
-Stefan Reinauer <stepan@coresystems.de>
+Stefan Reinauer
.br
-Stefan Wildemann <stefan.wildemann@kontron.com>
+Stefan Wildemann
.br
-Stephan Guilloux <stephan.guilloux@free.fr>
+Stephan Guilloux
.br
-Steven James <pyro@linuxlabs.com>
+Steven James
.br
-Uwe Hermann <uwe@hermann-uwe.de>
+Uwe Hermann
.br
Wang Qingpei
.br
Yinghai Lu
.br
-some others
+some others, please see the flashrom svn changelog for details.
+.br
+All authors can be reached via e-mail at <flashrom@flashrom.org>.
.PP
This manual page was written by Uwe Hermann <uwe@hermann-uwe.de>
and Carl-Daniel Hailfinger.
diff --git a/pcidev.c b/pcidev.c
index 933fd4b..45850e7 100644
--- a/pcidev.c
+++ b/pcidev.c
@@ -134,7 +134,7 @@
msg_pinfo("PCI devices:\n");
for (i = 0; devs[i].vendor_name != NULL; i++) {
- msg_pinfo("%s %s [%02x:%02x]%s\n", devs[i].vendor_name,
+ msg_pinfo("%s %s [%04x:%04x]%s\n", devs[i].vendor_name,
devs[i].device_name, devs[i].vendor_id,
devs[i].device_id,
(devs[i].status == NT) ? " (untested)" : "");
diff --git a/print.c b/print.c
index 66b2938..cd14752 100644
--- a/print.c
+++ b/print.c
@@ -238,6 +238,7 @@
printf("\nSupported devices for the %s programmer:\n",
programmer_table[PROGRAMMER_DUMMY].name);
/* FIXME */
+ printf("Dummy device, does nothing and logs all accesses\n");
#endif
#if CONFIG_NIC3COM == 1
printf("\nSupported devices for the %s programmer:\n",
@@ -286,21 +287,25 @@
printf("\nSupported devices for the %s programmer:\n",
programmer_table[PROGRAMMER_SERPROG].name);
/* FIXME */
+ printf("All programmer devices speaking the serprog protocol\n");
#endif
#if CONFIG_BUSPIRATE_SPI == 1
printf("\nSupported devices for the %s programmer:\n",
programmer_table[PROGRAMMER_BUSPIRATE_SPI].name);
/* FIXME */
+ printf("Dangerous Prototypes Bus Pirate\n");
#endif
#if CONFIG_DEDIPROG == 1
printf("\nSupported devices for the %s programmer:\n",
programmer_table[PROGRAMMER_DEDIPROG].name);
/* FIXME */
+ printf("Dediprog SF100\n");
#endif
#if CONFIG_RAYER_SPI == 1
printf("\nSupported devices for the %s programmer:\n",
programmer_table[PROGRAMMER_RAYER_SPI].name);
/* FIXME */
+ printf("RayeR parallel port programmer\n");
#endif
#if CONFIG_NICINTEL_SPI == 1
printf("\nSupported devices for the %s programmer:\n",