Changeset 2268d20 in freewrt for target/linux/package/diag/diag_led.c

Timestamp:

Jul 7, 2006, 12:14:16 AM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

dfb8263

Parents:

b232ea4

Message:

use OpenWrt whiterussian system code and wireless driver

• make it build with 2.4.32
• add netgear wgt634u patches (untested)
• keep newest flash map stuff
• add wlcompat and wl.o from whiterussian
• add diag_led.c from whiterussian

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@177 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• target/linux/package/diag/diag_led.c (modified) (14 diffs)

target/linux/package/diag/diag_led.c

@@ -2 +2 @@
  * diag_led.c - replacement diag module
  *
- * Copyright (C) 2004 Mike Baker,
- *                    Imre Kaloz <kaloz@dune.hu>
+ * Copyright (C) 2004-2006 Mike Baker,
+ *                         Imre Kaloz <kaloz@dune.hu>,
+ *                         Felix Fietkau <nbd@openwrt.org>
  *
  * This program is free software; you can redistribute it and/or
@@ -19 +20 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Id: diag_led.c 3510 2006-03-27 21:05:17Z wbx $
+ * $Id: 005-diag_led.patch 3355 2006-03-13 07:57:51Z nbd $
  */
 
@@ -29 +30 @@
  * 2005/04/13 added licensing informations
  * 2005/04/18 base reset polarity off initial readings
- * 2006/02/07 motorola wa840g/we800g support added
  */
 
@@ -38 +38 @@
 #include <asm/io.h>
 #include <typedefs.h>
-#include <osl.h>
 #include <bcmdevs.h>
 #include <sbutils.h>
@@ -46 +45 @@
 
 // v2.x - - - - -
+#define BITS(n)                 ((1 << n) - 1)
+#define ISSET(n,b)              ((n & (1 << b)) ? 1 : 0)
 #define DIAG_GPIO (1<<1)
+#define AOSS_GPIO (1<<6)
 #define DMZ_GPIO  (1<<7)
+#define SES_GPIO  ((1 << 2) | (1 << 3) | (1 << 5))
 
 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);
+        sb_gpiocontrol(sbh,mask,0);
+        sb_gpioouten(sbh,mask,mask);
+        sb_gpioout(sbh,mask,value);
 }
 
@@ -60 +63 @@
 static void v2_set_dmz(u8 state) {
         set_gpio(DMZ_GPIO,state);
+}
+static void v2_set_aoss(u8 state) {
+        set_gpio(AOSS_GPIO,state);
+}
+static void v2_set_ses(u8 state) {
+        set_gpio(SES_GPIO, (ISSET(state, 0) << 2) | (ISSET(state, 1) << 3) | (ISSET(state, 2) << 5));
 }
 
@@ -81 +90 @@
 }
 
-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
+#define BIT_DMZ         (1 << 0)
+#define BIT_DIAG        (1 << 2)
+#define BIT_SES         (BITS(3) << 3)
 
 void (*set_diag)(u8 state);
 void (*set_dmz)(u8 state);
-
+void (*set_ses)(u8 state);
+
+static unsigned int diag_reverse = 1;
+static unsigned int ses_reverse = 1;
 static unsigned int diag = 0;
 
 static void diag_change()
 {
-        set_diag(0xFF); // off
-        set_dmz(0xFF); // off
+        set_diag(diag_reverse ? 0xFF : 0x00); // off
+        set_dmz(diag_reverse ? 0xFF : 0x00); // off
+        set_ses(ses_reverse ? 0xFF : 0x00); // off
 
         if(diag & BIT_DIAG)
-                set_diag(0x00); // on
+                set_diag(diag_reverse ? 0x00 : 0xFF); // on
         if(diag & BIT_DMZ)
-                set_dmz(0x00); // on
+                set_dmz(diag_reverse ? 0x00 : 0xFF); // on
+        if(diag & BIT_SES)
+                set_ses(((ses_reverse ? ~diag : diag) >> 3) & BITS(3));
 }
 
@@ -126 +135 @@
 static unsigned char reset_polarity = 0;
 static unsigned int reset = 0;
+static unsigned char button_gpio = 0;
+static unsigned char button_polarity = 0;
+static unsigned int button = 0;
+
+
+static int read_gpio(int gpio, int polarity)
+{
+        int res;
+        
+        if (gpio) {
+                sb_gpiocontrol(sbh,gpio,gpio);
+                sb_gpioouten(sbh,gpio,0);
+                res=!(sb_gpioin(sbh)&gpio);
+
+                return (polarity ? !res : res);
+        }
+
+        return 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;
-        }
+        reset = read_gpio(reset_gpio, reset_polarity);
+
+        return proc_dointvec(table, write, filp, buffer, lenp);
+}
+
+static int proc_button(ctl_table *table, int write, struct file *filp,
+                void *buffer, size_t *lenp)
+{
+        button = read_gpio(button_gpio, button_polarity);
 
         return proc_dointvec(table, write, filp, buffer, lenp);
@@ -164 +191 @@
            proc_handler: proc_reset 
          },
+         {
+           ctl_name: 2002,
+           procname: "button",
+           data: &button,
+           maxlen: sizeof(button),
+           mode: 0444,
+           proc_handler: proc_button
+         },
          { 0 }
 };
@@ -179 +214 @@
         set_diag=ignore;
         set_dmz=ignore;
+        set_ses=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)) {
+                if (!strcmp(buf,"bcm94710dev")) {
                         buf=nvram_get("boardnum")?:"";
                         if (!strcmp(buf,"42")) {
@@ -191 +227 @@
                                 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);
                         }
                 }
@@ -229 +251 @@
                         set_diag=v2_set_diag;
                         set_dmz=v2_set_dmz;
+                        set_ses=v2_set_ses;
+                        
                         reset_gpio=(1<<6);
+                        button_gpio=(1<<4);
+
+                        if (!strcmp((nvram_get("boardtype")?:""), "0x0101")) // WRT54G3G
+                                ses_reverse = 0;
+                        else
+                                ses_reverse = 1;
                 }
                 if (!strcmp(buf,"44")) {
@@ -237 +267 @@
                 if (!strcmp(buf,"00")) {
                         //buffalo
+                        diag_reverse = 0;
+                        set_dmz=v2_set_diag;
+                        set_diag=v2_set_aoss;
                         reset_gpio=(1<<7);
                 }
@@ -245 +278 @@
         }
 
-        
-        sb_gpiocontrol(sbh,reset_gpio,reset_gpio,GPIO_DRV_PRIORITY);
-        sb_gpioouten(sbh,reset_gpio,0,GPIO_DRV_PRIORITY);
+        sb_gpiocontrol(sbh,reset_gpio,reset_gpio);
+        sb_gpioouten(sbh,reset_gpio,0);
         reset_polarity=!(sb_gpioin(sbh)&reset_gpio);
+
+        if (button_gpio) {
+                sb_gpiocontrol(sbh,button_gpio,button_gpio);
+                sb_gpioouten(sbh,button_gpio,0);
+                button_polarity=!(sb_gpioin(sbh)&button_gpio);
+        } else {
+                // don't create /proc/button
+                sys_diag[2].ctl_name = 0;
+        }
 
         diag_sysctl_header = register_sysctl_table(sys_diag, 0);