From 92d15eff30410dcb0ec406e06b131fb7d9179ffd Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@etherboot.org>
Date: Tue, 25 Mar 2008 20:46:16 +0000
Subject: [Settings] Remove assumption that all settings have DHCP tag values

Allow for settings to be described by something other than a DHCP option
tag if desirable.  Currently used only for the MAC address setting.

Separate out fake DHCP packet creation code from dhcp.c to fakedhcp.c.

Remove notion of settings from dhcppkt.c.

Rationalise dhcp.c to use settings API only for final registration of the
DHCP options, rather than using {store,fetch}_setting throughout.
---
 src/hci/tui/settings_ui.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'src/hci/tui')

diff --git a/src/hci/tui/settings_ui.c b/src/hci/tui/settings_ui.c
index 83146b5..0907bfd 100644
--- a/src/hci/tui/settings_ui.c
+++ b/src/hci/tui/settings_ui.c
@@ -64,7 +64,7 @@ struct setting_widget {
 	/** Settings block */
 	struct settings *settings;
 	/** Configuration setting */
-	struct named_setting *setting;
+	struct setting *setting;
 	/** Screen row */
 	unsigned int row;
 	/** Screen column */
@@ -78,17 +78,17 @@ struct setting_widget {
 };
 
 /** Registered configuration settings */
-static struct named_setting named_settings[0]
-	__table_start ( struct named_setting, named_settings );
-static struct named_setting named_settings_end[0]
-	__table_end ( struct named_setting, named_settings );
-#define NUM_SETTINGS ( ( unsigned ) ( named_settings_end - named_settings ) )
+static struct setting all_settings[0]
+	__table_start ( struct setting, settings );
+static struct setting all_settings_end[0]
+	__table_end ( struct setting, settings );
+#define NUM_SETTINGS ( ( unsigned ) ( all_settings_end - all_settings ) )
 
 static void load_setting ( struct setting_widget *widget ) __nonnull;
 static int save_setting ( struct setting_widget *widget ) __nonnull;
 static void init_setting ( struct setting_widget *widget,
                            struct settings *settings,
-                           struct named_setting *setting,
+                           struct setting *setting,
                            unsigned int row, unsigned int col ) __nonnull;
 static void draw_setting ( struct setting_widget *widget ) __nonnull;
 static int edit_setting ( struct setting_widget *widget, int key ) __nonnull;
@@ -99,7 +99,7 @@ static void vmsg ( unsigned int row, const char *fmt, va_list args ) __nonnull;
 static void msg ( unsigned int row, const char *fmt, ... ) __nonnull;
 static void valert ( const char *fmt, va_list args ) __nonnull;
 static void alert ( const char *fmt, ... ) __nonnull;
-static void draw_info_row ( struct named_setting *setting ) __nonnull;
+static void draw_info_row ( struct setting *setting ) __nonnull;
 static int main_loop ( struct settings *settings ) __nonnull;
 
 /**
@@ -114,9 +114,8 @@ static void load_setting ( struct setting_widget *widget ) {
 	widget->editing = 0;
 
 	/* Read current setting value */
-	if ( fetch_typed_setting ( widget->settings, widget->setting->tag,
-				   widget->setting->type, widget->value,
-				   sizeof ( widget->value ) ) < 0 ) {
+	if ( fetchf_setting ( widget->settings, widget->setting,
+			      widget->value, sizeof ( widget->value ) ) < 0 ) {
 		widget->value[0] = '\0';
 	}	
 
@@ -133,8 +132,8 @@ static void load_setting ( struct setting_widget *widget ) {
  * @v widget		Setting widget
  */
 static int save_setting ( struct setting_widget *widget ) {
-	return store_typed_setting ( widget->settings, widget->setting->tag,
-				     widget->setting->type, widget->value );
+	return storef_setting ( widget->settings, widget->setting,
+				widget->value );
 }
 
 /**
@@ -148,7 +147,7 @@ static int save_setting ( struct setting_widget *widget ) {
  */
 static void init_setting ( struct setting_widget *widget,
 			   struct settings *settings,
-			   struct named_setting *setting,
+			   struct setting *setting,
 			   unsigned int row, unsigned int col ) {
 
 	/* Initialise widget structure */
@@ -224,7 +223,7 @@ static int edit_setting ( struct setting_widget *widget, int key ) {
 static void init_setting_index ( struct setting_widget *widget,
 				 struct settings *settings,
 				 unsigned int index ) {
-	init_setting ( widget, settings, &named_settings[index],
+	init_setting ( widget, settings, &all_settings[index],
 		       ( SETTINGS_LIST_ROW + index ), SETTINGS_LIST_COL );
 }
 
@@ -311,7 +310,7 @@ static void draw_title_row ( void ) {
  *
  * @v setting		Current configuration setting
  */
-static void draw_info_row ( struct named_setting *setting ) {
+static void draw_info_row ( struct setting *setting ) {
 	clearmsg ( INFO_ROW );
 	attron ( A_BOLD );
 	msg ( INFO_ROW, "%s - %s", setting->name, setting->description );
-- 
cgit v1.1