domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stopgap compilation fixes for diag and switch under 2.6.25

Browse Source 
SVN-Revision: 11231
This commit is contained in:
Peter Denison
2008-05-20 22:33:45 +00:00
parent de5c50cfe4
commit f027ecb2cf
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package/broadcom-diag/src/diag.c
View File

@@ -682,7 +682,7 @@ static struct platform_t __init *platform_detect(void)
/* Look for a model identifier */ /* Look for a model identifier */
/* Based on "model_name" */ /* Based on "model_name" */
if (buf = nvram_get("model_name")) { if ((buf = nvram_get("model_name"))) {
if (!strcmp(buf, "DIR-130")) if (!strcmp(buf, "DIR-130"))
return &platforms[DIR130]; return &platforms[DIR130];
if (!strcmp(buf, "DIR-330")) if (!strcmp(buf, "DIR-330"))
@@ -690,13 +690,13 @@ static struct platform_t __init *platform_detect(void)
} }
/* Based on "model_no" */ /* Based on "model_no" */
if (buf = nvram_get("model_no")) { if ((buf = nvram_get("model_no"))) {
if (startswith(buf,"WL700")) /* WL700* */ if (startswith(buf,"WL700")) /* WL700* */
return &platforms[WL700GE]; return &platforms[WL700GE];
} }
/* Based on "hardware_version" */ /* Based on "hardware_version" */
if (buf = nvram_get("hardware_version")) { if ((buf = nvram_get("hardware_version"))) {
if (startswith(buf,"WL500GPV2-")) /* WL500GPV2-* */ if (startswith(buf,"WL500GPV2-")) /* WL500GPV2-* */
return &platforms[WL500GPV2]; return &platforms[WL500GPV2];
if (startswith(buf,"WL520GC-")) /* WL520GU-* */ if (startswith(buf,"WL520GC-")) /* WL520GU-* */
@@ -706,7 +706,7 @@ static struct platform_t __init *platform_detect(void)
} }
/* Based on "ModelId" */ /* Based on "ModelId" */
if (buf = nvram_get("ModelId")) { if ((buf = nvram_get("ModelId"))) {
if (!strcmp(buf, "WR850GP")) if (!strcmp(buf, "WR850GP"))
return &platforms[WR850GP]; return &platforms[WR850GP];
if (!strcmp(buf,"WX-5565")) if (!strcmp(buf,"WX-5565"))

9
package/broadcom-diag/src/gpio.h
View File

@@ -5,6 +5,10 @@
#ifndef BCMDRIVER #ifndef BCMDRIVER
#include <linux/ssb/ssb_embedded.h> #include <linux/ssb/ssb_embedded.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
#include <linux/gpio.h>
#define ssb ssb_bcm47xx
#endif
extern struct ssb_bus ssb; extern struct ssb_bus ssb;
@@ -51,11 +55,16 @@ static void gpio_set_irqenable(int enabled, irqreturn_t (*handler)(int, void *))
{ {
int irq; int irq;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
irq = gpio_to_irq(0);
if (irq == -EINVAL) return;
#else
if (ssb.chipco.dev) if (ssb.chipco.dev)
irq = ssb_mips_irq(ssb.chipco.dev) + 2; irq = ssb_mips_irq(ssb.chipco.dev) + 2;
else if (ssb.extif.dev) else if (ssb.extif.dev)
irq = ssb_mips_irq(ssb.extif.dev) + 2; irq = ssb_mips_irq(ssb.extif.dev) + 2;
else return; else return;
#endif
if (enabled) { if (enabled) {
if (request_irq(irq, handler, IRQF_SHARED | IRQF_SAMPLE_RANDOM, "gpio", handler)) if (request_irq(irq, handler, IRQF_SHARED | IRQF_SAMPLE_RANDOM, "gpio", handler))

4
package/switch/src/gpio-bcm947xx.h
View File

@@ -5,6 +5,10 @@
#ifndef BCMDRIVER #ifndef BCMDRIVER
#include <linux/ssb/ssb_embedded.h> #include <linux/ssb/ssb_embedded.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
#define ssb ssb_bcm47xx
#endif
extern struct ssb_bus ssb; extern struct ssb_bus ssb;