Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59833fcf authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by Ralf Baechle
Browse files

MIPS: BCM47xx: Use sscanf for parsing mac address 



Instead of writing own function for parsing the mac address we now
use sscanf.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
To: linux-mips@linux-mips.org
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Patchwork: https://patchwork.linux-mips.org/patch/1847/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 2aa088d6

arch/mips/bcm47xx/setup.c

+3 −20
Original line number Original line Diff line number Diff line
@@ -56,23 +56,6 @@ static void bcm47xx_machine_halt(void) 
		cpu_relax();

		cpu_relax();

}

}





static void str2eaddr(char *str, char *dest)

{

	int i = 0;



	if (str == NULL) {

		memset(dest, 0, 6);

		return;

	}



	for (;;) {

		dest[i++] = (char) simple_strtoul(str, NULL, 16);

		str += 2;

		if (!*str++ || i == 6)

			break;

	}

}



#define READ_FROM_NVRAM(_outvar, name, buf) \

#define READ_FROM_NVRAM(_outvar, name, buf) \

	if (nvram_getenv(name, buf, sizeof(buf)) >= 0)\

	if (nvram_getenv(name, buf, sizeof(buf)) >= 0)\

		sprom->_outvar = simple_strtoul(buf, NULL, 0);

		sprom->_outvar = simple_strtoul(buf, NULL, 0);
@@ -87,11 +70,11 @@ static void bcm47xx_fill_sprom(struct ssb_sprom *sprom) 
	sprom->revision = 1; /* Fallback: Old hardware does not define this. */

	sprom->revision = 1; /* Fallback: Old hardware does not define this. */

	READ_FROM_NVRAM(revision, "sromrev", buf);

	READ_FROM_NVRAM(revision, "sromrev", buf);

	if (nvram_getenv("il0macaddr", buf, sizeof(buf)) >= 0)

	if (nvram_getenv("il0macaddr", buf, sizeof(buf)) >= 0)

		str2eaddr(buf, sprom->il0mac);

		nvram_parse_macaddr(buf, sprom->il0mac);

	if (nvram_getenv("et0macaddr", buf, sizeof(buf)) >= 0)

	if (nvram_getenv("et0macaddr", buf, sizeof(buf)) >= 0)

		str2eaddr(buf, sprom->et0mac);

		nvram_parse_macaddr(buf, sprom->et0mac);

	if (nvram_getenv("et1macaddr", buf, sizeof(buf)) >= 0)

	if (nvram_getenv("et1macaddr", buf, sizeof(buf)) >= 0)

		str2eaddr(buf, sprom->et1mac);

		nvram_parse_macaddr(buf, sprom->et1mac);

	READ_FROM_NVRAM(et0phyaddr, "et0phyaddr", buf);

	READ_FROM_NVRAM(et0phyaddr, "et0phyaddr", buf);

	READ_FROM_NVRAM(et1phyaddr, "et1phyaddr", buf);

	READ_FROM_NVRAM(et1phyaddr, "et1phyaddr", buf);

	READ_FROM_NVRAM(et0mdcport, "et0mdcport", buf);

	READ_FROM_NVRAM(et0mdcport, "et0mdcport", buf);

arch/mips/include/asm/mach-bcm47xx/nvram.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 
#define __NVRAM_H

#define __NVRAM_H





#include <linux/types.h>

#include <linux/types.h>

#include <linux/kernel.h>





struct nvram_header {

struct nvram_header {

	u32 magic;

	u32 magic;
@@ -36,4 +37,10 @@ struct nvram_header { 




extern int nvram_getenv(char *name, char *val, size_t val_len);

extern int nvram_getenv(char *name, char *val, size_t val_len);





static inline void nvram_parse_macaddr(char *buf, u8 *macaddr)

{

	sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0], &macaddr[1],

	       &macaddr[2], &macaddr[3], &macaddr[4], &macaddr[5]);

}



#endif
 
#endif