openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-11-04 07:00:39 +01:00
Code Issues Releases Wiki Activity

Shorten some board enable related function names

Browse Source 
Corresponding to flashrom svn r1424.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
This commit is contained in:
Carl-Daniel Hailfinger
2011-08-31 16:19:50 +00:00
parent bd0c70ae17
commit 97d5b126c6
5 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
board_enable.c
View File

@@ -1974,7 +1974,7 @@ static int it8712f_gpio3_1_raise(void)
*/ */
/* Please keep this list alphabetically ordered by vendor/board name. */ /* 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 */ /* 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 */
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
@@ -2102,11 +2102,11 @@ const struct board_pciid_enable board_pciid_enables[] = {
* Match boards on coreboot table gathered vendor and part name. * Match boards on coreboot table gathered vendor and part name.
* Require main PCI IDs to match too as extra safety. * Require main PCI IDs to match too as extra safety.
*/ */
static const struct board_pciid_enable *board_match_coreboot_name( static const struct board_match *board_match_cbname(const char *vendor,
const char *vendor, const char *part) const char *part)
{ {
const struct board_pciid_enable *board = board_pciid_enables; const struct board_match *board = board_matches;
const struct board_pciid_enable *partmatch = NULL; const struct board_match *partmatch = NULL;
for (; board->vendor_name; board++) { for (; board->vendor_name; board++) {
if (vendor && (!board->lb_vendor if (vendor && (!board->lb_vendor
@@ -2153,12 +2153,11 @@ static const struct board_pciid_enable *board_match_coreboot_name(
/* /*
* Match boards on PCI IDs and subsystem IDs. * Match boards on PCI IDs and subsystem IDs.
* Second set of IDs can be main only or missing completely. * Second set of IDs can be either main+subsystem IDs, main IDs or no IDs.
*/ */
const static struct board_pciid_enable *board_match_pci_card_ids( const static struct board_match *board_match_pci_ids(enum board_match_phase phase)
enum board_match_phase phase)
{ {
const struct board_pciid_enable *board = board_pciid_enables; const struct board_match *board = board_matches;
for (; board->vendor_name; board++) { for (; board->vendor_name; board++) {
if ((!board->first_card_vendor || !board->first_card_device) && if ((!board->first_card_vendor || !board->first_card_device) &&
@@ -2204,7 +2203,7 @@ const static struct board_pciid_enable *board_match_pci_card_ids(
return NULL; return NULL;
} }
static int unsafe_board_handler(const struct board_pciid_enable *board) static int unsafe_board_handler(const struct board_match *board)
{ {
if (!board) if (!board)
return 1; return 1;
@@ -2231,9 +2230,9 @@ static int unsafe_board_handler(const struct board_pciid_enable *board)
/* FIXME: Should this be identical to board_flash_enable? */ /* FIXME: Should this be identical to board_flash_enable? */
static int board_handle_phase(enum board_match_phase phase) static int board_handle_phase(enum board_match_phase phase)
{ {
const struct board_pciid_enable *board = NULL; const struct board_match *board = NULL;
board = board_match_pci_card_ids(phase); board = board_match_pci_ids(phase);
if (unsafe_board_handler(board)) if (unsafe_board_handler(board))
board = NULL; board = NULL;
@@ -2262,14 +2261,14 @@ void board_handle_before_laptop(void)
int board_flash_enable(const char *vendor, const char *part) 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; int ret = 0;
if (part) if (part)
board = board_match_coreboot_name(vendor, part); board = board_match_cbname(vendor, part);
if (!board) if (!board)
board = board_match_pci_card_ids(P3); board = board_match_pci_ids(P3);
if (unsafe_board_handler(board)) if (unsafe_board_handler(board))
board = NULL; board = NULL;

2
flashrom.c
View File

@@ -1731,7 +1731,7 @@ int selfcheck(void)
msg_gerr("Chipset enables table does not exist!\n"); msg_gerr("Chipset enables table does not exist!\n");
ret = 1; ret = 1;
} }
if (board_pciid_enables == NULL) { if (board_matches == NULL) {
msg_gerr("Board enables table does not exist!\n"); msg_gerr("Board enables table does not exist!\n");
ret = 1; ret = 1;
} }

4
print.c
View File

@@ -203,7 +203,7 @@ static void print_supported_boards_helper(const struct board_info *boards,
const char *devicetype) const char *devicetype)
{ {
int i, boardcount_good = 0, boardcount_bad = 0; 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; const struct board_info *b = boards;
int maxvendorlen = strlen("Vendor") + 1; int maxvendorlen = strlen("Vendor") + 1;
int maxboardlen = strlen("Board") + 1; int maxboardlen = strlen("Board") + 1;
@@ -241,7 +241,7 @@ static void print_supported_boards_helper(const struct board_info *boards,
msg_ginfo(" "); msg_ginfo(" ");
msg_ginfo((b->working) ? "OK " : "BAD "); 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) if (strcmp(e->vendor_name, b->vendor)
|| strcmp(e->board_name, b->name)) || strcmp(e->board_name, b->name))
continue; continue;

2
print_wiki.c
View File

@@ -125,7 +125,7 @@ static void wiki_helper(const char *devicetype, int cols,
int num_notes = 0; int num_notes = 0;
char *notes = calloc(1, 1); char *notes = calloc(1, 1);
char tmp[900 + 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++) { for (i = 0; boards[i].vendor != NULL; i++) {
if (boards[i].working) if (boards[i].working)

4
programmer.h
View File

@@ -158,7 +158,7 @@ enum board_match_phase {
P3 P3
}; };
struct board_pciid_enable { struct board_match {
/* Any device, but make it sensible, like the ISA bridge. */ /* Any device, but make it sensible, like the ISA bridge. */
uint16_t first_vendor; uint16_t first_vendor;
uint16_t first_device; uint16_t first_device;
@@ -190,7 +190,7 @@ struct board_pciid_enable {
int (*enable) (void); /* May be NULL. */ int (*enable) (void); /* May be NULL. */
}; };
extern const struct board_pciid_enable board_pciid_enables[]; extern const struct board_match board_matches[];
struct board_info { struct board_info {
const char *vendor; const char *vendor;