From 37418b652fcb624d6ae14f9c967686b96c274c53 Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 17 Jun 2006 16:56:12 +0000 Subject: move diag from target/linux/package/ to package/. git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3976 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/diag/Makefile | 37 +++++++ package/diag/diag_led.c | 268 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 305 insertions(+) create mode 100644 package/diag/Makefile create mode 100644 package/diag/diag_led.c (limited to 'package/diag') diff --git a/package/diag/Makefile b/package/diag/Makefile new file mode 100644 index 000000000..d6aa4bf17 --- /dev/null +++ b/package/diag/Makefile @@ -0,0 +1,37 @@ +# $Id$ + +include $(TOPDIR)/rules.mk +include $(TOPDIR)/package/kernel.mk + +PKG_NAME := kmod-diag +PKG_RELEASE := 1 +PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) + +include $(TOPDIR)/package/rules.mk + +DIAG_FLAGS:=$(TARGET_CFLAGS) -D__KERNEL__ -fno-strict-aliasing -fno-common -fomit-frame-pointer -G 0 \ + -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 \ + -Wa,-mips32 -Wa,--trap -Wstrict-prototypes -Wno-trigraphs -DMODULE -mlong-calls -fno-common -I. -I linux-2.4 -nostdinc \ + -iwithprefix include -I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/asm/gcc -c -I$(LINUX_DIR)/arch/mips/bcm947xx/include -DBCMDRIVER + +define Package/kmod-diag + SECTION:=drivers + CATEGORY:=Drivers + DEFAULT:=y + DEPENDS:=@LINUX_2_4_BRCM + TITLE:=Driver for router LEDs and Buttons + DESCRIPTION:=Driver for router LEDs and Buttons + URL:= + VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) +endef + +define Build/Compile + $(TARGET_CC) $(DIAG_FLAGS) -o $(PKG_BUILD_DIR)/diag.o diag_led.c +endef + +define Package/kmod-diag/install + install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION) + $(CP) $(PKG_BUILD_DIR)/diag.o $(1)/lib/modules/$(LINUX_VERSION)/ +endef + +$(eval $(call BuildPackage,kmod-diag)) diff --git a/package/diag/diag_led.c b/package/diag/diag_led.c new file mode 100644 index 000000000..6ad7ff102 --- /dev/null +++ b/package/diag/diag_led.c @@ -0,0 +1,268 @@ +/* + * diag_led.c - replacement diag module + * + * Copyright (C) 2004 Mike Baker, + * Imre Kaloz + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ + */ + +/* + * ChangeLog: + * 2004/03/28 initial release + * 2004/08/26 asus & buffalo support added + * 2005/03/14 asus wl-500g deluxe and buffalo v2 support added + * 2005/04/13 added licensing informations + * 2005/04/18 base reset polarity off initial readings + * 2006/02/07 motorola wa840g/we800g support added + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +extern char * nvram_get(const char *name); +static void *sbh; + +// v2.x - - - - - +#define DIAG_GPIO (1<<1) +#define DMZ_GPIO (1<<7) + +static void set_gpio(uint32 mask, uint32 value) { + sb_gpiocontrol(sbh,mask, 0, GPIO_DRV_PRIORITY); + sb_gpioouten(sbh,mask,mask,GPIO_DRV_PRIORITY); + sb_gpioout(sbh,mask,value,GPIO_DRV_PRIORITY); +} + +static void v2_set_diag(u8 state) { + set_gpio(DIAG_GPIO,state); +} +static void v2_set_dmz(u8 state) { + set_gpio(DMZ_GPIO,state); +} + +// v1.x - - - - - +#define LED_DIAG 0x13 +#define LED_DMZ 0x12 + +static void v1_set_diag(u8 state) { + if (!state) { + *(volatile u8*)(KSEG1ADDR(BCM4710_EUART)+LED_DIAG)=0xFF; + } else { + *(volatile u8*)(KSEG1ADDR(BCM4710_EUART)+LED_DIAG); + } +} +static void v1_set_dmz(u8 state) { + if (!state) { + *(volatile u8*)(KSEG1ADDR(BCM4710_EUART)+LED_DMZ)=0xFF; + } else { + *(volatile u8*)(KSEG1ADDR(BCM4710_EUART)+LED_DMZ); + } +} + +static void wap1_set_diag(u8 state) { + set_gpio(1<<3,state); +} +static void wap1_set_dmz(u8 state) { + set_gpio(1<<4,state); +} + +// - - - - - +static void ignore(u8 ignored) {}; + +// - - - - - +#define BIT_DMZ 0x01 +#define BIT_DIAG 0x04 + +void (*set_diag)(u8 state); +void (*set_dmz)(u8 state); + +static unsigned int diag = 0; + +static void diag_change() +{ + set_diag(0xFF); // off + set_dmz(0xFF); // off + + if(diag & BIT_DIAG) + set_diag(0x00); // on + if(diag & BIT_DMZ) + set_dmz(0x00); // on +} + +static int proc_diag(ctl_table *table, int write, struct file *filp, + void *buffer, size_t *lenp) +{ + int r; + r = proc_dointvec(table, write, filp, buffer, lenp); + if (write && !r) { + diag_change(); + } + return r; +} + +// - - - - - +static unsigned char reset_gpio = 0; +static unsigned char reset_polarity = 0; +static unsigned int reset = 0; + +static int proc_reset(ctl_table *table, int write, struct file *filp, + void *buffer, size_t *lenp) +{ + + if (reset_gpio) { + sb_gpiocontrol(sbh,reset_gpio,reset_gpio,GPIO_DRV_PRIORITY); + sb_gpioouten(sbh,reset_gpio,0,GPIO_DRV_PRIORITY); + reset=!(sb_gpioin(sbh)&reset_gpio); + + if (reset_polarity) reset=!reset; + } else { + reset=0; + } + + return proc_dointvec(table, write, filp, buffer, lenp); +} + +// - - - - - +static struct ctl_table_header *diag_sysctl_header; + +static ctl_table sys_diag[] = { + { + ctl_name: 2000, + procname: "diag", + data: &diag, + maxlen: sizeof(diag), + mode: 0644, + proc_handler: proc_diag + }, + { + ctl_name: 2001, + procname: "reset", + data: &reset, + maxlen: sizeof(reset), + mode: 0444, + proc_handler: proc_reset + }, + { 0 } +}; + +static int __init diag_init() +{ + char *buf; + u32 board_type; + sbh = sb_kattach(); + sb_gpiosetcore(sbh); + + board_type = sb_boardtype(sbh); + printk(KERN_INFO "diag boardtype: %08x\n",board_type); + + set_diag=ignore; + set_dmz=ignore; + + buf=nvram_get("pmon_ver") ?: ""; + if (((board_type & 0xf00) == 0x400) && (strncmp(buf, "CFE", 3) != 0)) { + buf=nvram_get("boardtype")?:""; + if (!strncmp(buf,"bcm94710dev",11)) { + buf=nvram_get("boardnum")?:""; + if (!strcmp(buf,"42")) { + // wrt54g v1.x + set_diag=v1_set_diag; + set_dmz=v1_set_dmz; + reset_gpio=(1<<6); + } + if (simple_strtoul(buf, NULL, 0) == 2) { + // wap54g v1.0 + // do not use strcmp as PMON v5.3.22 has some built-in nvram + // defaults with trailing \r + set_diag=wap1_set_diag; + // no dmz led on wap54g, used green led + // labeled "WLAN Link" instead + set_dmz=wap1_set_dmz; + reset_gpio=(1<<0); + } + if (!strcmp(buf,"asusX")) { + //asus wl-500g + reset_gpio=(1<<6); + } + if (!strcmp(buf,"2")) { + //wa840g v1 / we800g v1 + reset_gpio=(1<<0); + } + } + if (!strcmp(buf,"bcm94710ap")) { + buf=nvram_get("boardnum")?:""; + if (!strcmp(buf,"42")) { + // buffalo + set_dmz=v2_set_dmz; + reset_gpio=(1<<4); + } + if (!strcmp(buf,"44")) { + //dell truemobile + set_dmz=v2_set_dmz; + reset_gpio=(1<<0); + } + } + } else { + buf=nvram_get("boardnum")?:""; + if (!strcmp(buf,"42")) { + //linksys + set_diag=v2_set_diag; + set_dmz=v2_set_dmz; + reset_gpio=(1<<6); + } + if (!strcmp(buf,"44")) { + //motorola + reset_gpio=(1<<5); + } + if (!strcmp(buf,"00")) { + //buffalo + reset_gpio=(1<<7); + } + if (!strcmp(buf,"45")) { + //wl-500g deluxe + reset_gpio=(1<<6); + } + } + + + sb_gpiocontrol(sbh,reset_gpio,reset_gpio,GPIO_DRV_PRIORITY); + sb_gpioouten(sbh,reset_gpio,0,GPIO_DRV_PRIORITY); + reset_polarity=!(sb_gpioin(sbh)&reset_gpio); + + diag_sysctl_header = register_sysctl_table(sys_diag, 0); + diag_change(); + + return 0; +} + +static void __exit diag_exit() +{ + unregister_sysctl_table(diag_sysctl_header); +} + +EXPORT_NO_SYMBOLS; +MODULE_AUTHOR("openwrt.org"); +MODULE_LICENSE("GPL"); + +module_init(diag_init); +module_exit(diag_exit); -- cgit v1.2.3 From 8cefb4ff93372e8c46a8ed5493fd83b6f8393e00 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 18 Jun 2006 13:04:58 +0000 Subject: move source files to src/ and let the kernel tree build the module. git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3981 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/diag/Makefile | 43 ++++---- package/diag/diag_led.c | 268 ---------------------------------------------- package/diag/src/Makefile | 19 ++++ package/diag/src/diag.c | 268 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 312 insertions(+), 286 deletions(-) delete mode 100644 package/diag/diag_led.c create mode 100644 package/diag/src/Makefile create mode 100644 package/diag/src/diag.c (limited to 'package/diag') diff --git a/package/diag/Makefile b/package/diag/Makefile index d6aa4bf17..6fed3b51b 100644 --- a/package/diag/Makefile +++ b/package/diag/Makefile @@ -3,35 +3,42 @@ include $(TOPDIR)/rules.mk include $(TOPDIR)/package/kernel.mk -PKG_NAME := kmod-diag -PKG_RELEASE := 1 -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) +PKG_NAME:=kmod-diag +PKG_RELEASE:=1 -include $(TOPDIR)/package/rules.mk +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) -DIAG_FLAGS:=$(TARGET_CFLAGS) -D__KERNEL__ -fno-strict-aliasing -fno-common -fomit-frame-pointer -G 0 \ - -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 \ - -Wa,-mips32 -Wa,--trap -Wstrict-prototypes -Wno-trigraphs -DMODULE -mlong-calls -fno-common -I. -I linux-2.4 -nostdinc \ - -iwithprefix include -I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/asm/gcc -c -I$(LINUX_DIR)/arch/mips/bcm947xx/include -DBCMDRIVER +include $(TOPDIR)/package/rules.mk define Package/kmod-diag - SECTION:=drivers - CATEGORY:=Drivers - DEFAULT:=y - DEPENDS:=@LINUX_2_4_BRCM - TITLE:=Driver for router LEDs and Buttons - DESCRIPTION:=Driver for router LEDs and Buttons - URL:= - VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) +SECTION:=drivers +CATEGORY:=Drivers +DEFAULT:=y +DEPENDS:=@LINUX_2_4_BRCM +TITLE:=Driver for router LEDs and Buttons +DESCRIPTION:=Driver for router LEDs and Buttons +VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) +endef + +define Build/Prepare + mkdir -p $(PKG_BUILD_DIR) + $(CP) ./src/* $(PKG_BUILD_DIR)/ endef define Build/Compile - $(TARGET_CC) $(DIAG_FLAGS) -o $(PKG_BUILD_DIR)/diag.o diag_led.c + $(MAKE) -C "$(LINUX_DIR)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + ARCH="$(LINUX_KARCH)" \ + PATH="$(TARGET_PATH)" \ + SUBDIRS="$(PKG_BUILD_DIR)" \ + EXTRA_CFLAGS="-DBCMDRIVER -I$(LINUX_DIR)/arch/mips/bcm947xx/include" \ + modules endef define Package/kmod-diag/install install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION) - $(CP) $(PKG_BUILD_DIR)/diag.o $(1)/lib/modules/$(LINUX_VERSION)/ + $(CP) $(PKG_BUILD_DIR)/diag.$(LINUX_KMOD_SUFFIX) \ + $(1)/lib/modules/$(LINUX_VERSION)/ endef $(eval $(call BuildPackage,kmod-diag)) diff --git a/package/diag/diag_led.c b/package/diag/diag_led.c deleted file mode 100644 index 6ad7ff102..000000000 --- a/package/diag/diag_led.c +++ /dev/null @@ -1,268 +0,0 @@ -/* - * diag_led.c - replacement diag module - * - * Copyright (C) 2004 Mike Baker, - * Imre Kaloz - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - */ - -/* - * ChangeLog: - * 2004/03/28 initial release - * 2004/08/26 asus & buffalo support added - * 2005/03/14 asus wl-500g deluxe and buffalo v2 support added - * 2005/04/13 added licensing informations - * 2005/04/18 base reset polarity off initial readings - * 2006/02/07 motorola wa840g/we800g support added - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -extern char * nvram_get(const char *name); -static void *sbh; - -// v2.x - - - - - -#define DIAG_GPIO (1<<1) -#define DMZ_GPIO (1<<7) - -static void set_gpio(uint32 mask, uint32 value) { - sb_gpiocontrol(sbh,mask, 0, GPIO_DRV_PRIORITY); - sb_gpioouten(sbh,mask,mask,GPIO_DRV_PRIORITY); - sb_gpioout(sbh,mask,value,GPIO_DRV_PRIORITY); -} - -static void v2_set_diag(u8 state) { - set_gpio(DIAG_GPIO,state); -} -static void v2_set_dmz(u8 state) { - set_gpio(DMZ_GPIO,state); -} - -// v1.x - - - - - -#define LED_DIAG 0x13 -#define LED_DMZ 0x12 - -static void v1_set_diag(u8 state) { - if (!state) { - *(volatile u8*)(KSEG1ADDR(BCM4710_EUART)+LED_DIAG)=0xFF; - } else { - *(volatile u8*)(KSEG1ADDR(BCM4710_EUART)+LED_DIAG); - } -} -static void v1_set_dmz(u8 state) { - if (!state) { - *(volatile u8*)(KSEG1ADDR(BCM4710_EUART)+LED_DMZ)=0xFF; - } else { - *(volatile u8*)(KSEG1ADDR(BCM4710_EUART)+LED_DMZ); - } -} - -static void wap1_set_diag(u8 state) { - set_gpio(1<<3,state); -} -static void wap1_set_dmz(u8 state) { - set_gpio(1<<4,state); -} - -// - - - - - -static void ignore(u8 ignored) {}; - -// - - - - - -#define BIT_DMZ 0x01 -#define BIT_DIAG 0x04 - -void (*set_diag)(u8 state); -void (*set_dmz)(u8 state); - -static unsigned int diag = 0; - -static void diag_change() -{ - set_diag(0xFF); // off - set_dmz(0xFF); // off - - if(diag & BIT_DIAG) - set_diag(0x00); // on - if(diag & BIT_DMZ) - set_dmz(0x00); // on -} - -static int proc_diag(ctl_table *table, int write, struct file *filp, - void *buffer, size_t *lenp) -{ - int r; - r = proc_dointvec(table, write, filp, buffer, lenp); - if (write && !r) { - diag_change(); - } - return r; -} - -// - - - - - -static unsigned char reset_gpio = 0; -static unsigned char reset_polarity = 0; -static unsigned int reset = 0; - -static int proc_reset(ctl_table *table, int write, struct file *filp, - void *buffer, size_t *lenp) -{ - - if (reset_gpio) { - sb_gpiocontrol(sbh,reset_gpio,reset_gpio,GPIO_DRV_PRIORITY); - sb_gpioouten(sbh,reset_gpio,0,GPIO_DRV_PRIORITY); - reset=!(sb_gpioin(sbh)&reset_gpio); - - if (reset_polarity) reset=!reset; - } else { - reset=0; - } - - return proc_dointvec(table, write, filp, buffer, lenp); -} - -// - - - - - -static struct ctl_table_header *diag_sysctl_header; - -static ctl_table sys_diag[] = { - { - ctl_name: 2000, - procname: "diag", - data: &diag, - maxlen: sizeof(diag), - mode: 0644, - proc_handler: proc_diag - }, - { - ctl_name: 2001, - procname: "reset", - data: &reset, - maxlen: sizeof(reset), - mode: 0444, - proc_handler: proc_reset - }, - { 0 } -}; - -static int __init diag_init() -{ - char *buf; - u32 board_type; - sbh = sb_kattach(); - sb_gpiosetcore(sbh); - - board_type = sb_boardtype(sbh); - printk(KERN_INFO "diag boardtype: %08x\n",board_type); - - set_diag=ignore; - set_dmz=ignore; - - buf=nvram_get("pmon_ver") ?: ""; - if (((board_type & 0xf00) == 0x400) && (strncmp(buf, "CFE", 3) != 0)) { - buf=nvram_get("boardtype")?:""; - if (!strncmp(buf,"bcm94710dev",11)) { - buf=nvram_get("boardnum")?:""; - if (!strcmp(buf,"42")) { - // wrt54g v1.x - set_diag=v1_set_diag; - set_dmz=v1_set_dmz; - reset_gpio=(1<<6); - } - if (simple_strtoul(buf, NULL, 0) == 2) { - // wap54g v1.0 - // do not use strcmp as PMON v5.3.22 has some built-in nvram - // defaults with trailing \r - set_diag=wap1_set_diag; - // no dmz led on wap54g, used green led - // labeled "WLAN Link" instead - set_dmz=wap1_set_dmz; - reset_gpio=(1<<0); - } - if (!strcmp(buf,"asusX")) { - //asus wl-500g - reset_gpio=(1<<6); - } - if (!strcmp(buf,"2")) { - //wa840g v1 / we800g v1 - reset_gpio=(1<<0); - } - } - if (!strcmp(buf,"bcm94710ap")) { - buf=nvram_get("boardnum")?:""; - if (!strcmp(buf,"42")) { - // buffalo - set_dmz=v2_set_dmz; - reset_gpio=(1<<4); - } - if (!strcmp(buf,"44")) { - //dell truemobile - set_dmz=v2_set_dmz; - reset_gpio=(1<<0); - } - } - } else { - buf=nvram_get("boardnum")?:""; - if (!strcmp(buf,"42")) { - //linksys - set_diag=v2_set_diag; - set_dmz=v2_set_dmz; - reset_gpio=(1<<6); - } - if (!strcmp(buf,"44")) { - //motorola - reset_gpio=(1<<5); - } - if (!strcmp(buf,"00")) { - //buffalo - reset_gpio=(1<<7); - } - if (!strcmp(buf,"45")) { - //wl-500g deluxe - reset_gpio=(1<<6); - } - } - - - sb_gpiocontrol(sbh,reset_gpio,reset_gpio,GPIO_DRV_PRIORITY); - sb_gpioouten(sbh,reset_gpio,0,GPIO_DRV_PRIORITY); - reset_polarity=!(sb_gpioin(sbh)&reset_gpio); - - diag_sysctl_header = register_sysctl_table(sys_diag, 0); - diag_change(); - - return 0; -} - -static void __exit diag_exit() -{ - unregister_sysctl_table(diag_sysctl_header); -} - -EXPORT_NO_SYMBOLS; -MODULE_AUTHOR("openwrt.org"); -MODULE_LICENSE("GPL"); - -module_init(diag_init); -module_exit(diag_exit); diff --git a/package/diag/src/Makefile b/package/diag/src/Makefile new file mode 100644 index 000000000..169f2e972 --- /dev/null +++ b/package/diag/src/Makefile @@ -0,0 +1,19 @@ +# $Id$ +# +# Makefile for diag driver +# +# Copyright (C) 2005 Felix Fietkau +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version +# 2 of the License, or (at your option) any later version. +# + +obj-m := diag.o + +ifeq ($(MAKING_MODULES),1) +export-objs := diag.o + +-include $(TOPDIR)/Rules.make +endif diff --git a/package/diag/src/diag.c b/package/diag/src/diag.c new file mode 100644 index 000000000..6ad7ff102 --- /dev/null +++ b/package/diag/src/diag.c @@ -0,0 +1,268 @@ +/* + * diag_led.c - replacement diag module + * + * Copyright (C) 2004 Mike Baker, + * Imre Kaloz + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ + */ + +/* + * ChangeLog: + * 2004/03/28 initial release + * 2004/08/26 asus & buffalo support added + * 2005/03/14 asus wl-500g deluxe and buffalo v2 support added + * 2005/04/13 added licensing informations + * 2005/04/18 base reset polarity off initial readings + * 2006/02/07 motorola wa840g/we800g support added + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +extern char * nvram_get(const char *name); +static void *sbh; + +// v2.x - - - - - +#define DIAG_GPIO (1<<1) +#define DMZ_GPIO (1<<7) + +static void set_gpio(uint32 mask, uint32 value) { + sb_gpiocontrol(sbh,mask, 0, GPIO_DRV_PRIORITY); + sb_gpioouten(sbh,mask,mask,GPIO_DRV_PRIORITY); + sb_gpioout(sbh,mask,value,GPIO_DRV_PRIORITY); +} + +static void v2_set_diag(u8 state) { + set_gpio(DIAG_GPIO,state); +} +static void v2_set_dmz(u8 state) { + set_gpio(DMZ_GPIO,state); +} + +// v1.x - - - - - +#define LED_DIAG 0x13 +#define LED_DMZ 0x12 + +static void v1_set_diag(u8 state) { + if (!state) { + *(volatile u8*)(KSEG1ADDR(BCM4710_EUART)+LED_DIAG)=0xFF; + } else { + *(volatile u8*)(KSEG1ADDR(BCM4710_EUART)+LED_DIAG); + } +} +static void v1_set_dmz(u8 state) { + if (!state) { + *(volatile u8*)(KSEG1ADDR(BCM4710_EUART)+LED_DMZ)=0xFF; + } else { + *(volatile u8*)(KSEG1ADDR(BCM4710_EUART)+LED_DMZ); + } +} + +static void wap1_set_diag(u8 state) { + set_gpio(1<<3,state); +} +static void wap1_set_dmz(u8 state) { + set_gpio(1<<4,state); +} + +// - - - - - +static void ignore(u8 ignored) {}; + +// - - - - - +#define BIT_DMZ 0x01 +#define BIT_DIAG 0x04 + +void (*set_diag)(u8 state); +void (*set_dmz)(u8 state); + +static unsigned int diag = 0; + +static void diag_change() +{ + set_diag(0xFF); // off + set_dmz(0xFF); // off + + if(diag & BIT_DIAG) + set_diag(0x00); // on + if(diag & BIT_DMZ) + set_dmz(0x00); // on +} + +static int proc_diag(ctl_table *table, int write, struct file *filp, + void *buffer, size_t *lenp) +{ + int r; + r = proc_dointvec(table, write, filp, buffer, lenp); + if (write && !r) { + diag_change(); + } + return r; +} + +// - - - - - +static unsigned char reset_gpio = 0; +static unsigned char reset_polarity = 0; +static unsigned int reset = 0; + +static int proc_reset(ctl_table *table, int write, struct file *filp, + void *buffer, size_t *lenp) +{ + + if (reset_gpio) { + sb_gpiocontrol(sbh,reset_gpio,reset_gpio,GPIO_DRV_PRIORITY); + sb_gpioouten(sbh,reset_gpio,0,GPIO_DRV_PRIORITY); + reset=!(sb_gpioin(sbh)&reset_gpio); + + if (reset_polarity) reset=!reset; + } else { + reset=0; + } + + return proc_dointvec(table, write, filp, buffer, lenp); +} + +// - - - - - +static struct ctl_table_header *diag_sysctl_header; + +static ctl_table sys_diag[] = { + { + ctl_name: 2000, + procname: "diag", + data: &diag, + maxlen: sizeof(diag), + mode: 0644, + proc_handler: proc_diag + }, + { + ctl_name: 2001, + procname: "reset", + data: &reset, + maxlen: sizeof(reset), + mode: 0444, + proc_handler: proc_reset + }, + { 0 } +}; + +static int __init diag_init() +{ + char *buf; + u32 board_type; + sbh = sb_kattach(); + sb_gpiosetcore(sbh); + + board_type = sb_boardtype(sbh); + printk(KERN_INFO "diag boardtype: %08x\n",board_type); + + set_diag=ignore; + set_dmz=ignore; + + buf=nvram_get("pmon_ver") ?: ""; + if (((board_type & 0xf00) == 0x400) && (strncmp(buf, "CFE", 3) != 0)) { + buf=nvram_get("boardtype")?:""; + if (!strncmp(buf,"bcm94710dev",11)) { + buf=nvram_get("boardnum")?:""; + if (!strcmp(buf,"42")) { + // wrt54g v1.x + set_diag=v1_set_diag; + set_dmz=v1_set_dmz; + reset_gpio=(1<<6); + } + if (simple_strtoul(buf, NULL, 0) == 2) { + // wap54g v1.0 + // do not use strcmp as PMON v5.3.22 has some built-in nvram + // defaults with trailing \r + set_diag=wap1_set_diag; + // no dmz led on wap54g, used green led + // labeled "WLAN Link" instead + set_dmz=wap1_set_dmz; + reset_gpio=(1<<0); + } + if (!strcmp(buf,"asusX")) { + //asus wl-500g + reset_gpio=(1<<6); + } + if (!strcmp(buf,"2")) { + //wa840g v1 / we800g v1 + reset_gpio=(1<<0); + } + } + if (!strcmp(buf,"bcm94710ap")) { + buf=nvram_get("boardnum")?:""; + if (!strcmp(buf,"42")) { + // buffalo + set_dmz=v2_set_dmz; + reset_gpio=(1<<4); + } + if (!strcmp(buf,"44")) { + //dell truemobile + set_dmz=v2_set_dmz; + reset_gpio=(1<<0); + } + } + } else { + buf=nvram_get("boardnum")?:""; + if (!strcmp(buf,"42")) { + //linksys + set_diag=v2_set_diag; + set_dmz=v2_set_dmz; + reset_gpio=(1<<6); + } + if (!strcmp(buf,"44")) { + //motorola + reset_gpio=(1<<5); + } + if (!strcmp(buf,"00")) { + //buffalo + reset_gpio=(1<<7); + } + if (!strcmp(buf,"45")) { + //wl-500g deluxe + reset_gpio=(1<<6); + } + } + + + sb_gpiocontrol(sbh,reset_gpio,reset_gpio,GPIO_DRV_PRIORITY); + sb_gpioouten(sbh,reset_gpio,0,GPIO_DRV_PRIORITY); + reset_polarity=!(sb_gpioin(sbh)&reset_gpio); + + diag_sysctl_header = register_sysctl_table(sys_diag, 0); + diag_change(); + + return 0; +} + +static void __exit diag_exit() +{ + unregister_sysctl_table(diag_sysctl_header); +} + +EXPORT_NO_SYMBOLS; +MODULE_AUTHOR("openwrt.org"); +MODULE_LICENSE("GPL"); + +module_init(diag_init); +module_exit(diag_exit); -- cgit v1.2.3 From 1b28bb7eded0e0ee15116b99a7ae2bcb0d007d93 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 18 Jun 2006 13:09:54 +0000 Subject: suppress warnings. git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3983 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/diag/src/diag.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package/diag') diff --git a/package/diag/src/diag.c b/package/diag/src/diag.c index 6ad7ff102..4f12a1f1e 100644 --- a/package/diag/src/diag.c +++ b/package/diag/src/diag.c @@ -99,7 +99,7 @@ void (*set_dmz)(u8 state); static unsigned int diag = 0; -static void diag_change() +static void diag_change(void) { set_diag(0xFF); // off set_dmz(0xFF); // off @@ -166,11 +166,11 @@ static ctl_table sys_diag[] = { { 0 } }; -static int __init diag_init() +static int __init diag_init(void) { char *buf; u32 board_type; - sbh = sb_kattach(); + sbh = (void *)sb_kattach(); sb_gpiosetcore(sbh); board_type = sb_boardtype(sbh); @@ -255,7 +255,7 @@ static int __init diag_init() return 0; } -static void __exit diag_exit() +static void __exit diag_exit(void) { unregister_sysctl_table(diag_sysctl_header); } -- cgit v1.2.3 From 859e8f7f7d8bfbefd610d338d16498190cd51e15 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 02:16:37 +0000 Subject: build system cleanup. move shared include files into $(TOPDIR)/include, move lzma, mkfs.* into toolchain/ git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4032 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/diag/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/diag') diff --git a/package/diag/Makefile b/package/diag/Makefile index 6fed3b51b..ab28e7218 100644 --- a/package/diag/Makefile +++ b/package/diag/Makefile @@ -1,14 +1,14 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/kernel.mk +include $(TOPDIR)/include/kernel.mk PKG_NAME:=kmod-diag PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/kmod-diag SECTION:=drivers -- cgit v1.2.3 From 0b0afa4d818ec18187b09055fbb8d84a01590d6e Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 02:32:39 +0000 Subject: add INCLUDE_DIR variable for $(TOPDIR)/include git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4033 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/diag/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/diag') diff --git a/package/diag/Makefile b/package/diag/Makefile index ab28e7218..de6ab8d64 100644 --- a/package/diag/Makefile +++ b/package/diag/Makefile @@ -1,14 +1,14 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=kmod-diag PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/kmod-diag SECTION:=drivers -- cgit v1.2.3 From 02cdebbb91a33d8e24da1c94a9d93ac39be168a7 Mon Sep 17 00:00:00 2001 From: mbm Date: Tue, 27 Jun 2006 00:35:46 +0000 Subject: credit where credit is due git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4091 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/diag/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'package/diag') diff --git a/package/diag/Makefile b/package/diag/Makefile index de6ab8d64..8edc4093d 100644 --- a/package/diag/Makefile +++ b/package/diag/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk -- cgit v1.2.3 From cba05c503570da6675aff4b1036d96b989b3539b Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 30 Jul 2006 16:22:59 +0000 Subject: BUILD_DIR -> KERNEL_BUILD_DIR git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4332 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/diag/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/diag') diff --git a/package/diag/Makefile b/package/diag/Makefile index 8edc4093d..024426f8b 100644 --- a/package/diag/Makefile +++ b/package/diag/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=kmod-diag PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) include $(INCLUDE_DIR)/package.mk -- cgit v1.2.3 From ef998d64e381ed0a92fc73edf4206f7be7335caf Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 4 Aug 2006 11:59:52 +0000 Subject: set PATH in rules.mk git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4438 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/diag/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'package/diag') diff --git a/package/diag/Makefile b/package/diag/Makefile index 024426f8b..3ffd2f460 100644 --- a/package/diag/Makefile +++ b/package/diag/Makefile @@ -35,7 +35,6 @@ define Build/Compile $(MAKE) -C "$(LINUX_DIR)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH="$(LINUX_KARCH)" \ - PATH="$(TARGET_PATH)" \ SUBDIRS="$(PKG_BUILD_DIR)" \ EXTRA_CFLAGS="-DBCMDRIVER -I$(LINUX_DIR)/arch/mips/bcm947xx/include" \ modules -- cgit v1.2.3 From d23aa27e897fbbfb049dec01eb9049566fa5b890 Mon Sep 17 00:00:00 2001 From: florian Date: Fri, 18 Aug 2006 13:10:19 +0000 Subject: Add support for the Asus power led, closes #349 git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4594 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/diag/src/diag.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'package/diag') diff --git a/package/diag/src/diag.c b/package/diag/src/diag.c index 4f12a1f1e..d25f749df 100644 --- a/package/diag/src/diag.c +++ b/package/diag/src/diag.c @@ -29,6 +29,7 @@ * 2005/04/13 added licensing informations * 2005/04/18 base reset polarity off initial readings * 2006/02/07 motorola wa840g/we800g support added + * 2006/08/18 asus power led support added */ #include @@ -61,6 +62,13 @@ static void v2_set_dmz(u8 state) { set_gpio(DMZ_GPIO,state); } +// asus wl-500g (+deluxe) +#define ASUS_PWR_GPIO (1<<0) + +static void asus_set_pwr(u8 state) { + set_gpio(ASUS_PWR_GPIO,state); +} + // v1.x - - - - - #define LED_DIAG 0x13 #define LED_DMZ 0x12 @@ -92,22 +100,27 @@ static void ignore(u8 ignored) {}; // - - - - - #define BIT_DMZ 0x01 +#define BIT_PWR 0x02 #define BIT_DIAG 0x04 void (*set_diag)(u8 state); void (*set_dmz)(u8 state); +void (*set_pwr)(u8 state); -static unsigned int diag = 0; +static unsigned int diag = 0x02; // default: diag off, pwr on, dmz off static void diag_change(void) { set_diag(0xFF); // off set_dmz(0xFF); // off + set_pwr(0xFF); // off if(diag & BIT_DIAG) set_diag(0x00); // on if(diag & BIT_DMZ) set_dmz(0x00); // on + if (diag & BIT_PWR) + set_pwr(0x00); //on } static int proc_diag(ctl_table *table, int write, struct file *filp, @@ -178,6 +191,7 @@ static int __init diag_init(void) set_diag=ignore; set_dmz=ignore; + set_pwr=ignore; buf=nvram_get("pmon_ver") ?: ""; if (((board_type & 0xf00) == 0x400) && (strncmp(buf, "CFE", 3) != 0)) { @@ -202,6 +216,7 @@ static int __init diag_init(void) } if (!strcmp(buf,"asusX")) { //asus wl-500g + set_pwr=asus_set_pwr; reset_gpio=(1<<6); } if (!strcmp(buf,"2")) { @@ -240,6 +255,7 @@ static int __init diag_init(void) } if (!strcmp(buf,"45")) { //wl-500g deluxe + set_pwr=asus_set_pwr; reset_gpio=(1<<6); } } -- cgit v1.2.3 From ff197527560c1699bdc30ed1356939cb021995de Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 23 Sep 2006 13:54:49 +0000 Subject: standardize Makefile, change section from drivers to kernel, remove dup description git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4827 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/diag/Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'package/diag') diff --git a/package/diag/Makefile b/package/diag/Makefile index 3ffd2f460..c182321cc 100644 --- a/package/diag/Makefile +++ b/package/diag/Makefile @@ -17,13 +17,12 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) include $(INCLUDE_DIR)/package.mk define Package/kmod-diag -SECTION:=drivers -CATEGORY:=Drivers -DEFAULT:=y -DEPENDS:=@LINUX_2_4_BRCM -TITLE:=Driver for router LEDs and Buttons -DESCRIPTION:=Driver for router LEDs and Buttons -VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) + SECTION:=kernel + CATEGORY:=Kernel drivers + DEFAULT:=y + DEPENDS:=@LINUX_2_4_BRCM + TITLE:=Driver for router LEDs and Buttons + VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) endef define Build/Prepare -- cgit v1.2.3