Changeset 39

Timestamp:

03/15/03 19:31:46 (6 years ago)

Author:

sam

Message:

Replicated Change 71 by sam@borg_greg on 2003/03/03 09:36:53<<<

o proc fs support for r/w of ath_debug and r of ath_stats
o fix buffer length set in rx descriptors
o HAL_ additions to power management enums
o change DPRINTF of interrupt processing to netif_msg_intr
o add !sc_attached guard on interrupt handling

Files:

• cvs-import/trunk/driver/if_ath.c (modified) (10 diffs)
• cvs-import/trunk/driver/if_athvar.h (modified) (2 diffs)

cvs-import/trunk/driver/if_ath.c

@@ -82 +82 @@
-static void     ath_rate_ctl(struct ath_softc *, struct ieee80211_node *);
-
+#ifdef CONFIG_PROC_FS
+static void     ath_proc_init(struct ath_softc *sc);
+static void     ath_proc_remove(struct ath_softc *sc);
+#endif /* CONFIG_PROC_FS */
+
-#ifdef AR_DEBUG
-2;         /*XXX*/
+0;
-#define IFF_DUMPPKTS(_ic)       (ath_debug || netif_msg_dumppkts(_ic))
-static  void ath_printrxbuf(struct ath_buf *bf);
@@ -229 +234 @@
-                dev->name, ether_sprintf(dev->dev_addr));
-
+        ath_proc_init(sc);
+
-        sc->sc_attached = 1;
-
@@ -250 +257 @@
-                ath_desc_free(sc);
-                ath_hal_detach(sc->sc_ah);
+                ath_proc_remove(sc);
-                ieee80211_ifdetach(dev);
-        }
@@ -296 +304 @@
-        HAL_INT status;
-
+        if (!sc->sc_attached)
+                return;
-        spin_lock_irq(&sc->sc_lock);
-        while (ath_hal_intrpend(ah)) {
-                ath_hal_getisr(ah, &status);
-
-
-
+
+
-                if (status & HAL_INT_FATAL) {
-(0x%x)
+0x%x
-                                dev->name, status);
-                        ath_hal_dumpstate(ah);  /*XXX*/
@@ -310 +319 @@
-                }
-                if (status & HAL_INT_RXORN) {
-(0x%x)
+0x%x
-                                dev->name, status);
-                        ath_hal_dumpstate(ah);  /*XXX*/
@@ -318 +327 @@
-                if (status & HAL_INT_RXEOL) {
-                        /*
-
-
-
+
+
+
+
-                         */
-                        sc->sc_rxlink = NULL;
@@ -412 +422 @@
-        else
-                val |= HAL_INT_SWBA;                    /* beacon prepare */
+val |= HAL_INT_TXDESC|HAL_INT_RXDESC;
-        ath_hal_intrset(ah, val | HAL_INT_GLOBAL);
-
@@ -470 +481 @@
-                ath_draintxq(sc);               /* clear pending tx frames */
-                ath_stoprecv(sc);               /* turn off frame recv */
-
+HAL_
-        }
-        ath_beacon_free(sc);
@@ -985 +996 @@
-        ds->ds_data = bf->bf_skbaddr;
-        ds->ds_ctl0 = 0;
-->len
+_tailroom(skb)
-        ds->ds_status0 = ds->ds_status1 = 0;
-
@@ -1686 +1697 @@
-}
-#endif /* AR_DEBUG */
+
+#ifdef CONFIG_PROC_FS
+#include <linux/proc_fs.h>
+
+static int
+ath_proc_debug_read(char *page, char **start, off_t off,
+        int count, int *eof, void *data)
+{
+        if (off != 0) {
+                *eof = 1;
+                return 0;
+        }
+        return sprintf(page, "%d\n", ath_debug);
+}
+
+static int
+ath_proc_debug_write(struct file *file, const char *buf,
+        unsigned long count, void *data)
+{
+        int v;
+        
+        if (sscanf(buf, "%d", &v) == 1) {
+                ath_debug = v;
+                return count;
+        } else
+                return -EINVAL;
+}
+
+static int
+ath_proc_stats(char *page, char **start, off_t off, int count, int *eof, void *data)
+{
+        struct ath_softc *sc = (struct ath_softc *) data;
+        char *cp = page;
+
+        if (off != 0) {
+                *eof = 1;
+                return 0;
+        }
+#define STAT(x)         cp += sprintf(cp, #x "=%u\n", sc->sc_stats.ast_##x)
+        STAT(watchdog); STAT(tx_encap); STAT(tx_nonode);
+        STAT(tx_nombuf); STAT(tx_nomcl); STAT(tx_linear);
+        STAT(tx_nodata); STAT(tx_busdma); STAT(tx_descerr);
+        STAT(rx_crcerr); STAT(rx_fifoerr); STAT(rx_badcrypt);
+        STAT(rx_phyerr); STAT(rx_phy_tim); STAT(rx_phy_par);
+        STAT(rx_phy_rate); STAT(rx_phy_len); STAT(rx_phy_qam);
+        STAT(rx_phy_srv); STAT(rx_phy_tor);
+        return cp - page;
+#undef STAT
+}
+
+static void
+ath_proc_init(struct ath_softc *sc)
+{
+        struct proc_dir_entry *dp;
+
+        /* XXX this uses /proc/net, but we want /proc/net/drivers */
+        sc->sc_proc = proc_mkdir(sc->sc_ic.ic_dev.name, proc_net);
+        if (sc->sc_proc == NULL) {
+                printk(KERN_INFO "/proc/net/drivers/%s: failed to create\n",
+                        sc->sc_ic.ic_dev.name);
+                return;
+        }
+        dp = create_proc_entry("debug", 0644, sc->sc_proc);
+        if (dp) {
+                dp->read_proc = ath_proc_debug_read;
+                dp->write_proc = ath_proc_debug_write;
+                dp->data = sc;
+        }
+        create_proc_read_entry("stats", 0644, sc->sc_proc, ath_proc_stats, sc);
+}
+
+static void
+ath_proc_remove(struct ath_softc *sc)
+{
+        if (sc->sc_proc != NULL) {
+                remove_proc_entry("stats", sc->sc_proc);
+                remove_proc_entry("debug", sc->sc_proc);
+                remove_proc_entry(sc->sc_ic.ic_dev.name, proc_net);
+                sc->sc_proc = NULL;
+        }
+}
+#endif /* CONFIG_PROC_FS */

cvs-import/trunk/driver/if_athvar.h

@@ -85 +85 @@
-struct ath_hal;
-struct ath_desc;
+struct proc_dir_entry;
-
-struct ath_softc {
@@ -116 +117 @@
-        struct ath_nodestat     sc_bss_stat;    /* statistics for infra mode */
-        struct ath_stats        sc_stats;       /* interface statistics */
+        struct proc_dir_entry   *sc_proc;       /* /proc/net/drivers/ath%d */
-};
-