diff options
| author | Michael Brown | 2013-12-03 17:48:56 +0100 |
|---|---|---|
| committer | Michael Brown | 2013-12-05 01:37:02 +0100 |
| commit | 22001cb206c1320aee27f679a63d2171d35e99c5 (patch) | |
| tree | a972bb914371a68d4925dcc007238dcb836546ba /src/drivers/net/phantom | |
| parent | [fbcon] Add support for displaying a cursor (diff) | |
| download | ipxe-22001cb206c1320aee27f679a63d2171d35e99c5.tar.gz ipxe-22001cb206c1320aee27f679a63d2171d35e99c5.tar.xz ipxe-22001cb206c1320aee27f679a63d2171d35e99c5.zip | |
[settings] Explicitly separate the concept of a completed fetched setting
The fetch_setting() family of functions may currently modify the
definition of the specified setting (e.g. to add missing type
information). Clean up this interface by requiring callers to provide
an explicit buffer to contain the completed definition of the fetched
setting, if required.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/drivers/net/phantom')
| -rw-r--r-- | src/drivers/net/phantom/phantom.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/drivers/net/phantom/phantom.c b/src/drivers/net/phantom/phantom.c index 7f2fe0b6..e70ded08 100644 --- a/src/drivers/net/phantom/phantom.c +++ b/src/drivers/net/phantom/phantom.c @@ -1455,7 +1455,7 @@ static struct net_device_operations phantom_operations = { */ /** Phantom CLP settings scope */ -static struct settings_scope phantom_settings_scope; +static const struct settings_scope phantom_settings_scope; /** Phantom CLP data * @@ -1656,7 +1656,7 @@ static int phantom_clp_fetch ( struct phantom_nic *phantom, unsigned int port, /** A Phantom CLP setting */ struct phantom_clp_setting { /** iPXE setting */ - struct setting *setting; + const struct setting *setting; /** Setting number */ unsigned int clp_setting; }; @@ -1673,7 +1673,8 @@ static struct phantom_clp_setting clp_settings[] = { * @v clp_setting Setting number, or 0 if not found */ static unsigned int -phantom_clp_setting ( struct phantom_nic *phantom, struct setting *setting ) { +phantom_clp_setting ( struct phantom_nic *phantom, + const struct setting *setting ) { struct phantom_clp_setting *clp_setting; unsigned int i; @@ -1703,7 +1704,7 @@ phantom_clp_setting ( struct phantom_nic *phantom, struct setting *setting ) { * @ret applies Setting applies within this settings block */ static int phantom_setting_applies ( struct settings *settings, - struct setting *setting ) { + const struct setting *setting ) { struct phantom_nic *phantom = container_of ( settings, struct phantom_nic, settings ); unsigned int clp_setting; @@ -1723,7 +1724,7 @@ static int phantom_setting_applies ( struct settings *settings, * @ret rc Return status code */ static int phantom_store_setting ( struct settings *settings, - struct setting *setting, + const struct setting *setting, const void *data, size_t len ) { struct phantom_nic *phantom = container_of ( settings, struct phantom_nic, settings ); |