diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2011-08-04 20:07:58 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-08-04 20:07:58 +0000 |
| commit | ee6b31756a443fce0cb59973113a8ede34413bed (patch) | |
| tree | 149034bd9a56037f259ba3abcdb652847e1a0a09 /package/switch/src/switch-robo.c | |
| parent | 99c69c1cbfaf2f05e970ffbad70a80dc4b3fdd92 (diff) | |
| download | upstream-ee6b31756a443fce0cb59973113a8ede34413bed.tar.gz upstream-ee6b31756a443fce0cb59973113a8ede34413bed.tar.bz2 upstream-ee6b31756a443fce0cb59973113a8ede34413bed.zip | |
switch: update for brcm47xx target
* remove suport for 2.4 kernel
* add support for bcma bus
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27904 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/switch/src/switch-robo.c')
| -rw-r--r-- | package/switch/src/switch-robo.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/package/switch/src/switch-robo.c b/package/switch/src/switch-robo.c index 817fba3f48..ec9e337337 100644 --- a/package/switch/src/switch-robo.c +++ b/package/switch/src/switch-robo.c @@ -34,6 +34,10 @@ #include "switch-core.h" #include "etc53xx.h" +#ifdef CONFIG_BCM47XX +#include <nvram.h> +#endif + #define DRIVER_NAME "bcm53xx" #define DRIVER_VERSION "0.02" #define PFX "roboswitch: " @@ -63,14 +67,6 @@ #define SIOCGETCPHYRD (SIOCDEVPRIVATE + 9) #define SIOCSETCPHYWR (SIOCDEVPRIVATE + 10) -/* Only available on brcm47xx */ -#ifdef BROADCOM -extern char *nvram_get(const char *name); -#define getvar(str) (nvram_get(str)?:"") -#else -#define getvar(str) "" -#endif - /* Data structure for a Roboswitch device. */ struct robo_switch { char *device; /* The device name string (ethX) */ @@ -258,6 +254,9 @@ static int robo_switch_enable(void) { unsigned int i, last_port; u16 val; +#ifdef CONFIG_BCM47XX + char buf[20]; +#endif val = robo_read16(ROBO_CTRL_PAGE, ROBO_SWITCH_MODE); if (!(val & (1 << 1))) { @@ -278,10 +277,13 @@ static int robo_switch_enable(void) robo_write16(ROBO_CTRL_PAGE, i, 0); } +#ifdef CONFIG_BCM47XX /* WAN port LED, except for Netgear WGT634U */ - if (strcmp(getvar("nvram_type"), "cfe") != 0) - robo_write16(ROBO_CTRL_PAGE, 0x16, 0x1F); - + if (nvram_getenv("nvram_type", buf, sizeof(buf)) >= 0) { + if (strcmp(buf, "cfe") != 0) + robo_write16(ROBO_CTRL_PAGE, 0x16, 0x1F); + } +#endif return 0; } |