From 8482451812d6b48e65a1016447f30591099ded62 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 23 Mar 2011 11:57:29 +0000 Subject: [settings] Impose a fixed order on settings Improve the appearance of the "config" user interface by ensuring that settings appear in some kind of logical order. Signed-off-by: Michael Brown --- src/net/80211/net80211.c | 6 +++--- src/net/ipv4.c | 6 +++--- src/net/netdev_settings.c | 4 ++-- src/net/tcp/iscsi.c | 6 +++--- src/net/udp/dhcp.c | 6 +++--- src/net/udp/dns.c | 4 ++-- src/net/udp/syslog.c | 2 +- src/net/udp/tftp.c | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src/net') diff --git a/src/net/80211/net80211.c b/src/net/80211/net80211.c index c42928e..3bbca19 100644 --- a/src/net/80211/net80211.c +++ b/src/net/80211/net80211.c @@ -202,7 +202,7 @@ struct settings_applicator net80211_applicator __settings_applicator = { * If this is blank, we scan for all networks and use the one with the * greatest signal strength. */ -struct setting net80211_ssid_setting __setting = { +struct setting net80211_ssid_setting __setting ( SETTING_NETDEV_EXTRA ) = { .name = "ssid", .description = "802.11 SSID (network name)", .type = &setting_type_string, @@ -215,7 +215,7 @@ struct setting net80211_ssid_setting __setting = { * active scan (send probe packets). If this setting is nonzero, an * active scan on the 2.4GHz band will be used to associate. */ -struct setting net80211_active_setting __setting = { +struct setting net80211_active_setting __setting ( SETTING_NETDEV_EXTRA ) = { .name = "active-scan", .description = "Use an active scan during 802.11 association", .type = &setting_type_int8, @@ -228,7 +228,7 @@ struct setting net80211_active_setting __setting = { * normal iPXE method for entering hex settings; an ASCII string of * hex characters will not behave as expected. */ -struct setting net80211_key_setting __setting = { +struct setting net80211_key_setting __setting ( SETTING_NETDEV_EXTRA ) = { .name = "key", .description = "Encryption key for protected 802.11 networks", .type = &setting_type_string, diff --git a/src/net/ipv4.c b/src/net/ipv4.c index f6a1e6e..3d6d738 100644 --- a/src/net/ipv4.c +++ b/src/net/ipv4.c @@ -554,7 +554,7 @@ struct arp_net_protocol ipv4_arp_protocol __arp_net_protocol = { */ /** IPv4 address setting */ -struct setting ip_setting __setting = { +struct setting ip_setting __setting ( SETTING_IPv4 ) = { .name = "ip", .description = "IPv4 address", .tag = DHCP_EB_YIADDR, @@ -562,7 +562,7 @@ struct setting ip_setting __setting = { }; /** IPv4 subnet mask setting */ -struct setting netmask_setting __setting = { +struct setting netmask_setting __setting ( SETTING_IPv4 ) = { .name = "netmask", .description = "IPv4 subnet mask", .tag = DHCP_SUBNET_MASK, @@ -570,7 +570,7 @@ struct setting netmask_setting __setting = { }; /** Default gateway setting */ -struct setting gateway_setting __setting = { +struct setting gateway_setting __setting ( SETTING_IPv4 ) = { .name = "gateway", .description = "Default gateway", .tag = DHCP_ROUTERS, diff --git a/src/net/netdev_settings.c b/src/net/netdev_settings.c index 220ffa9..2ef3984 100644 --- a/src/net/netdev_settings.c +++ b/src/net/netdev_settings.c @@ -34,13 +34,13 @@ FILE_LICENCE ( GPL2_OR_LATER ); */ /** Network device named settings */ -struct setting mac_setting __setting = { +struct setting mac_setting __setting ( SETTING_NETDEV ) = { .name = "mac", .description = "MAC address", .type = &setting_type_hex, .tag = NETDEV_SETTING_TAG_MAC, }; -struct setting busid_setting __setting = { +struct setting busid_setting __setting ( SETTING_NETDEV ) = { .name = "busid", .description = "Bus ID", .type = &setting_type_hex, diff --git a/src/net/tcp/iscsi.c b/src/net/tcp/iscsi.c index 6ae0eab..cde3ed6 100644 --- a/src/net/tcp/iscsi.c +++ b/src/net/tcp/iscsi.c @@ -1820,7 +1820,7 @@ enum iscsi_root_path_component { }; /** iSCSI initiator IQN setting */ -struct setting initiator_iqn_setting __setting = { +struct setting initiator_iqn_setting __setting ( SETTING_SANBOOT_EXTRA ) = { .name = "initiator-iqn", .description = "iSCSI initiator name", .tag = DHCP_ISCSI_INITIATOR_IQN, @@ -1828,7 +1828,7 @@ struct setting initiator_iqn_setting __setting = { }; /** iSCSI reverse username setting */ -struct setting reverse_username_setting __setting = { +struct setting reverse_username_setting __setting ( SETTING_AUTH_EXTRA ) = { .name = "reverse-username", .description = "Reverse user name", .tag = DHCP_EB_REVERSE_USERNAME, @@ -1836,7 +1836,7 @@ struct setting reverse_username_setting __setting = { }; /** iSCSI reverse password setting */ -struct setting reverse_password_setting __setting = { +struct setting reverse_password_setting __setting ( SETTING_AUTH_EXTRA ) = { .name = "reverse-password", .description = "Reverse password", .tag = DHCP_EB_REVERSE_PASSWORD, diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c index e6d127a..d4f4ede 100644 --- a/src/net/udp/dhcp.c +++ b/src/net/udp/dhcp.c @@ -93,7 +93,7 @@ static uint8_t dhcp_request_options_data[] = { FEATURE_VERSION ( VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH ); /** DHCP server address setting */ -struct setting dhcp_server_setting __setting = { +struct setting dhcp_server_setting __setting ( SETTING_MISC ) = { .name = "dhcp-server", .description = "DHCP server address", .tag = DHCP_SERVER_IDENTIFIER, @@ -101,7 +101,7 @@ struct setting dhcp_server_setting __setting = { }; /** DHCP user class setting */ -struct setting user_class_setting __setting = { +struct setting user_class_setting __setting ( SETTING_HOST_EXTRA ) = { .name = "user-class", .description = "User class identifier", .tag = DHCP_USER_CLASS_ID, @@ -109,7 +109,7 @@ struct setting user_class_setting __setting = { }; /** Use cached network settings */ -struct setting use_cached_setting __setting = { +struct setting use_cached_setting __setting ( SETTING_MISC ) = { .name = "use-cached", .description = "Use cached network settings", .tag = DHCP_EB_USE_CACHED, diff --git a/src/net/udp/dns.c b/src/net/udp/dns.c index 2326284..31a355f 100644 --- a/src/net/udp/dns.c +++ b/src/net/udp/dns.c @@ -587,7 +587,7 @@ struct resolver dns_resolver __resolver ( RESOLV_NORMAL ) = { */ /** DNS server setting */ -struct setting dns_setting __setting = { +struct setting dns_setting __setting ( SETTING_IPv4_EXTRA ) = { .name = "dns", .description = "DNS server", .tag = DHCP_DNS_SERVERS, @@ -595,7 +595,7 @@ struct setting dns_setting __setting = { }; /** Domain name setting */ -struct setting domain_setting __setting = { +struct setting domain_setting __setting ( SETTING_IPv4_EXTRA ) = { .name = "domain", .description = "Local domain", .tag = DHCP_DOMAIN_NAME, diff --git a/src/net/udp/syslog.c b/src/net/udp/syslog.c index f81ba2f..6d9fc21 100644 --- a/src/net/udp/syslog.c +++ b/src/net/udp/syslog.c @@ -146,7 +146,7 @@ struct console_driver syslog_console __console_driver = { */ /** Syslog server setting */ -struct setting syslog_setting __setting = { +struct setting syslog_setting __setting ( SETTING_MISC ) = { .name = "syslog", .description = "Syslog server", .tag = DHCP_LOG_SERVERS, diff --git a/src/net/udp/tftp.c b/src/net/udp/tftp.c index 777632e..f4e9f4c 100644 --- a/src/net/udp/tftp.c +++ b/src/net/udp/tftp.c @@ -1215,7 +1215,7 @@ struct uri_opener mtftp_uri_opener __uri_opener = { */ /** TFTP server setting */ -struct setting next_server_setting __setting = { +struct setting next_server_setting __setting ( SETTING_BOOT ) = { .name = "next-server", .description = "TFTP server", .tag = DHCP_EB_SIADDR, -- cgit v1.1