Simplify pcidev_init by killing the vendorid parameter which was pretty useless anyway since it was present in the pcidevs parameter as well.
This also allows us to handle multiple programmers with different vendor IDs in the same driver.
As a side effect, compilation of flashrom with only the nicrealtek driver won't fail anymore.
Signed-off-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Index: flashrom-pcidev_init_simplify/ogp_spi.c =================================================================== --- flashrom-pcidev_init_simplify/ogp_spi.c (Revision 1260) +++ flashrom-pcidev_init_simplify/ogp_spi.c (Arbeitskopie) @@ -120,8 +120,7 @@
get_io_perms();
- io_base_addr = pcidev_init(PCI_VENDOR_ID_OGP, PCI_BASE_ADDRESS_0, - ogp_spi); + io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, ogp_spi);
ogp_spibar = physmap("OGP registers", io_base_addr, 4096);
Index: flashrom-pcidev_init_simplify/drkaiser.c =================================================================== --- flashrom-pcidev_init_simplify/drkaiser.c (Revision 1260) +++ flashrom-pcidev_init_simplify/drkaiser.c (Arbeitskopie) @@ -43,8 +43,7 @@
get_io_perms();
- addr = pcidev_init(PCI_VENDOR_ID_DRKAISER, PCI_BASE_ADDRESS_2, - drkaiser_pcidev); + addr = pcidev_init(PCI_BASE_ADDRESS_2, drkaiser_pcidev);
/* Write magic register to enable flash write. */ rpci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR, Index: flashrom-pcidev_init_simplify/pcidev.c =================================================================== --- flashrom-pcidev_init_simplify/pcidev.c (Revision 1260) +++ flashrom-pcidev_init_simplify/pcidev.c (Arbeitskopie) @@ -79,8 +79,7 @@ return 0; }
-uint32_t pcidev_init(uint16_t vendor_id, uint32_t bar, - const struct pcidev_status *devs) +uint32_t pcidev_init(uint32_t bar, const struct pcidev_status *devs) { struct pci_dev *dev; struct pci_filter filter; @@ -94,8 +93,7 @@ pci_scan_bus(pacc); /* We want to get the list of devices */ pci_filter_init(pacc, &filter);
- /* Filter by vendor and also bb:dd.f (if supplied by the user). */ - filter.vendor = vendor_id; + /* Filter by bb:dd.f (if supplied by the user). */ pcidev_bdf = extract_programmer_param("pci"); if (pcidev_bdf != NULL) { if ((msg = pci_filter_parse_slot(&filter, pcidev_bdf))) { @@ -107,6 +105,9 @@
for (dev = pacc->devices; dev; dev = dev->next) { if (pci_filter_match(&filter, dev)) { + /* FIXME: We should count all matching devices, not + * just those with a valid BAR. + */ if ((addr = pcidev_validate(dev, bar, devs)) != 0) { curaddr = addr; pcidev_dev = dev; Index: flashrom-pcidev_init_simplify/gfxnvidia.c =================================================================== --- flashrom-pcidev_init_simplify/gfxnvidia.c (Revision 1260) +++ flashrom-pcidev_init_simplify/gfxnvidia.c (Arbeitskopie) @@ -66,8 +66,7 @@
get_io_perms();
- io_base_addr = pcidev_init(PCI_VENDOR_ID_NVIDIA, PCI_BASE_ADDRESS_0, - gfx_nvidia); + io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, gfx_nvidia);
io_base_addr += 0x300000; msg_pinfo("Detected NVIDIA I/O base address: 0x%x.\n", io_base_addr); Index: flashrom-pcidev_init_simplify/nicrealtek.c =================================================================== --- flashrom-pcidev_init_simplify/nicrealtek.c (Revision 1260) +++ flashrom-pcidev_init_simplify/nicrealtek.c (Arbeitskopie) @@ -32,10 +32,6 @@
const struct pcidev_status nics_realtek[] = { {0x10ec, 0x8139, OK, "Realtek", "RTL8139/8139C/8139C+"}, - {}, -}; - -const struct pcidev_status nics_realteksmc1211[] = { {0x1113, 0x1211, OK, "SMC2", "1211TX"}, /* RTL8139 clone */ {}, }; @@ -44,26 +40,13 @@ { get_io_perms();
- io_base_addr = pcidev_init(PCI_VENDOR_ID_REALTEK, PCI_BASE_ADDRESS_0, - nics_realtek); + io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_realtek);
buses_supported = CHIP_BUSTYPE_PARALLEL;
return 0; }
-int nicsmc1211_init(void) -{ - get_io_perms(); - - io_base_addr = pcidev_init(PCI_VENDOR_ID_SMC1211, PCI_BASE_ADDRESS_0, - nics_realteksmc1211); - - buses_supported = CHIP_BUSTYPE_PARALLEL; - - return 0; -} - int nicrealtek_shutdown(void) { /* FIXME: We forgot to disable software access again. */ Index: flashrom-pcidev_init_simplify/satamv.c =================================================================== --- flashrom-pcidev_init_simplify/satamv.c (Revision 1260) +++ flashrom-pcidev_init_simplify/satamv.c (Arbeitskopie) @@ -67,7 +67,7 @@ /* No need to check for errors, pcidev_init() will not return in case * of errors. */ - addr = pcidev_init(0x11ab, PCI_BASE_ADDRESS_0, satas_mv); + addr = pcidev_init(PCI_BASE_ADDRESS_0, satas_mv);
mv_bar = physmap("Marvell 88SX7042 registers", addr, 0x20000); if (mv_bar == ERROR_PTR) Index: flashrom-pcidev_init_simplify/print_wiki.c =================================================================== --- flashrom-pcidev_init_simplify/print_wiki.c (Revision 1260) +++ flashrom-pcidev_init_simplify/print_wiki.c (Arbeitskopie) @@ -279,7 +279,6 @@ #endif #if CONFIG_NICREALTEK == 1 print_supported_pcidevs_wiki(nics_realtek); - print_supported_pcidevs_wiki(nics_realteksmc1211); #endif #if CONFIG_NICNATSEMI == 1 print_supported_pcidevs_wiki(nics_natsemi); Index: flashrom-pcidev_init_simplify/nicintel_spi.c =================================================================== --- flashrom-pcidev_init_simplify/nicintel_spi.c (Revision 1260) +++ flashrom-pcidev_init_simplify/nicintel_spi.c (Arbeitskopie) @@ -144,8 +144,7 @@
get_io_perms();
- io_base_addr = pcidev_init(PCI_VENDOR_ID_INTEL, PCI_BASE_ADDRESS_0, - nics_intel_spi); + io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_intel_spi);
nicintel_spibar = physmap("Intel Gigabit NIC w/ SPI flash", io_base_addr, 4096); Index: flashrom-pcidev_init_simplify/nicnatsemi.c =================================================================== --- flashrom-pcidev_init_simplify/nicnatsemi.c (Revision 1260) +++ flashrom-pcidev_init_simplify/nicnatsemi.c (Arbeitskopie) @@ -39,8 +39,7 @@ { get_io_perms();
- io_base_addr = pcidev_init(PCI_VENDOR_ID_NATSEMI, PCI_BASE_ADDRESS_0, - nics_natsemi); + io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_natsemi);
buses_supported = CHIP_BUSTYPE_PARALLEL;
Index: flashrom-pcidev_init_simplify/atahpt.c =================================================================== --- flashrom-pcidev_init_simplify/atahpt.c (Revision 1260) +++ flashrom-pcidev_init_simplify/atahpt.c (Arbeitskopie) @@ -44,8 +44,7 @@
get_io_perms();
- io_base_addr = pcidev_init(PCI_VENDOR_ID_HPT, PCI_BASE_ADDRESS_4, - ata_hpt); + io_base_addr = pcidev_init(PCI_BASE_ADDRESS_4, ata_hpt);
/* Enable flash access. */ reg32 = pci_read_long(pcidev_dev, REG_FLASH_ACCESS); Index: flashrom-pcidev_init_simplify/nic3com.c =================================================================== --- flashrom-pcidev_init_simplify/nic3com.c (Revision 1260) +++ flashrom-pcidev_init_simplify/nic3com.c (Arbeitskopie) @@ -59,8 +59,7 @@ { get_io_perms();
- io_base_addr = pcidev_init(PCI_VENDOR_ID_3COM, PCI_BASE_ADDRESS_0, - nics_3com); + io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_3com);
id = pcidev_dev->device_id;
Index: flashrom-pcidev_init_simplify/satasii.c =================================================================== --- flashrom-pcidev_init_simplify/satasii.c (Revision 1260) +++ flashrom-pcidev_init_simplify/satasii.c (Arbeitskopie) @@ -47,7 +47,7 @@
get_io_perms();
- pcidev_init(PCI_VENDOR_ID_SII, PCI_BASE_ADDRESS_0, satas_sii); + pcidev_init(PCI_BASE_ADDRESS_0, satas_sii);
id = pcidev_dev->device_id;
Index: flashrom-pcidev_init_simplify/flashrom.c =================================================================== --- flashrom-pcidev_init_simplify/flashrom.c (Revision 1260) +++ flashrom-pcidev_init_simplify/flashrom.c (Arbeitskopie) @@ -61,7 +61,6 @@ #endif #if CONFIG_NICREALTEK == 1 PROGRAMMER_NICREALTEK - PROGRAMMER_NICREALTEK2 #endif #if CONFIG_NICNATSEMI == 1 PROGRAMMER_NICNATSEMI @@ -182,7 +181,9 @@
#if CONFIG_NICREALTEK == 1 { + /* This programmer works for Realtek RTL8139 and SMC 1211. */ .name = "nicrealtek", + //.name = "nicsmc1211", .init = nicrealtek_init, .shutdown = nicrealtek_shutdown, .map_flash_region = fallback_map, @@ -197,22 +198,6 @@ .chip_writen = fallback_chip_writen, .delay = internal_delay, }, - { - .name = "nicsmc1211", - .init = nicsmc1211_init, - .shutdown = nicrealtek_shutdown, - .map_flash_region = fallback_map, - .unmap_flash_region = fallback_unmap, - .chip_readb = nicrealtek_chip_readb, - .chip_readw = fallback_chip_readw, - .chip_readl = fallback_chip_readl, - .chip_readn = fallback_chip_readn, - .chip_writeb = nicrealtek_chip_writeb, - .chip_writew = fallback_chip_writew, - .chip_writel = fallback_chip_writel, - .chip_writen = fallback_chip_writen, - .delay = internal_delay, - }, #endif
#if CONFIG_NICNATSEMI == 1 Index: flashrom-pcidev_init_simplify/programmer.h =================================================================== --- flashrom-pcidev_init_simplify/programmer.h (Revision 1260) +++ flashrom-pcidev_init_simplify/programmer.h (Arbeitskopie) @@ -36,7 +36,6 @@ #endif #if CONFIG_NICREALTEK == 1 PROGRAMMER_NICREALTEK, - PROGRAMMER_NICREALTEK2, #endif #if CONFIG_NICNATSEMI == 1 PROGRAMMER_NICNATSEMI, @@ -220,7 +219,7 @@ const char *device_name; }; uint32_t pcidev_validate(struct pci_dev *dev, uint32_t bar, const struct pcidev_status *devs); -uint32_t pcidev_init(uint16_t vendor_id, uint32_t bar, const struct pcidev_status *devs); +uint32_t pcidev_init(uint32_t bar, const struct pcidev_status *devs); /* rpci_write_* are reversible writes. The original PCI config space register * contents will be restored on shutdown. */ @@ -384,12 +383,10 @@ /* nicrealtek.c */ #if CONFIG_NICREALTEK == 1 int nicrealtek_init(void); -int nicsmc1211_init(void); int nicrealtek_shutdown(void); void nicrealtek_chip_writeb(uint8_t val, chipaddr addr); uint8_t nicrealtek_chip_readb(const chipaddr addr); extern const struct pcidev_status nics_realtek[]; -extern const struct pcidev_status nics_realteksmc1211[]; #endif
/* nicnatsemi.c */ Index: flashrom-pcidev_init_simplify/print.c =================================================================== --- flashrom-pcidev_init_simplify/print.c (Revision 1260) +++ flashrom-pcidev_init_simplify/print.c (Arbeitskopie) @@ -249,9 +249,6 @@ printf("\nSupported devices for the %s programmer:\n", programmer_table[PROGRAMMER_NICREALTEK].name); print_supported_pcidevs(nics_realtek); - printf("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_NICREALTEK2].name); - print_supported_pcidevs(nics_realteksmc1211); #endif #if CONFIG_NICNATSEMI == 1 printf("\nSupported devices for the %s programmer:\n",