diff options
| author | Michael Brown | 2009-03-12 20:41:40 +0100 |
|---|---|---|
| committer | Michael Brown | 2009-03-13 03:06:30 +0100 |
| commit | 1266d7902bf7f2534ee279671d48613ef9b2434c (patch) | |
| tree | a1a5b188148d983fa962a887476259768f1751d4 /src/net/udp | |
| parent | [tcp] Avoid setting PSH flag when SYN flag is set (diff) | |
| download | ipxe-1266d7902bf7f2534ee279671d48613ef9b2434c.tar.gz ipxe-1266d7902bf7f2534ee279671d48613ef9b2434c.tar.xz ipxe-1266d7902bf7f2534ee279671d48613ef9b2434c.zip | |
[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/net/udp')
| -rw-r--r-- | src/net/udp/dhcp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c index ab843ce1d..0f4459956 100644 --- a/src/net/udp/dhcp.c +++ b/src/net/udp/dhcp.c @@ -88,10 +88,6 @@ static uint8_t dhcp_request_options_data[] = { DHCP_END }; -/** DHCP feature codes */ -static uint8_t dhcp_features[0] __table_start ( uint8_t, dhcp_features ); -static uint8_t dhcp_features_end[0] __table_end ( uint8_t, dhcp_features ); - /** Version number feature */ FEATURE_VERSION ( VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH ); @@ -884,6 +880,7 @@ int dhcp_create_request ( struct dhcp_packet *dhcppkt, struct dhcp_netdev_desc dhcp_desc; struct dhcp_client_id client_id; struct dhcp_client_uuid client_uuid; + uint8_t *dhcp_features; size_t dhcp_features_len; size_t ll_addr_len; ssize_t len; @@ -903,7 +900,8 @@ int dhcp_create_request ( struct dhcp_packet *dhcppkt, dhcppkt->dhcphdr->ciaddr = ciaddr; /* Add options to identify the feature list */ - dhcp_features_len = ( dhcp_features_end - dhcp_features ); + dhcp_features = table_start ( uint8_t, DHCP_FEATURES ); + dhcp_features_len = table_num_entries ( uint8_t, DHCP_FEATURES ); if ( ( rc = dhcppkt_store ( dhcppkt, DHCP_EB_ENCAP, dhcp_features, dhcp_features_len ) ) != 0 ) { DBG ( "DHCP could not set features list option: %s\n", |
