aboutsummaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorMichael Brown <mcb30@etherboot.org>2009-03-12 19:41:40 +0000
committerMichael Brown <mcb30@etherboot.org>2009-03-13 02:06:30 +0000
commit1266d7902bf7f2534ee279671d48613ef9b2434c (patch)
treea1a5b188148d983fa962a887476259768f1751d4 /src/usr
parent3ed468e0c58bb0eb94925c18a0461cd5014b5777 (diff)
downloadipxe-1266d7902bf7f2534ee279671d48613ef9b2434c.tar.gz
[tables] Redefine methods for accessing linker tables
Intel's C compiler (icc) chokes on the zero-length arrays that we currently use as part of the mechanism for accessing linker table entries. Abstract away the zero-length arrays, to make a port to icc easier. Introduce macros such as for_each_table_entry() to simplify the common case of iterating over all entries in a linker table. Represent table names as #defined string constants rather than unquoted literals; this avoids visual confusion between table names and C variable or type names, and also allows us to force a compilation error in the event of incorrect table names.
Diffstat (limited to 'src/usr')
-rw-r--r--src/usr/autoboot.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c
index 98e79a7f..6cb744c3 100644
--- a/src/usr/autoboot.c
+++ b/src/usr/autoboot.c
@@ -43,12 +43,6 @@
/** Shutdown flags for exit */
int shutdown_exit_flags = 0;
-/* SAN boot protocols */
-static struct sanboot_protocol sanboot_protocols[0] \
- __table_start ( struct sanboot_protocol, sanboot_protocols );
-static struct sanboot_protocol sanboot_protocols_end[0] \
- __table_end ( struct sanboot_protocol, sanboot_protocols );
-
/**
* Identify the boot network device
*
@@ -124,8 +118,7 @@ int boot_root_path ( const char *root_path ) {
struct sanboot_protocol *sanboot;
/* Quick hack */
- for ( sanboot = sanboot_protocols ;
- sanboot < sanboot_protocols_end ; sanboot++ ) {
+ for_each_table_entry ( sanboot, SANBOOT_PROTOCOLS ) {
if ( strncmp ( root_path, sanboot->prefix,
strlen ( sanboot->prefix ) ) == 0 ) {
return sanboot->boot ( root_path );