[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.

5 files changed, 5 insertions, 30 deletions

diff --git a/src/drivers/bus/eisa.c b/src/drivers/bus/eisa.c
index d9e423597..1af56f2e8 100644
--- a/src/drivers/bus/eisa.c
+++ b/src/drivers/bus/eisa.c
@@ -7,11 +7,6 @@
 #include <unistd.h>
 #include <gpxe/eisa.h>
 
-static struct eisa_driver eisa_drivers[0]
-	__table_start ( struct eisa_driver, eisa_drivers );
-static struct eisa_driver eisa_drivers_end[0]
-	__table_end ( struct eisa_driver, eisa_drivers );
-
 static void eisabus_remove ( struct root_device *rootdev );
 
 /**
@@ -57,7 +52,7 @@ static int eisa_probe ( struct eisa_device *eisa ) {
 	      eisa->slot, eisa->vendor_id, eisa->prod_id,
 	      isa_id_string ( eisa->vendor_id, eisa->prod_id ), eisa->ioaddr );
 
-	for ( driver = eisa_drivers; driver < eisa_drivers_end; driver++ ) {
+	for_each_table_entry ( driver, EISA_DRIVERS ) {
 		for ( i = 0 ; i < driver->id_count ; i++ ) {
 			id = &driver->ids[i];
 			if ( id->vendor_id != eisa->vendor_id )
diff --git a/src/drivers/bus/isa.c b/src/drivers/bus/isa.c
index fa5def544..eb49fbf2f 100644
--- a/src/drivers/bus/isa.c
+++ b/src/drivers/bus/isa.c
@@ -48,11 +48,6 @@ static isa_probe_addr_t isa_extra_probe_addrs[] = {
 	  isa_extra_probe_addrs[ (ioidx) + ISA_EXTRA_PROBE_ADDR_COUNT ] : \
 	  (driver)->probe_addrs[(ioidx)] )
 
-static struct isa_driver isa_drivers[0]
-	__table_start ( struct isa_driver, isa_drivers );
-static struct isa_driver isa_drivers_end[0]
-	__table_end ( struct isa_driver, isa_drivers );
-
 static void isabus_remove ( struct root_device *rootdev );
 
 /**
@@ -100,7 +95,7 @@ static int isabus_probe ( struct root_device *rootdev ) {
 	int ioidx;
 	int rc;
 
-	for ( driver = isa_drivers ; driver < isa_drivers_end ; driver++ ) {
+	for_each_table_entry ( driver, ISA_DRIVERS ) {
 		for ( ioidx = ISA_IOIDX_MIN ( driver ) ;
 		      ioidx <= ISA_IOIDX_MAX ( driver ) ; ioidx++ ) {
 			/* Allocate struct isa_device */
diff --git a/src/drivers/bus/isapnp.c b/src/drivers/bus/isapnp.c
index 8f812df8e..957a955b1 100644
--- a/src/drivers/bus/isapnp.c
+++ b/src/drivers/bus/isapnp.c
@@ -72,11 +72,6 @@
  */
 uint16_t isapnp_read_port;
 
-static struct isapnp_driver isapnp_drivers[0]
-	__table_start ( struct isapnp_driver, isapnp_drivers );
-static struct isapnp_driver isapnp_drivers_end[0]
-	__table_end ( struct isapnp_driver, isapnp_drivers );
-
 static void isapnpbus_remove ( struct root_device *rootdev );
 
 /*
@@ -594,7 +589,7 @@ static int isapnp_probe ( struct isapnp_device *isapnp ) {
 	      isa_id_string ( isapnp->vendor_id, isapnp->prod_id ),
 	      isapnp->ioaddr, isapnp->irqno );
 
-	for ( driver = isapnp_drivers; driver < isapnp_drivers_end; driver++ ){
+	for_each_table_entry ( driver, ISAPNP_DRIVERS ) {
 		for ( i = 0 ; i < driver->id_count ; i++ ) {
 			id = &driver->ids[i];
 			if ( id->vendor_id != isapnp->vendor_id )
diff --git a/src/drivers/bus/mca.c b/src/drivers/bus/mca.c
index e92338134..d6bb60f28 100644
--- a/src/drivers/bus/mca.c
+++ b/src/drivers/bus/mca.c
@@ -13,11 +13,6 @@
 #include <gpxe/io.h>
 #include <gpxe/mca.h>
 
-static struct mca_driver mca_drivers[0]
-	__table_start ( struct mca_driver, mca_drivers );
-static struct mca_driver mca_drivers_end[0]
-	__table_end ( struct mca_driver, mca_drivers );
-
 static void mcabus_remove ( struct root_device *rootdev );
 
 /**
@@ -41,7 +36,7 @@ static int mca_probe ( struct mca_device *mca ) {
 	      mca->pos[0], mca->pos[1], mca->pos[2], mca->pos[3],
 	      mca->pos[4], mca->pos[5], mca->pos[6], mca->pos[7] );
 
-	for ( driver = mca_drivers; driver < mca_drivers_end; driver++ ){
+	for_each_table_entry ( driver, MCA_DRIVERS ) {
 		for ( i = 0 ; i < driver->id_count ; i++ ) {
 			id = &driver->ids[i];
 			if ( id->id != MCA_ID ( mca ) )
diff --git a/src/drivers/bus/pci.c b/src/drivers/bus/pci.c
index 2dc9d43a8..7f038c2b5 100644
--- a/src/drivers/bus/pci.c
+++ b/src/drivers/bus/pci.c
@@ -34,11 +34,6 @@
  *
  */
 
-static struct pci_driver pci_drivers[0]
-	__table_start ( struct pci_driver, pci_drivers );
-static struct pci_driver pci_drivers_end[0]
-	__table_end ( struct pci_driver, pci_drivers );
-
 static void pcibus_remove ( struct root_device *rootdev );
 
 /**
@@ -188,7 +183,7 @@ static int pci_probe ( struct pci_device *pci ) {
 	      PCI_FUNC ( pci->devfn ), pci->vendor, pci->device,
 	      pci->membase, pci->ioaddr, pci->irq );
 
-	for ( driver = pci_drivers ; driver < pci_drivers_end ; driver++ ) {
+	for_each_table_entry ( driver, PCI_DRIVERS ) {
 		for ( i = 0 ; i < driver->id_count ; i++ ) {
 			id = &driver->ids[i];
 			if ( ( id->vendor != PCI_ANY_ID ) &&