flashrom December 2012

flashrom@flashrom.org

33 participants
119 discussions

Re: [flashrom] [PATCH 4/4] print_wiki.c: add a programmer column to the PCI and USB devices lists
by Stefan Tauner 27 Dec '12

27 Dec '12

On Tue, 25 Dec 2012 12:31:10 +0100 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> self-acked and committed together with the previous one in r1632. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] [PATCH 3/4] Unify usbdev_status and pcidev_status into dev_status.
by Carl-Daniel Hailfinger 27 Dec '12

27 Dec '12

Am 25.12.2012 12:31 schrieb Stefan Tauner: > Once upon a time usbdev_status was created for the ft2232 > programmer. Its IDs are semantically different to pcidev_status > because they indicate USB instead of PCI IDs, but apart from that > both data structures are equal. This change makes life easier for > everything involved in handling and printing the status of devices > that is noted in those structures by combining them into dev_status. > > It is still possible to distinguish between PCI and USB devices > indirectly by using the struct programmer's type field. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Apart from the hunk below (print_supported_pcidevs is dead, kill it and don't just move it), this is Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> > diff --git a/programmer.h b/programmer.h > index e2bb3d8..305bd00 100644 > --- a/programmer.h > +++ b/programmer.h > @@ -241,12 +248,6 @@ int rpci_write_word(struct pci_dev *dev, int reg, uint16_t data); > int rpci_write_long(struct pci_dev *dev, int reg, uint32_t data); > #endif > > -/* print.c */ > -#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV >= 1 > -/* Not needed for CONFIG_INTERNAL, but for all other PCI-based programmers. */ > -void print_supported_pcidevs(const struct pcidev_status *devs); > -#endif > - > struct usbdev_status { > uint16_t vendor_id; > uint16_t device_id; > @@ -262,6 +263,12 @@ struct pcidev_status { > const char *device_name; > }; > > +/* print.c */ > +#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV >= 1 > +/* Not needed for CONFIG_INTERNAL, but for all other PCI-based programmers. */ > +void print_supported_pcidevs(const struct pcidev_status *devs); > +#endif > + > #if CONFIG_INTERNAL == 1 > /* board_enable.c */ > int board_parse_parameter(const char *boardstring, const char **vendor, const char **model); Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

Re: [flashrom] [PATCH 2/4] Refactor PCI and USB device status printing.
by Carl-Daniel Hailfinger 27 Dec '12

27 Dec '12

Am 25.12.2012 12:31 schrieb Stefan Tauner: > To be able to get rid of lots of #ifdefs and centralize programmer-specific > data more... > - introduce two new fields to struct programmer_entry, namely > enum type (OTHER, USB, PCI) and union devs (pcidev_status, usbdev_status > or char *note). > - use those fields to generate device listings in print.c and print_wiki.c. > > Bonus: add printing of USB devices to print_wiki.c and count supported PCI > and USB devices. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Thanks for your patch! > diff --git a/flashrom.c b/flashrom.c > index 77cae7c..b585dc4 100644 > --- a/flashrom.c > +++ b/flashrom.c > @@ -1576,6 +1622,35 @@ int selfcheck(void) > * messages below without jumping through hoops. */ > continue; > } > + switch (p.type) { > + case USB: > + if (p.devs.usb == NULL) { > + msg_gerr("Programmer %s is of type USB, but its device list is NULL!\n", > + p.name); > + ret = 1; > + } > + break; > +#if NEED_PCI == 1 > + case PCI: > + if (p.devs.pci == NULL) { > + msg_gerr("Programmer %s is of type PCI, but its device list is NULL!\n", > + p.name); > + ret = 1; > + } > + break; > +#endif > + case OTHER: > + if (p.devs.note == NULL) { > + if (strcmp("internal", p.name) == 0) > + break; // this is expected, no worry > + msg_gerr("Programmer %s is of type OTHER, but its note is NULL!\n", p.name); > + ret = 1; > + } > + break; Can't you simply handle USB/PCI/OTHER without switch()? After all, devs.pci, devs.usb and devs.note are in a union and you can't detect bugs like .type=USB combined with .devs.note="foobar" anyway. The only special case is the internal programmer. Suggestion: switch(p.type) { case USB: case PCI: case OTHER: /* This is a union, check only one member. */ if (p.devs.note == NULL) { if (strcmp("internal", p.name) == 0) break; /* This one has its device list stored separately. */ msg_gerr("Programmer %s has neither a device list nor a textual description!\n", p.name); ret = 1; break; default: ... > + default: > + msg_gerr("Programmer %s does not have a valid type set!\n", p.name); > + break; > + } > if (p.init == NULL) { > msg_gerr("Programmer %s does not have a valid init function!\n", p.name); > ret = 1; Rest looks ok. Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- http://www.hailfinger.org/

2 5

[commit] r1633 - trunk
by repository service 27 Dec '12

27 Dec '12

Author: stefanct Date: Thu Dec 27 19:40:40 2012 New Revision: 1633 URL: http://flashrom.org/trac/flashrom/changeset/1633 Log: print_wiki.c: print programmers of type OTHER too. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/print_wiki.c Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Thu Dec 27 19:40:36 2012 (r1632) +++ trunk/print_wiki.c Thu Dec 27 19:40:40 2012 (r1633) @@ -373,6 +373,22 @@ } } printf("\n|}\n\n|}\n"); + + printf("\n== Other programmers ==\n\n" + "{%s", th_start); + printf("! align=\"left\" | Programmer\n" + "! align=\"left\" | Note\n\n"); + + for (i = 0; i < PROGRAMMER_INVALID; i++) { + static int c = 0; + const struct programmer_entry prog = programmer_table[i]; + if (prog.type == OTHER && prog.devs.note != NULL) { + c = !c; + printf("|- bgcolor=\"#%s\"\n", (c) ? "eeeeee" : "dddddd"); + printf("| %s || %s", prog.name, prog.devs.note); + } + } + printf("\n|}\n\n|}\n"); } void print_supported_wiki(void)

1 0

[commit] r1632 - trunk
by repository service 27 Dec '12

27 Dec '12

Author: stefanct Date: Thu Dec 27 19:40:36 2012 New Revision: 1632 URL: http://flashrom.org/trac/flashrom/changeset/1632 Log: Unify usbdev_status and pcidev_status into dev_entry. Once upon a time usbdev_status was created for the ft2232 programmer. Its IDs are semantically different to pcidev_status because they indicate USB instead of PCI IDs, but apart from that both data structures are equal. This change makes life easier for everything involved in handling and printing the status of devices that is noted in those structures by combining them into dev_entry. It is still possible to distinguish between PCI and USB devices indirectly by using the struct programmer's type field. Also, add a programmer column to the PCI and USB devices lists. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/atahpt.c trunk/drkaiser.c trunk/flashrom.c trunk/ft2232_spi.c trunk/gfxnvidia.c trunk/nic3com.c trunk/nicintel.c trunk/nicintel_spi.c trunk/nicnatsemi.c trunk/nicrealtek.c trunk/ogp_spi.c trunk/pcidev.c trunk/print.c trunk/print_wiki.c trunk/programmer.h trunk/satamv.c trunk/satasii.c Modified: trunk/atahpt.c ============================================================================== --- trunk/atahpt.c Thu Dec 27 19:40:26 2012 (r1631) +++ trunk/atahpt.c Thu Dec 27 19:40:36 2012 (r1632) @@ -33,7 +33,7 @@ #define PCI_VENDOR_ID_HPT 0x1103 -const struct pcidev_status ata_hpt[] = { +const struct dev_entry ata_hpt[] = { {0x1103, 0x0004, NT, "Highpoint", "HPT366/368/370/370A/372/372N"}, {0x1103, 0x0005, NT, "Highpoint", "HPT372A/372N"}, {0x1103, 0x0006, NT, "Highpoint", "HPT302/302N"}, Modified: trunk/drkaiser.c ============================================================================== --- trunk/drkaiser.c Thu Dec 27 19:40:26 2012 (r1631) +++ trunk/drkaiser.c Thu Dec 27 19:40:36 2012 (r1632) @@ -33,7 +33,7 @@ /* Mask to restrict flash accesses to the 128kB memory window. */ #define DRKAISER_MEMMAP_MASK ((1 << 17) - 1) -const struct pcidev_status drkaiser_pcidev[] = { +const struct dev_entry drkaiser_pcidev[] = { {0x1803, 0x5057, OK, "Dr. Kaiser", "PC-Waechter (Actel FPGA)"}, {0}, Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Thu Dec 27 19:40:26 2012 (r1631) +++ trunk/flashrom.c Thu Dec 27 19:40:36 2012 (r1632) @@ -90,7 +90,7 @@ { .name = "nic3com", .type = PCI, - .devs.pci = nics_3com, + .devs.dev = nics_3com, .init = nic3com_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -103,7 +103,7 @@ /* This programmer works for Realtek RTL8139 and SMC 1211. */ .name = "nicrealtek", .type = PCI, - .devs.pci = nics_realtek, + .devs.dev = nics_realtek, .init = nicrealtek_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -115,7 +115,7 @@ { .name = "nicnatsemi", .type = PCI, - .devs.pci = nics_natsemi, + .devs.dev = nics_natsemi, .init = nicnatsemi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -127,7 +127,7 @@ { .name = "gfxnvidia", .type = PCI, - .devs.pci = gfx_nvidia, + .devs.dev = gfx_nvidia, .init = gfxnvidia_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -139,7 +139,7 @@ { .name = "drkaiser", .type = PCI, - .devs.pci = drkaiser_pcidev, + .devs.dev = drkaiser_pcidev, .init = drkaiser_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -151,7 +151,7 @@ { .name = "satasii", .type = PCI, - .devs.pci = satas_sii, + .devs.dev = satas_sii, .init = satasii_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -163,7 +163,7 @@ { .name = "atahpt", .type = PCI, - .devs.pci = ata_hpt, + .devs.dev = ata_hpt, .init = atahpt_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -175,7 +175,7 @@ { .name = "ft2232_spi", .type = USB, - .devs.usb = devs_ft2232spi, + .devs.dev = devs_ft2232spi, .init = ft2232_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -252,7 +252,7 @@ { .name = "nicintel", .type = PCI, - .devs.pci = nics_intel, + .devs.dev = nics_intel, .init = nicintel_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -264,7 +264,7 @@ { .name = "nicintel_spi", .type = PCI, - .devs.pci = nics_intel_spi, + .devs.dev = nics_intel_spi, .init = nicintel_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -276,7 +276,7 @@ { .name = "ogp_spi", .type = PCI, - .devs.pci = ogp_spi, + .devs.dev = ogp_spi, .init = ogp_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -288,7 +288,7 @@ { .name = "satamv", .type = PCI, - .devs.pci = satas_mv, + .devs.dev = satas_mv, .init = satamv_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, Modified: trunk/ft2232_spi.c ============================================================================== --- trunk/ft2232_spi.c Thu Dec 27 19:40:26 2012 (r1631) +++ trunk/ft2232_spi.c Thu Dec 27 19:40:36 2012 (r1632) @@ -57,7 +57,7 @@ #define OLIMEX_ARM_OCD_H_PID 0x002B #define OLIMEX_ARM_TINY_H_PID 0x002A -const struct usbdev_status devs_ft2232spi[] = { +const struct dev_entry devs_ft2232spi[] = { {FTDI_VID, FTDI_FT2232H_PID, OK, "FTDI", "FT2232H"}, {FTDI_VID, FTDI_FT4232H_PID, OK, "FTDI", "FT4232H"}, {FTDI_VID, FTDI_FT232H_PID, OK, "FTDI", "FT232H"}, Modified: trunk/gfxnvidia.c ============================================================================== --- trunk/gfxnvidia.c Thu Dec 27 19:40:26 2012 (r1631) +++ trunk/gfxnvidia.c Thu Dec 27 19:40:36 2012 (r1632) @@ -34,7 +34,7 @@ uint8_t *nvidia_bar; -const struct pcidev_status gfx_nvidia[] = { +const struct dev_entry gfx_nvidia[] = { {0x10de, 0x0010, NT, "NVIDIA", "Mutara V08 [NV2]" }, {0x10de, 0x0018, NT, "NVIDIA", "RIVA 128" }, {0x10de, 0x0020, NT, "NVIDIA", "RIVA TNT" }, Modified: trunk/nic3com.c ============================================================================== --- trunk/nic3com.c Thu Dec 27 19:40:26 2012 (r1631) +++ trunk/nic3com.c Thu Dec 27 19:40:36 2012 (r1632) @@ -36,7 +36,7 @@ static uint32_t internal_conf; static uint16_t id; -const struct pcidev_status nics_3com[] = { +const struct dev_entry nics_3com[] = { /* 3C90xB */ {0x10b7, 0x9055, OK, "3COM", "3C90xB: PCI 10/100 Mbps; shared 10BASE-T/100BASE-TX"}, {0x10b7, 0x9001, NT, "3COM", "3C90xB: PCI 10/100 Mbps; shared 10BASE-T/100BASE-T4" }, Modified: trunk/nicintel.c ============================================================================== --- trunk/nicintel.c Thu Dec 27 19:40:26 2012 (r1631) +++ trunk/nicintel.c Thu Dec 27 19:40:36 2012 (r1632) @@ -27,7 +27,7 @@ uint8_t *nicintel_bar; uint8_t *nicintel_control_bar; -const struct pcidev_status nics_intel[] = { +const struct dev_entry nics_intel[] = { {PCI_VENDOR_ID_INTEL, 0x1209, NT, "Intel", "8255xER/82551IT Fast Ethernet Controller"}, {PCI_VENDOR_ID_INTEL, 0x1229, OK, "Intel", "82557/8/9/0/1 Ethernet Pro 100"}, Modified: trunk/nicintel_spi.c ============================================================================== --- trunk/nicintel_spi.c Thu Dec 27 19:40:26 2012 (r1631) +++ trunk/nicintel_spi.c Thu Dec 27 19:40:36 2012 (r1632) @@ -67,7 +67,7 @@ uint8_t *nicintel_spibar; -const struct pcidev_status nics_intel_spi[] = { +const struct dev_entry nics_intel_spi[] = { {PCI_VENDOR_ID_INTEL, 0x105e, OK, "Intel", "82571EB Gigabit Ethernet Controller"}, {PCI_VENDOR_ID_INTEL, 0x1076, OK, "Intel", "82541GI Gigabit Ethernet Controller"}, {PCI_VENDOR_ID_INTEL, 0x107c, OK, "Intel", "82541PI Gigabit Ethernet Controller"}, Modified: trunk/nicnatsemi.c ============================================================================== --- trunk/nicnatsemi.c Thu Dec 27 19:40:26 2012 (r1631) +++ trunk/nicnatsemi.c Thu Dec 27 19:40:36 2012 (r1632) @@ -30,7 +30,7 @@ #define BOOT_ROM_ADDR 0x50 #define BOOT_ROM_DATA 0x54 -const struct pcidev_status nics_natsemi[] = { +const struct dev_entry nics_natsemi[] = { {0x100b, 0x0020, NT, "National Semiconductor", "DP83815/DP83816"}, {0x100b, 0x0022, NT, "National Semiconductor", "DP83820"}, Modified: trunk/nicrealtek.c ============================================================================== --- trunk/nicrealtek.c Thu Dec 27 19:40:26 2012 (r1631) +++ trunk/nicrealtek.c Thu Dec 27 19:40:36 2012 (r1632) @@ -30,7 +30,7 @@ static int bios_rom_addr, bios_rom_data; -const struct pcidev_status nics_realtek[] = { +const struct dev_entry nics_realtek[] = { {0x10ec, 0x8139, OK, "Realtek", "RTL8139/8139C/8139C+"}, {0x10ec, 0x8169, NT, "Realtek", "RTL8169"}, {0x1113, 0x1211, OK, "SMC", "1211TX"}, /* RTL8139 clone */ Modified: trunk/ogp_spi.c ============================================================================== --- trunk/ogp_spi.c Thu Dec 27 19:40:26 2012 (r1631) +++ trunk/ogp_spi.c Thu Dec 27 19:40:36 2012 (r1632) @@ -47,7 +47,7 @@ static uint32_t ogp_reg__ce; static uint32_t ogp_reg_sck; -const struct pcidev_status ogp_spi[] = { +const struct dev_entry ogp_spi[] = { {PCI_VENDOR_ID_OGP, 0x0000, OK, "Open Graphics Project", "Development Board OGD1"}, {0}, Modified: trunk/pcidev.c ============================================================================== --- trunk/pcidev.c Thu Dec 27 19:40:26 2012 (r1631) +++ trunk/pcidev.c Thu Dec 27 19:40:36 2012 (r1632) @@ -154,7 +154,7 @@ return (uintptr_t)addr; } -uintptr_t pcidev_init(int bar, const struct pcidev_status *devs) +uintptr_t pcidev_init(int bar, const struct dev_entry *devs) { struct pci_dev *dev; struct pci_filter filter; Modified: trunk/print.c ============================================================================== --- trunk/print.c Thu Dec 27 19:40:26 2012 (r1631) +++ trunk/print.c Thu Dec 27 19:40:36 2012 (r1632) @@ -433,29 +433,18 @@ } #endif -void print_supported_usbdevs(const struct usbdev_status *devs) +void print_supported_devs(const struct programmer_entry prog, const char *const type) { int i; - msg_pinfo("USB devices:\n"); + const struct dev_entry *const devs = prog.devs.dev; + msg_ginfo("\nSupported %s devices for the %s programmer:\n", type, prog.name); for (i = 0; devs[i].vendor_name != NULL; i++) { 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)" : ""); } } -#if NEED_PCI == 1 -void print_supported_pcidevs(const struct pcidev_status *devs) -{ - int i; - - for (i = 0; devs[i].vendor_name != NULL; i++) { - 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)" : ""); - } -} -#endif - int print_supported(void) { unsigned int i; @@ -478,20 +467,18 @@ const struct programmer_entry prog = programmer_table[i]; switch (prog.type) { case USB: - msg_ginfo("\nSupported USB devices for the %s programmer:\n", prog.name); - print_supported_usbdevs(prog.devs.usb); + print_supported_devs(prog, "USB"); break; #if NEED_PCI == 1 case PCI: - msg_ginfo("\nSupported PCI devices for the %s programmer:\n", prog.name); - print_supported_pcidevs(prog.devs.pci); + print_supported_devs(prog, "PCI"); break; #endif case OTHER: - if (prog.devs.note == NULL) - break; - msg_ginfo("\nSupported devices for the %s programmer:\n", prog.name); - msg_ginfo("%s", prog.devs.note); + if (prog.devs.note != NULL) { + msg_ginfo("\nSupported devices for the %s programmer:\n", prog.name); + msg_ginfo("%s", prog.devs.note); + } break; default: msg_gerr("\n%s: %s: Uninitialized programmer type! Please report a bug at " Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Thu Dec 27 19:40:26 2012 (r1631) +++ trunk/print_wiki.c Thu Dec 27 19:40:36 2012 (r1632) @@ -77,6 +77,7 @@ | align=\"center\" | Min \n| align=\"center\" | Max\n\n"; static const char programmer_th[] = "\ +! align=\"left\" | Programmer\n\ ! align=\"left\" | Vendor\n\ ! align=\"left\" | Device\n\ ! align=\"center\" | IDs\n\ @@ -300,51 +301,31 @@ /* Following functions are not needed when no PCI/USB programmers are compiled in, * but since print_wiki code has no size constraints we include it unconditionally. */ -static int count_supported_pcidevs_wiki(const struct pcidev_status *devs) +static int count_supported_devs_wiki(const struct dev_entry *devs) { unsigned int count = 0; unsigned int i = 0; - for (i = 0; devs[i].vendor_name != NULL; i++) + for (i = 0; devs[i].vendor_id != 0; i++) count++; return count; } -static void print_supported_pcidevs_wiki_helper(const struct pcidev_status *devs) +static void print_supported_devs_wiki_helper(const struct programmer_entry prog) { int i = 0; static int c = 0; + const struct dev_entry *devs = prog.devs.dev; + const unsigned int count = count_supported_devs_wiki(devs); /* Alternate colors if the vendor changes. */ c = !c; - for (i = 0; devs[i].vendor_name != NULL; i++) { - printf("|- bgcolor=\"#%s\"\n| %s || %s || %04x:%04x || {{%s}}\n", (c) ? "eeeeee" : "dddddd", - devs[i].vendor_name, devs[i].device_name, devs[i].vendor_id, devs[i].device_id, - (devs[i].status == NT) ? "?3" : "OK"); - } -} - -static int count_supported_usbdevs_wiki(const struct usbdev_status *devs) -{ - unsigned int count = 0; - unsigned int i = 0; - for (i = 0; devs[i].vendor_name != NULL; i++) - count++; - return count; -} - -static void print_supported_usbdevs_wiki_helper(const struct usbdev_status *devs) -{ - int i = 0; - static int c = 0; - - /* Alternate colors if the vendor changes. */ - c = !c; - - for (i = 0; devs[i].vendor_name != NULL; i++) { - printf("|- bgcolor=\"#%s\"\n| %s || %s || %04x:%04x || {{%s}}\n", (c) ? "eeeeee" : "dddddd", - devs[i].vendor_name, devs[i].device_name, devs[i].vendor_id, devs[i].device_id, - (devs[i].status == NT) ? "?3" : "OK"); + for (i = 0; devs[i].vendor_id != 0; i++) { + printf("|- bgcolor=\"#%s\"\n", (c) ? "eeeeee" : "dddddd"); + if (i == 0) + printf("| rowspan=\"%u\" | %s |", count, prog.name); + printf("| %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) ? "?3" : "OK"); } } @@ -358,10 +339,10 @@ const struct programmer_entry prog = programmer_table[i]; switch (prog.type) { case USB: - usb_count += count_supported_usbdevs_wiki(prog.devs.usb); + usb_count += count_supported_devs_wiki(prog.devs.dev); break; case PCI: - pci_count += count_supported_pcidevs_wiki(prog.devs.pci); + pci_count += count_supported_devs_wiki(prog.devs.dev); break; case OTHER: default: @@ -376,7 +357,7 @@ for (i = 0; i < PROGRAMMER_INVALID; i++) { const struct programmer_entry prog = programmer_table[i]; if (prog.type == PCI) { - print_supported_pcidevs_wiki_helper(prog.devs.pci); + print_supported_devs_wiki_helper(prog); } } printf("\n|}\n\n|}\n"); @@ -388,7 +369,7 @@ for (i = 0; i < PROGRAMMER_INVALID; i++) { const struct programmer_entry prog = programmer_table[i]; if (prog.type == USB) { - print_supported_usbdevs_wiki_helper(prog.devs.usb); + print_supported_devs_wiki_helper(prog); } } printf("\n|}\n\n|}\n"); Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Thu Dec 27 19:40:26 2012 (r1631) +++ trunk/programmer.h Thu Dec 27 19:40:36 2012 (r1632) @@ -96,12 +96,19 @@ OTHER, }; +struct dev_entry { + uint16_t vendor_id; + uint16_t device_id; + const enum test_state status; + const char *vendor_name; + const char *device_name; +}; + struct programmer_entry { const char *name; const enum programmer_type type; union { - const struct pcidev_status *const pci; - const struct usbdev_status *const usb; + const struct dev_entry *const dev; const char *const note; } devs; @@ -232,7 +239,7 @@ extern struct pci_access *pacc; extern struct pci_dev *pcidev_dev; uintptr_t pcidev_readbar(struct pci_dev *dev, int bar); -uintptr_t pcidev_init(int bar, const struct pcidev_status *devs); +uintptr_t pcidev_init(int bar, const struct dev_entry *devs); /* rpci_write_* are reversible writes. The original PCI config space register * contents will be restored on shutdown. */ @@ -241,27 +248,6 @@ int rpci_write_long(struct pci_dev *dev, int reg, uint32_t data); #endif -/* print.c */ -#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV >= 1 -/* Not needed for CONFIG_INTERNAL, but for all other PCI-based programmers. */ -void print_supported_pcidevs(const struct pcidev_status *devs); -#endif - -struct usbdev_status { - uint16_t vendor_id; - uint16_t device_id; - const enum test_state status; - const char *vendor_name; - const char *device_name; -}; -struct pcidev_status { - uint16_t vendor_id; - uint16_t device_id; - const enum test_state status; - const char *vendor_name; - const char *device_name; -}; - #if CONFIG_INTERNAL == 1 /* board_enable.c */ int board_parse_parameter(const char *boardstring, const char **vendor, const char **model); @@ -375,74 +361,73 @@ /* nic3com.c */ #if CONFIG_NIC3COM == 1 int nic3com_init(void); -extern const struct pcidev_status nics_3com[]; +extern const struct dev_entry nics_3com[]; #endif /* gfxnvidia.c */ #if CONFIG_GFXNVIDIA == 1 int gfxnvidia_init(void); -extern const struct pcidev_status gfx_nvidia[]; +extern const struct dev_entry gfx_nvidia[]; #endif /* drkaiser.c */ #if CONFIG_DRKAISER == 1 int drkaiser_init(void); -extern const struct pcidev_status drkaiser_pcidev[]; +extern const struct dev_entry drkaiser_pcidev[]; #endif /* nicrealtek.c */ #if CONFIG_NICREALTEK == 1 int nicrealtek_init(void); -extern const struct pcidev_status nics_realtek[]; +extern const struct dev_entry nics_realtek[]; #endif /* nicnatsemi.c */ #if CONFIG_NICNATSEMI == 1 int nicnatsemi_init(void); -extern const struct pcidev_status nics_natsemi[]; +extern const struct dev_entry nics_natsemi[]; #endif /* nicintel.c */ #if CONFIG_NICINTEL == 1 int nicintel_init(void); -extern const struct pcidev_status nics_intel[]; +extern const struct dev_entry nics_intel[]; #endif /* nicintel_spi.c */ #if CONFIG_NICINTEL_SPI == 1 int nicintel_spi_init(void); -extern const struct pcidev_status nics_intel_spi[]; +extern const struct dev_entry nics_intel_spi[]; #endif /* ogp_spi.c */ #if CONFIG_OGP_SPI == 1 int ogp_spi_init(void); -extern const struct pcidev_status ogp_spi[]; +extern const struct dev_entry ogp_spi[]; #endif /* satamv.c */ #if CONFIG_SATAMV == 1 int satamv_init(void); -extern const struct pcidev_status satas_mv[]; +extern const struct dev_entry satas_mv[]; #endif /* satasii.c */ #if CONFIG_SATASII == 1 int satasii_init(void); -extern const struct pcidev_status satas_sii[]; +extern const struct dev_entry satas_sii[]; #endif /* atahpt.c */ #if CONFIG_ATAHPT == 1 int atahpt_init(void); -extern const struct pcidev_status ata_hpt[]; +extern const struct dev_entry ata_hpt[]; #endif /* ft2232_spi.c */ #if CONFIG_FT2232_SPI == 1 int ft2232_spi_init(void); -extern const struct usbdev_status devs_ft2232spi[]; -void print_supported_usbdevs(const struct usbdev_status *devs); +extern const struct dev_entry devs_ft2232spi[]; #endif /* rayer_spi.c */ Modified: trunk/satamv.c ============================================================================== --- trunk/satamv.c Thu Dec 27 19:40:26 2012 (r1631) +++ trunk/satamv.c Thu Dec 27 19:40:36 2012 (r1632) @@ -29,7 +29,7 @@ uint8_t *mv_bar; uint16_t mv_iobar; -const struct pcidev_status satas_mv[] = { +const struct dev_entry satas_mv[] = { /* 88SX6041 and 88SX6042 are the same according to the datasheet. */ {0x11ab, 0x7042, OK, "Marvell", "88SX7042 PCI-e 4-port SATA-II"}, Modified: trunk/satasii.c ============================================================================== --- trunk/satasii.c Thu Dec 27 19:40:26 2012 (r1631) +++ trunk/satasii.c Thu Dec 27 19:40:36 2012 (r1632) @@ -30,7 +30,7 @@ static uint8_t *sii_bar; static uint16_t id; -const struct pcidev_status satas_sii[] = { +const struct dev_entry satas_sii[] = { {0x1095, 0x0680, OK, "Silicon Image", "PCI0680 Ultra ATA-133 Host Ctrl"}, {0x1095, 0x3112, OK, "Silicon Image", "SiI 3112 [SATALink/SATARaid] SATA Ctrl"}, {0x1095, 0x3114, OK, "Silicon Image", "SiI 3114 [SATALink/SATARaid] SATA Ctrl"},

1 0

[commit] r1631 - trunk
by repository service 27 Dec '12

27 Dec '12

Author: stefanct Date: Thu Dec 27 19:40:26 2012 New Revision: 1631 URL: http://flashrom.org/trac/flashrom/changeset/1631 Log: Refactor PCI and USB device status printing. To be able to get rid of lots of #ifdefs and centralize programmer-specific data more... - introduce two new fields to struct programmer_entry, namely enum type (OTHER, USB, PCI) and union devs (pcidev_status, usbdev_status or char *note). - use those fields to generate device listings in print.c and print_wiki.c. Bonus: add printing of USB devices to print_wiki.c and count supported PCI and USB devices. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/flashrom.c trunk/ft2232_spi.c trunk/pcidev.c trunk/print.c trunk/print_wiki.c trunk/programmer.h Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Wed Dec 26 20:51:23 2012 (r1630) +++ trunk/flashrom.c Thu Dec 27 19:40:26 2012 (r1631) @@ -64,6 +64,8 @@ #if CONFIG_INTERNAL == 1 { .name = "internal", + .type = OTHER, + .devs.note = NULL, .init = internal_init, .map_flash_region = physmap, .unmap_flash_region = physunmap, @@ -74,6 +76,9 @@ #if CONFIG_DUMMY == 1 { .name = "dummy", + .type = OTHER, + /* FIXME */ + .devs.note = "Dummy device, does nothing and logs all accesses\n", .init = dummy_init, .map_flash_region = dummy_map, .unmap_flash_region = dummy_unmap, @@ -84,6 +89,8 @@ #if CONFIG_NIC3COM == 1 { .name = "nic3com", + .type = PCI, + .devs.pci = nics_3com, .init = nic3com_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -95,6 +102,8 @@ { /* This programmer works for Realtek RTL8139 and SMC 1211. */ .name = "nicrealtek", + .type = PCI, + .devs.pci = nics_realtek, .init = nicrealtek_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -105,6 +114,8 @@ #if CONFIG_NICNATSEMI == 1 { .name = "nicnatsemi", + .type = PCI, + .devs.pci = nics_natsemi, .init = nicnatsemi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -115,6 +126,8 @@ #if CONFIG_GFXNVIDIA == 1 { .name = "gfxnvidia", + .type = PCI, + .devs.pci = gfx_nvidia, .init = gfxnvidia_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -125,6 +138,8 @@ #if CONFIG_DRKAISER == 1 { .name = "drkaiser", + .type = PCI, + .devs.pci = drkaiser_pcidev, .init = drkaiser_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -135,6 +150,8 @@ #if CONFIG_SATASII == 1 { .name = "satasii", + .type = PCI, + .devs.pci = satas_sii, .init = satasii_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -145,6 +162,8 @@ #if CONFIG_ATAHPT == 1 { .name = "atahpt", + .type = PCI, + .devs.pci = ata_hpt, .init = atahpt_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -155,6 +174,8 @@ #if CONFIG_FT2232_SPI == 1 { .name = "ft2232_spi", + .type = USB, + .devs.usb = devs_ft2232spi, .init = ft2232_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -165,6 +186,9 @@ #if CONFIG_SERPROG == 1 { .name = "serprog", + .type = OTHER, + /* FIXME */ + .devs.note = "All programmer devices speaking the serprog protocol\n", .init = serprog_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -175,6 +199,9 @@ #if CONFIG_BUSPIRATE_SPI == 1 { .name = "buspirate_spi", + .type = OTHER, + /* FIXME */ + .devs.note = "Dangerous Prototypes Bus Pirate\n", .init = buspirate_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -185,6 +212,9 @@ #if CONFIG_DEDIPROG == 1 { .name = "dediprog", + .type = OTHER, + /* FIXME */ + .devs.note = "Dediprog SF100\n", .init = dediprog_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -195,6 +225,9 @@ #if CONFIG_RAYER_SPI == 1 { .name = "rayer_spi", + .type = OTHER, + /* FIXME */ + .devs.note = "RayeR parallel port programmer\n", .init = rayer_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -205,16 +238,21 @@ #if CONFIG_PONY_SPI == 1 { .name = "pony_spi", + .type = OTHER, + /* FIXME */ + .devs.note = "Programmers compatible with SI-Prog, serbang or AJAWe\n", .init = pony_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, .delay = internal_delay, -}, + }, #endif #if CONFIG_NICINTEL == 1 { .name = "nicintel", + .type = PCI, + .devs.pci = nics_intel, .init = nicintel_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -225,6 +263,8 @@ #if CONFIG_NICINTEL_SPI == 1 { .name = "nicintel_spi", + .type = PCI, + .devs.pci = nics_intel_spi, .init = nicintel_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -235,6 +275,8 @@ #if CONFIG_OGP_SPI == 1 { .name = "ogp_spi", + .type = PCI, + .devs.pci = ogp_spi, .init = ogp_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -245,6 +287,8 @@ #if CONFIG_SATAMV == 1 { .name = "satamv", + .type = PCI, + .devs.pci = satas_mv, .init = satamv_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -255,6 +299,8 @@ #if CONFIG_LINUX_SPI == 1 { .name = "linux_spi", + .type = OTHER, + .devs.note = "Device files /dev/spidev*.*\n", .init = linux_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -1577,6 +1623,23 @@ * messages below without jumping through hoops. */ continue; } + switch (p.type) { + case USB: + case PCI: + case OTHER: + if (p.devs.note == NULL) { + if (strcmp("internal", p.name) == 0) + break; /* This one has its device list stored separately. */ + msg_gerr("Programmer %s has neither a device list nor a textual description!\n", + p.name); + ret = 1; + } + break; + default: + msg_gerr("Programmer %s does not have a valid type set!\n", p.name); + ret = 1; + break; + } if (p.init == NULL) { msg_gerr("Programmer %s does not have a valid init function!\n", p.name); ret = 1; Modified: trunk/ft2232_spi.c ============================================================================== --- trunk/ft2232_spi.c Wed Dec 26 20:51:23 2012 (r1630) +++ trunk/ft2232_spi.c Thu Dec 27 19:40:26 2012 (r1631) @@ -482,17 +482,4 @@ return failed ? -1 : 0; } -void print_supported_usbdevs(const struct usbdev_status *devs) -{ - int i; - - msg_pinfo("USB devices:\n"); - for (i = 0; devs[i].vendor_name != NULL; i++) { - 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)" : ""); - } -} - #endif Modified: trunk/pcidev.c ============================================================================== --- trunk/pcidev.c Wed Dec 26 20:51:23 2012 (r1630) +++ trunk/pcidev.c Thu Dec 27 19:40:26 2012 (r1631) @@ -224,19 +224,6 @@ return curaddr; } -void print_supported_pcidevs(const struct pcidev_status *devs) -{ - int i; - - msg_pinfo("PCI devices:\n"); - for (i = 0; devs[i].vendor_name != NULL; i++) { - 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)" : ""); - } -} - enum pci_write_type { pci_write_type_byte, pci_write_type_word, Modified: trunk/print.c ============================================================================== --- trunk/print.c Wed Dec 26 20:51:23 2012 (r1630) +++ trunk/print.c Thu Dec 27 19:40:26 2012 (r1631) @@ -433,8 +433,32 @@ } #endif +void print_supported_usbdevs(const struct usbdev_status *devs) +{ + int i; + + msg_pinfo("USB devices:\n"); + for (i = 0; devs[i].vendor_name != NULL; i++) { + 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)" : ""); + } +} + +#if NEED_PCI == 1 +void print_supported_pcidevs(const struct pcidev_status *devs) +{ + int i; + + for (i = 0; devs[i].vendor_name != NULL; i++) { + 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)" : ""); + } +} +#endif + int print_supported(void) { + unsigned int i; if (print_supported_chips()) return 1; @@ -450,107 +474,31 @@ msg_ginfo("\n"); print_supported_boards_helper(laptops_known, "laptops"); #endif -#if CONFIG_DUMMY == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_DUMMY].name); - /* FIXME */ - msg_ginfo("Dummy device, does nothing and logs all accesses\n"); -#endif -#if CONFIG_NIC3COM == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_NIC3COM].name); - print_supported_pcidevs(nics_3com); -#endif -#if CONFIG_NICREALTEK == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_NICREALTEK].name); - print_supported_pcidevs(nics_realtek); -#endif -#if CONFIG_NICNATSEMI == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_NICNATSEMI].name); - print_supported_pcidevs(nics_natsemi); -#endif -#if CONFIG_GFXNVIDIA == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_GFXNVIDIA].name); - print_supported_pcidevs(gfx_nvidia); -#endif -#if CONFIG_DRKAISER == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_DRKAISER].name); - print_supported_pcidevs(drkaiser_pcidev); -#endif -#if CONFIG_SATASII == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_SATASII].name); - print_supported_pcidevs(satas_sii); -#endif -#if CONFIG_ATAHPT == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_ATAHPT].name); - print_supported_pcidevs(ata_hpt); -#endif -#if CONFIG_FT2232_SPI == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_FT2232_SPI].name); - print_supported_usbdevs(devs_ft2232spi); -#endif -#if CONFIG_SERPROG == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_SERPROG].name); - /* FIXME */ - msg_ginfo("All programmer devices speaking the serprog protocol\n"); -#endif -#if CONFIG_BUSPIRATE_SPI == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_BUSPIRATE_SPI].name); - /* FIXME */ - msg_ginfo("Dangerous Prototypes Bus Pirate\n"); -#endif -#if CONFIG_DEDIPROG == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_DEDIPROG].name); - /* FIXME */ - msg_ginfo("Dediprog SF100\n"); -#endif -#if CONFIG_RAYER_SPI == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_RAYER_SPI].name); - /* FIXME */ - msg_ginfo("RayeR parallel port programmer\n"); -#endif -#if CONFIG_PONY_SPI == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_PONY_SPI].name); - /* FIXME */ - msg_ginfo("SI-Prog, serbang and AJAWe serial port programmers\n"); -#endif -#if CONFIG_NICINTEL == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_NICINTEL].name); - print_supported_pcidevs(nics_intel); -#endif -#if CONFIG_NICINTEL_SPI == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_NICINTEL_SPI].name); - print_supported_pcidevs(nics_intel_spi); -#endif -#if CONFIG_OGP_SPI == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_OGP_SPI].name); - print_supported_pcidevs(ogp_spi); -#endif -#if CONFIG_SATAMV == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_SATAMV].name); - print_supported_pcidevs(satas_mv); -#endif -#if CONFIG_LINUX_SPI == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_LINUX_SPI].name); - msg_ginfo("Device files /dev/spidev*.*\n"); -#endif + for (i = 0; i < PROGRAMMER_INVALID; i++) { + const struct programmer_entry prog = programmer_table[i]; + switch (prog.type) { + case USB: + msg_ginfo("\nSupported USB devices for the %s programmer:\n", prog.name); + print_supported_usbdevs(prog.devs.usb); + break; +#if NEED_PCI == 1 + case PCI: + msg_ginfo("\nSupported PCI devices for the %s programmer:\n", prog.name); + print_supported_pcidevs(prog.devs.pci); + break; +#endif + case OTHER: + if (prog.devs.note == NULL) + break; + msg_ginfo("\nSupported devices for the %s programmer:\n", prog.name); + msg_ginfo("%s", prog.devs.note); + break; + default: + msg_gerr("\n%s: %s: Uninitialized programmer type! Please report a bug at " + "flashrom(a)flashrom.org\n", __func__, prog.name); + break; + } + } return 0; } Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Wed Dec 26 20:51:23 2012 (r1630) +++ trunk/print_wiki.c Thu Dec 27 19:40:26 2012 (r1631) @@ -79,13 +79,9 @@ static const char programmer_th[] = "\ ! align=\"left\" | Vendor\n\ ! align=\"left\" | Device\n\ -! align=\"center\" | PCI IDs\n\ +! align=\"center\" | IDs\n\ ! align=\"center\" | Status\n\n"; -static const char programmer_intro[] = "\ -\n== Supported programmers ==\n\n\ -This is a list of supported PCI devices flashrom can use as programmer:\n\n{"; - #if CONFIG_INTERNAL == 1 static const char laptop_intro[] = "\n== Supported laptops/notebooks ==\n\n\ In general, flashing laptops is more difficult because laptops\n\n\ @@ -139,7 +135,7 @@ printf("\n\n|}\n"); } -static void wiki_helper(const char *devicetype, int cols, const struct board_info boards[]) +static void print_supported_boards_wiki_helper(const char *devicetype, int cols, const struct board_info boards[]) { int i, k; unsigned int boardcount, lines_per_col; @@ -222,10 +218,10 @@ static void print_supported_boards_wiki(void) { printf("%s", board_intro); - wiki_helper("boards", 2, boards_known); + print_supported_boards_wiki_helper("boards", 2, boards_known); printf("%s", laptop_intro); - wiki_helper("laptops", 1, laptops_known); + print_supported_boards_wiki_helper("laptops", 1, laptops_known); } #endif @@ -302,9 +298,18 @@ printf("|}\n\n"); } -/* Not needed for CONFIG_INTERNAL, but for all other PCI-based programmers. */ -#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV >= 1 -static void print_supported_pcidevs_wiki(const struct pcidev_status *devs) +/* Following functions are not needed when no PCI/USB programmers are compiled in, + * but since print_wiki code has no size constraints we include it unconditionally. */ +static int count_supported_pcidevs_wiki(const struct pcidev_status *devs) +{ + unsigned int count = 0; + unsigned int i = 0; + for (i = 0; devs[i].vendor_name != NULL; i++) + count++; + return count; +} + +static void print_supported_pcidevs_wiki_helper(const struct pcidev_status *devs) { int i = 0; static int c = 0; @@ -313,14 +318,81 @@ c = !c; for (i = 0; devs[i].vendor_name != NULL; i++) { - printf("|- bgcolor=\"#%s\"\n| %s || %s || " - "%04x:%04x || {{%s}}\n", (c) ? "eeeeee" : "dddddd", - devs[i].vendor_name, devs[i].device_name, - devs[i].vendor_id, devs[i].device_id, + printf("|- bgcolor=\"#%s\"\n| %s || %s || %04x:%04x || {{%s}}\n", (c) ? "eeeeee" : "dddddd", + devs[i].vendor_name, devs[i].device_name, devs[i].vendor_id, devs[i].device_id, (devs[i].status == NT) ? "?3" : "OK"); } } -#endif + +static int count_supported_usbdevs_wiki(const struct usbdev_status *devs) +{ + unsigned int count = 0; + unsigned int i = 0; + for (i = 0; devs[i].vendor_name != NULL; i++) + count++; + return count; +} + +static void print_supported_usbdevs_wiki_helper(const struct usbdev_status *devs) +{ + int i = 0; + static int c = 0; + + /* Alternate colors if the vendor changes. */ + c = !c; + + for (i = 0; devs[i].vendor_name != NULL; i++) { + printf("|- bgcolor=\"#%s\"\n| %s || %s || %04x:%04x || {{%s}}\n", (c) ? "eeeeee" : "dddddd", + devs[i].vendor_name, devs[i].device_name, devs[i].vendor_id, devs[i].device_id, + (devs[i].status == NT) ? "?3" : "OK"); + } +} + +static void print_supported_devs_wiki() +{ + unsigned int pci_count = 0; + unsigned int usb_count = 0; + unsigned int i; + + for (i = 0; i < PROGRAMMER_INVALID; i++) { + const struct programmer_entry prog = programmer_table[i]; + switch (prog.type) { + case USB: + usb_count += count_supported_usbdevs_wiki(prog.devs.usb); + break; + case PCI: + pci_count += count_supported_pcidevs_wiki(prog.devs.pci); + break; + case OTHER: + default: + break; + } + } + + printf("\n== PCI Devices ==\n\n" + "Total amount of supported PCI devices flashrom can use as a programmer: '''%d'''\n\n" + "{%s%s", pci_count, th_start, programmer_th); + + for (i = 0; i < PROGRAMMER_INVALID; i++) { + const struct programmer_entry prog = programmer_table[i]; + if (prog.type == PCI) { + print_supported_pcidevs_wiki_helper(prog.devs.pci); + } + } + printf("\n|}\n\n|}\n"); + + printf("\n== USB Devices ==\n\n" + "Total amount of supported USB devices flashrom can use as a programmer: '''%d'''\n\n" + "{%s%s", usb_count, th_start, programmer_th); + + for (i = 0; i < PROGRAMMER_INVALID; i++) { + const struct programmer_entry prog = programmer_table[i]; + if (prog.type == USB) { + print_supported_usbdevs_wiki_helper(prog.devs.usb); + } + } + printf("\n|}\n\n|}\n"); +} void print_supported_wiki(void) { @@ -332,41 +404,6 @@ print_supported_chipsets_wiki(3); print_supported_boards_wiki(); #endif - printf("%s%s%s", programmer_intro, th_start, programmer_th); - -#if CONFIG_NIC3COM == 1 - print_supported_pcidevs_wiki(nics_3com); -#endif -#if CONFIG_NICREALTEK == 1 - print_supported_pcidevs_wiki(nics_realtek); -#endif -#if CONFIG_NICNATSEMI == 1 - print_supported_pcidevs_wiki(nics_natsemi); -#endif -#if CONFIG_GFXNVIDIA == 1 - print_supported_pcidevs_wiki(gfx_nvidia); -#endif -#if CONFIG_DRKAISER == 1 - print_supported_pcidevs_wiki(drkaiser_pcidev); -#endif -#if CONFIG_SATASII == 1 - print_supported_pcidevs_wiki(satas_sii); -#endif -#if CONFIG_ATAHPT == 1 - print_supported_pcidevs_wiki(ata_hpt); -#endif -#if CONFIG_NICINTEL == 1 - print_supported_pcidevs_wiki(nics_intel); -#endif -#if CONFIG_NICINTEL_SPI == 1 - print_supported_pcidevs_wiki(nics_intel_spi); -#endif -#if CONFIG_OGP_SPI == 1 - print_supported_pcidevs_wiki(ogp_spi); -#endif -#if CONFIG_SATAMV == 1 - print_supported_pcidevs_wiki(satas_mv); -#endif - printf("\n|}\n\n|}\n"); + print_supported_devs_wiki(); } Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Wed Dec 26 20:51:23 2012 (r1630) +++ trunk/programmer.h Thu Dec 27 19:40:26 2012 (r1631) @@ -90,8 +90,20 @@ PROGRAMMER_INVALID /* This must always be the last entry. */ }; +enum programmer_type { + PCI = 1, /* to detect uninitialized values */ + USB, + OTHER, +}; + struct programmer_entry { const char *name; + const enum programmer_type type; + union { + const struct pcidev_status *const pci; + const struct usbdev_status *const usb; + const char *const note; + } devs; int (*init) (void); @@ -219,13 +231,6 @@ extern uint32_t io_base_addr; extern struct pci_access *pacc; extern struct pci_dev *pcidev_dev; -struct pcidev_status { - uint16_t vendor_id; - uint16_t device_id; - const enum test_state status; - const char *vendor_name; - const char *device_name; -}; uintptr_t pcidev_readbar(struct pci_dev *dev, int bar); uintptr_t pcidev_init(int bar, const struct pcidev_status *devs); /* rpci_write_* are reversible writes. The original PCI config space register @@ -242,6 +247,21 @@ void print_supported_pcidevs(const struct pcidev_status *devs); #endif +struct usbdev_status { + uint16_t vendor_id; + uint16_t device_id; + const enum test_state status; + const char *vendor_name; + const char *device_name; +}; +struct pcidev_status { + uint16_t vendor_id; + uint16_t device_id; + const enum test_state status; + const char *vendor_name; + const char *device_name; +}; + #if CONFIG_INTERNAL == 1 /* board_enable.c */ int board_parse_parameter(const char *boardstring, const char **vendor, const char **model); @@ -420,13 +440,6 @@ /* ft2232_spi.c */ #if CONFIG_FT2232_SPI == 1 -struct usbdev_status { - uint16_t vendor_id; - uint16_t device_id; - const enum test_state status; - const char *vendor_name; - const char *device_name; -}; int ft2232_spi_init(void); extern const struct usbdev_status devs_ft2232spi[]; void print_supported_usbdevs(const struct usbdev_status *devs);

1 0

[PATCH 0/4] wiki patches 5.0 - example output
by Stefan Tauner 26 Dec '12

26 Dec '12

example wiki output attached -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 3

Re: [flashrom] [PATCH 1/4] Add general programmer sanity checks.
by Carl-Daniel Hailfinger 26 Dec '12

26 Dec '12

Am 25.12.2012 12:31 schrieb Stefan Tauner: > And remove the completely unused vendor field. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> More sanity checks are always a good idea. Thanks for this patch! Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

IBM Aptiva, SiS 5595 - success (read)
by Bertho Grandpied 26 Dec '12

26 Dec '12

Hello flashrom List ! This is reporting success reading (dumping) the ROM BIOS on my IBM Aptiva 2170-G (actually an ACER V75-M motherboard). This MoBo has the SiS 5595 southbridge, which per flashrom issued warning had been untested. I have /not/ tried to write or erase, sorry; though have little doubts those operations would succeed similarly. Many thanks go to the developers! -- Czerno

2 5

Re: [flashrom] [7/7, RFC] Unify usbdev_status and pcidev_status into dev_status.
by Kyösti Mälkki 26 Dec '12

26 Dec '12

Mostly looked good to me, I did not rebase or compile. Find a few comments inlined below. Kyösti On Sat, 2012-03-03 at 19:11 +0000, Stefan Tauner wrote: > diff --git a/programmer.h b/programmer.h > index 9f90fe5..b52727e 100644 > --- a/programmer.h > +++ b/programmer.h > @@ -93,15 +93,22 @@ enum programmer_type { > OTHER, > }; > > +struct dev_status { > + uint16_t vendor_id; > + uint16_t device_id; > + const enum test_state status; > + const char *vendor_name; > + const char *device_name; > +}; I find the name "dev_status" odd, these are the arrays for listing and probing the VID/DID too, and the "status" is just documentation. > struct programmer_entry { > const char *vendor; > const char *name; > enum programmer_type type; > union { > - const struct pcidev_status *const pci; > - const struct usbdev_status *const usb; > + const struct dev_status *const status; > const char * const note; > - } devices; > + } devs; I don't know why the "devices->devs" rename is here. Maybe add comment that "type" is the selector for the union. It might be confused for some internal/nic/sata enumeration. > /* print.c */ > #if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV >= 1 > -void print_supported_pcidevs(const struct pcidev_status *devs); > +void print_supported_devs(const struct dev_status *devs); > #endif That #if does not look nice.

2 2

← Newer
1
2
3
4
5
6
7
8
9
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom December 2012