Changeset 1424 for trunk

Timestamp:

08/31/11 18:19:50 (9 months ago)

Author:

hailfinger

Message:

Shorten some board enable related function names

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>
Acked-by: Stefan Tauner <stefan.tauner@…>

Location:

trunk

Files:

• board_enable.c (modified) (6 diffs)
• flashrom.c (modified) (1 diff)
• print.c (modified) (2 diffs)
• print_wiki.c (modified) (1 diff)
• programmer.h (modified) (2 diffs)

trunk/board_enable.c

@@ -1975 +1975 @@
 
 /* Please keep this list alphabetically ordered by vendor/board name. */
-const struct board_pciid_enable board_pciid_enables[] = {
+const struct board_match board_matches[] = {
 
         /* first pci-id set [4],          second pci-id set [4],          dmi identifier, coreboot id [2],  phase, vendor name,  board name       max_rom_...  OK? flash enable */
@@ -2103 +2103 @@
  * Require main PCI IDs to match too as extra safety.
  */
-static const struct board_pciid_enable *board_match_coreboot_name(
-                                        const char *vendor, const char *part)
-{
-        const struct board_pciid_enable *board = board_pciid_enables;
-        const struct board_pciid_enable *partmatch = NULL;
+static const struct board_match *board_match_cbname(const char *vendor,
+                                                    const char *part)
+{
+        const struct board_match *board = board_matches;
+        const struct board_match *partmatch = NULL;
 
         for (; board->vendor_name; board++) {
@@ -2154 +2154 @@
 /*
  * Match boards on PCI IDs and subsystem IDs.
- * Second set of IDs can be main only or missing completely.
- */
-const static struct board_pciid_enable *board_match_pci_card_ids(
-                                                enum board_match_phase phase)
-{
-        const struct board_pciid_enable *board = board_pciid_enables;
+ * Second set of IDs can be either main+subsystem IDs, main IDs or no IDs.
+ */
+const static struct board_match *board_match_pci_ids(enum board_match_phase phase)
+{
+        const struct board_match *board = board_matches;
 
         for (; board->vendor_name; board++) {
@@ -2205 +2204 @@
 }
 
-static int unsafe_board_handler(const struct board_pciid_enable *board)
+static int unsafe_board_handler(const struct board_match *board)
 {
         if (!board)
@@ -2232 +2231 @@
 static int board_handle_phase(enum board_match_phase phase)
 {
-        const struct board_pciid_enable *board = NULL;
-
-        board = board_match_pci_card_ids(phase);
+        const struct board_match *board = NULL;
+
+        board = board_match_pci_ids(phase);
 
         if (unsafe_board_handler(board))
@@ -2263 +2262 @@
 int board_flash_enable(const char *vendor, const char *part)
 {
-        const struct board_pciid_enable *board = NULL;
+        const struct board_match *board = NULL;
         int ret = 0;
 
         if (part)
-                board = board_match_coreboot_name(vendor, part);
+                board = board_match_cbname(vendor, part);
 
         if (!board)
-                board = board_match_pci_card_ids(P3);
+                board = board_match_pci_ids(P3);
 
         if (unsafe_board_handler(board))

trunk/flashrom.c

@@ -1732 +1732 @@
                 ret = 1;
         }
-        if (board_pciid_enables == NULL) {
+        if (board_matches == NULL) {
                 msg_gerr("Board enables table does not exist!\n");
                 ret = 1;

trunk/print.c

@@ -204 +204 @@
 {
         int i, boardcount_good = 0, boardcount_bad = 0;
-        const struct board_pciid_enable *e = board_pciid_enables;
+        const struct board_match *e = board_matches;
         const struct board_info *b = boards;
         int maxvendorlen = strlen("Vendor") + 1;
@@ -242 +242 @@
                 msg_ginfo((b->working) ? "OK      " : "BAD     ");
 
-                for (e = board_pciid_enables; e->vendor_name != NULL; e++) {
+                for (e = board_matches; e->vendor_name != NULL; e++) {
                         if (strcmp(e->vendor_name, b->vendor)
                             || strcmp(e->board_name, b->name))

trunk/print_wiki.c

@@ -126 +126 @@
         char *notes = calloc(1, 1);
         char tmp[900 + 1];
-        const struct board_pciid_enable *b = board_pciid_enables;
+        const struct board_match *b = board_matches;
 
         for (i = 0; boards[i].vendor != NULL; i++) {

trunk/programmer.h

@@ -159 +159 @@
 };
 
-struct board_pciid_enable {
+struct board_match {
         /* Any device, but make it sensible, like the ISA bridge. */
         uint16_t first_vendor;
@@ -191 +191 @@
 };
 
-extern const struct board_pciid_enable board_pciid_enables[];
+extern const struct board_match board_matches[];
 
 struct board_info {