mirror of
https://github.com/ipxe/ipxe
synced 2025-12-22 04:50:25 +03:00
[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.
This commit is contained in:
@@ -14,18 +14,6 @@
|
||||
* TCP/IP transport-network layer interface
|
||||
*/
|
||||
|
||||
/** Registered network-layer protocols that support TCP/IP */
|
||||
static struct tcpip_net_protocol tcpip_net_protocols[0]
|
||||
__table_start ( struct tcpip_net_protocol, tcpip_net_protocols );
|
||||
static struct tcpip_net_protocol tcpip_net_protocols_end[0]
|
||||
__table_end ( struct tcpip_net_protocol, tcpip_net_protocols );
|
||||
|
||||
/** Registered transport-layer protocols that support TCP/IP */
|
||||
static struct tcpip_protocol tcpip_protocols[0]
|
||||
__table_start ( struct tcpip_protocol, tcpip_protocols );
|
||||
static struct tcpip_protocol tcpip_protocols_end[0]
|
||||
__table_end ( struct tcpip_protocol, tcpip_protocols );
|
||||
|
||||
/** Process a received TCP/IP packet
|
||||
*
|
||||
* @v iobuf I/O buffer
|
||||
@@ -48,7 +36,7 @@ int tcpip_rx ( struct io_buffer *iobuf, uint8_t tcpip_proto,
|
||||
struct tcpip_protocol *tcpip;
|
||||
|
||||
/* Hand off packet to the appropriate transport-layer protocol */
|
||||
for ( tcpip = tcpip_protocols; tcpip < tcpip_protocols_end; tcpip++ ) {
|
||||
for_each_table_entry ( tcpip, TCPIP_PROTOCOLS ) {
|
||||
if ( tcpip->tcpip_proto == tcpip_proto ) {
|
||||
DBG ( "TCP/IP received %s packet\n", tcpip->name );
|
||||
return tcpip->rx ( iobuf, st_src, st_dest, pshdr_csum );
|
||||
@@ -76,8 +64,7 @@ int tcpip_tx ( struct io_buffer *iobuf, struct tcpip_protocol *tcpip_protocol,
|
||||
struct tcpip_net_protocol *tcpip_net;
|
||||
|
||||
/* Hand off packet to the appropriate network-layer protocol */
|
||||
for ( tcpip_net = tcpip_net_protocols ;
|
||||
tcpip_net < tcpip_net_protocols_end ; tcpip_net++ ) {
|
||||
for_each_table_entry ( tcpip_net, TCPIP_NET_PROTOCOLS ) {
|
||||
if ( tcpip_net->sa_family == st_dest->st_family ) {
|
||||
DBG ( "TCP/IP sending %s packet\n", tcpip_net->name );
|
||||
return tcpip_net->tx ( iobuf, tcpip_protocol, st_src,
|
||||
|
||||
Reference in New Issue
Block a user