[PATCH] net: Move library functions to net/lib.c

[Sascha Hauer]

On Thu, Jul 02, 2015 at 10:38:01AM +0300, Antony Pavlov wrote:
> On Thu,  2 Jul 2015 08:36:53 +0200
> Sascha Hauer <s.hauer at pengutronix.de> wrote:
> 
> > Some network related functions are also needed when networking
> > is disabled. Move these to a separate file which is always compiled.
> > 
> > Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
> > ---
> >  net/Makefile |   1 +
> >  net/lib.c    | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> >  net/net.c    |  78 ------------------------------------------
> >  3 files changed, 109 insertions(+), 78 deletions(-)
> >  create mode 100644 net/lib.c
> > 
> > diff --git a/net/Makefile b/net/Makefile
> > index 58bf143..8d564e7 100644
> > --- a/net/Makefile
> > +++ b/net/Makefile
> > @@ -1,3 +1,4 @@
> > +obj-y			+= lib.o
> >  obj-$(CONFIG_NET)	+= eth.o
> >  obj-$(CONFIG_NET)	+= net.o
> >  obj-$(CONFIG_NET_NFS)	+= nfs.o
> > diff --git a/net/lib.c b/net/lib.c
> > new file mode 100644
> > index 0000000..04abfc2
> > --- /dev/null
> > +++ b/net/lib.c
> > @@ -0,0 +1,108 @@
> > +/*
> > + * net.c - barebox networking support
> > + *
> > + * Copyright (c) 2015 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
> > + *
> > + * based on U-Boot (LiMon) code
> > + *
> > + * Copyright 1994 - 2000 Neil Russell.
> > + * Copyright 2000 Roland Borde
> > + * Copyright 2000 Paolo Scaffardi
> > + * Copyright 2000-2002 Wolfgang Denk, wd at denx.de
> > + *
> > + * See file CREDITS for list of people who contributed to this
> > + * project.
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License version 2
> > + * as published by the Free Software Foundation.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > + * GNU General Public License for more details.
> > + *
> > + */
> > +
> > +#include <common.h>
> > +#include <net.h>
> > +#include <linux/ctype.h>
> > +
> > +int string_to_ethaddr(const char *str, u8 enetaddr[6])
> > +{
> > +	int reg;
> > +	char *e;
> > +
> > +        if (!str || strlen(str) != 17) {
> > +		memset(enetaddr, 0, 6);
> > +		return -EINVAL;
> > +	}
> > +
> > +        if (str[2] != ':' || str[5] != ':' || str[8] != ':' ||
> > +                        str[11] != ':' || str[14] != ':')
> > +                return -EINVAL;
> > +
> > +	for (reg = 0; reg < 6; ++reg) {
> > +		enetaddr[reg] = simple_strtoul (str, &e, 16);
> > +			str = e + 1;
> > +	}
> > +
> > +	return 0;
> > +}
> > +
> > +void ethaddr_to_string(const u8 enetaddr[6], char *str)
> > +{
> > +	sprintf(str, "%02x:%02x:%02x:%02x:%02x:%02x",
> > +		 enetaddr[0], enetaddr[1], enetaddr[2], enetaddr[3],
> > +		 enetaddr[4], enetaddr[5]);
> > +}
> > +
> > +void print_IPaddr (IPaddr_t x)
> > +{
> > +	puts(ip_to_string(x));
> > +}
> > +
> > +char *ip_to_string (IPaddr_t x)
> > +{
> > +	static char s[sizeof("xxx.xxx.xxx.xxx")];
> > +
> > +	x = ntohl (x);
> > +	sprintf (s, "%d.%d.%d.%d",
> 
> can we fix coding style here?

Sure, just did that. The remaining style issues now are "consider using
strict_strtoul".

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |