From 9fd6a0418f38461d6d87f2c88785028d65fd6a1c Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Thu, 2 Aug 2007 14:51:03 +0100
Subject: Allowed zero-cost enforced ordering of features in startup banner
 list.

Added FEATURE() macros to most relevant (non-driver) files.
---
 src/net/aoe.c       | 2 +-
 src/net/tcp/ftp.c   | 3 +++
 src/net/tcp/http.c  | 2 +-
 src/net/tcp/https.c | 2 +-
 src/net/tcp/iscsi.c | 2 +-
 src/net/udp/dns.c   | 3 +++
 src/net/udp/tftp.c  | 3 +++
 7 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'src/net')

diff --git a/src/net/aoe.c b/src/net/aoe.c
index 2e2199b3f..e3f84e5ae 100644
--- a/src/net/aoe.c
+++ b/src/net/aoe.c
@@ -40,7 +40,7 @@
  *
  */
 
-FEATURE ( "AoE", DHCP_EB_FEATURE_AOE, 1 );
+FEATURE ( FEATURE_PROTOCOL, "AoE", DHCP_EB_FEATURE_AOE, 1 );
 
 struct net_protocol aoe_protocol;
 
diff --git a/src/net/tcp/ftp.c b/src/net/tcp/ftp.c
index 646638aba..0e4d969f1 100644
--- a/src/net/tcp/ftp.c
+++ b/src/net/tcp/ftp.c
@@ -11,6 +11,7 @@
 #include <gpxe/xfer.h>
 #include <gpxe/open.h>
 #include <gpxe/uri.h>
+#include <gpxe/features.h>
 #include <gpxe/ftp.h>
 
 /** @file
@@ -19,6 +20,8 @@
  *
  */
 
+FEATURE ( FEATURE_PROTOCOL, "FTP", DHCP_EB_FEATURE_FTP, 1 );
+
 /**
  * FTP states
  *
diff --git a/src/net/tcp/http.c b/src/net/tcp/http.c
index 0aecc7b51..2a5450eda 100644
--- a/src/net/tcp/http.c
+++ b/src/net/tcp/http.c
@@ -43,7 +43,7 @@
 #include <gpxe/features.h>
 #include <gpxe/http.h>
 
-FEATURE ( "HTTP", DHCP_EB_FEATURE_HTTP, 1 );
+FEATURE ( FEATURE_PROTOCOL, "HTTP", DHCP_EB_FEATURE_HTTP, 1 );
 
 /** HTTP receive state */
 enum http_rx_state {
diff --git a/src/net/tcp/https.c b/src/net/tcp/https.c
index a59e94dc1..15ab32ef8 100644
--- a/src/net/tcp/https.c
+++ b/src/net/tcp/https.c
@@ -29,7 +29,7 @@
 #include <gpxe/http.h>
 #include <gpxe/features.h>
 
-FEATURE ( "HTTPS", DHCP_EB_FEATURE_HTTPS, 1 );
+FEATURE ( FEATURE_PROTOCOL, "HTTPS", DHCP_EB_FEATURE_HTTPS, 1 );
 
 /**
  * Initiate an HTTPS connection
diff --git a/src/net/tcp/iscsi.c b/src/net/tcp/iscsi.c
index a96331a66..ccb6cffe0 100644
--- a/src/net/tcp/iscsi.c
+++ b/src/net/tcp/iscsi.c
@@ -41,7 +41,7 @@
  *
  */
 
-FEATURE ( "iSCSI", DHCP_EB_FEATURE_ISCSI, 1 );
+FEATURE ( FEATURE_PROTOCOL, "iSCSI", DHCP_EB_FEATURE_ISCSI, 1 );
 
 /** iSCSI initiator name (explicitly specified) */
 static char *iscsi_explicit_initiator_iqn;
diff --git a/src/net/udp/dns.c b/src/net/udp/dns.c
index b141eea42..f32b2e055 100644
--- a/src/net/udp/dns.c
+++ b/src/net/udp/dns.c
@@ -31,6 +31,7 @@
 #include <gpxe/retry.h>
 #include <gpxe/tcpip.h>
 #include <gpxe/dhcp.h>
+#include <gpxe/features.h>
 #include <gpxe/dns.h>
 
 /** @file
@@ -39,6 +40,8 @@
  *
  */
 
+FEATURE ( FEATURE_PROTOCOL, "DNS", DHCP_EB_FEATURE_DNS, 1 );
+
 /** The DNS server */
 static struct sockaddr_tcpip nameserver = {
 	.st_port = htons ( DNS_PORT ),
diff --git a/src/net/udp/tftp.c b/src/net/udp/tftp.c
index 106c70475..ea4d1df30 100644
--- a/src/net/udp/tftp.c
+++ b/src/net/udp/tftp.c
@@ -30,6 +30,7 @@
 #include <gpxe/uri.h>
 #include <gpxe/tcpip.h>
 #include <gpxe/retry.h>
+#include <gpxe/features.h>
 #include <gpxe/tftp.h>
 
 /** @file
@@ -38,6 +39,8 @@
  *
  */
 
+FEATURE ( FEATURE_PROTOCOL, "TFTP", DHCP_EB_FEATURE_TFTP, 1 );
+
 /**
  * A TFTP request
  *
-- 
cgit v1.2.3-55-g7522