From 7baa6289fe0e45039eae0b1073f774f94371da56 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 5 Jul 2007 18:01:56 +0200 Subject: svn_rev_469 - make some more char * const - dev_add_parameter -> dev_add_param --- net/eth.c | 10 +++++----- net/net.c | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'net') diff --git a/net/eth.c b/net/eth.c index 8451888a89..7f139a2fa9 100644 --- a/net/eth.c +++ b/net/eth.c @@ -97,11 +97,11 @@ int eth_register(struct eth_device *edev) edev->param_gateway.name = "gateway"; edev->param_netmask.name = "netmask"; edev->param_serverip.name = "serverip"; - dev_add_parameter(dev, &edev->param_ip); - dev_add_parameter(dev, &edev->param_mac); - dev_add_parameter(dev, &edev->param_gateway); - dev_add_parameter(dev, &edev->param_netmask); - dev_add_parameter(dev, &edev->param_serverip); + dev_add_param(dev, &edev->param_ip); + dev_add_param(dev, &edev->param_mac); + dev_add_param(dev, &edev->param_gateway); + dev_add_param(dev, &edev->param_netmask); + dev_add_param(dev, &edev->param_serverip); if (edev->get_mac_address(edev, ethaddr) == 0) { enet_addr_to_string(ethaddr, ethaddr_str); diff --git a/net/net.c b/net/net.c index ca2b1ef7da..df95da7419 100644 --- a/net/net.c +++ b/net/net.c @@ -291,7 +291,8 @@ NetLoop(proto_t protocol) return -1; restart: - string_to_enet_addr(dev_get_param(eth_get_current()->dev, "mac"), NetOurEther); + string_to_enet_addr(dev_get_param(eth_get_current()->dev, "mac"), + NetOurEther); NetState = NETLOOP_CONTINUE; @@ -1513,7 +1514,7 @@ char *ip_to_string (IPaddr_t x, char *s) return s; } -IPaddr_t string_to_ip(char *s) +IPaddr_t string_to_ip(const char *s) { IPaddr_t addr; char *e; @@ -1581,7 +1582,7 @@ ushort getenv_VLAN(char *var) return (string_to_VLAN(getenv(var))); } -int string_to_enet_addr(char *str, char *enetaddr) +int string_to_enet_addr(const char *str, char *enetaddr) { ulong reg; char *e; @@ -1601,7 +1602,7 @@ int string_to_enet_addr(char *str, char *enetaddr) return 0; } -void enet_addr_to_string(char *enetaddr, char *str) +void enet_addr_to_string(const char *enetaddr, char *str) { sprintf (str, "%02X:%02X:%02X:%02X:%02X:%02X", enetaddr[0], enetaddr[1], enetaddr[2], enetaddr[3], -- cgit v1.2.3