ath5k: Port debug.c over to the new band API and enable as build option

[pandora-kernel.git] / drivers / net / wireless / ath5k / debug.c

diff --git a/drivers/net/wireless/ath5k/debug.c b/drivers/net/wireless/ath5k/debug.c
index bb581ef..05bf4fb 100644 (file)
--- a/drivers/net/wireless/ath5k/debug.c
+++ b/drivers/net/wireless/ath5k/debug.c
@@ -65,7 +65,7 @@ static unsigned int ath5k_debug;
 module_param_named(debug, ath5k_debug, uint, 0);
 
 
-#if ATH5K_DEBUG
+#ifdef CONFIG_ATH5K_DEBUG
 
 #include <linux/seq_file.h>
 #include "reg.h"
@@ -340,7 +340,7 @@ static struct {
        { ATH5K_DEBUG_LED,      "led",          "LED mamagement" },
        { ATH5K_DEBUG_DUMP_RX,  "dumprx",       "print received skb content" },
        { ATH5K_DEBUG_DUMP_TX,  "dumptx",       "print transmit skb content" },
-       { ATH5K_DEBUG_DUMPMODES, "dumpmodes",   "dump modes" },
+       { ATH5K_DEBUG_DUMPBANDS, "dumpbands",   "dump bands" },
        { ATH5K_DEBUG_TRACE,    "trace",        "trace function calls" },
        { ATH5K_DEBUG_ANY,      "all",          "show all debug levels" },
 };
@@ -452,30 +452,47 @@ ath5k_debug_finish_device(struct ath5k_softc *sc)
 /* functions used in other places */
 
 void
-ath5k_debug_dump_modes(struct ath5k_softc *sc, struct ieee80211_hw_mode *modes)
+ath5k_debug_dump_bands(struct ath5k_softc *sc)
 {
-       unsigned int m, i;
+       unsigned int b, i;
 
-       if (likely(!(sc->debug.level & ATH5K_DEBUG_DUMPMODES)))
+       if (likely(!(sc->debug.level & ATH5K_DEBUG_DUMPBANDS)))
                return;
 
-       for (m = 0; m < NUM_DRIVER_MODES; m++) {
-               printk(KERN_DEBUG "Mode %u: channels %d, rates %d\n", m,
-                               modes[m].num_channels, modes[m].num_rates);
+       BUG_ON(!sc->sbands);
+
+       for (b = 0; b < IEEE80211_NUM_BANDS; b++) {
+               struct ieee80211_supported_band *band = &sc->sbands[b];
+               char bname[5];
+               switch (band->band) {
+               case IEEE80211_BAND_2GHZ:
+                       strcpy(bname, "2 GHz");
+                       break;
+               case IEEE80211_BAND_5GHZ:
+                       strcpy(bname, "5 GHz");
+                       break;
+               default:
+                       printk(KERN_DEBUG "Band not supported: %d\n",
+                               band->band);
+                       return;
+               }
+               printk(KERN_DEBUG "Band %s: channels %d, rates %d\n", bname,
+                               band->n_channels, band->n_bitrates);
                printk(KERN_DEBUG " channels:\n");
-               for (i = 0; i < modes[m].num_channels; i++)
+               for (i = 0; i < band->n_channels; i++)
                        printk(KERN_DEBUG "  %3d %d %.4x %.4x\n",
-                                       modes[m].channels[i].chan,
-                                       modes[m].channels[i].freq,
-                                       modes[m].channels[i].val,
-                                       modes[m].channels[i].flag);
+                                       ieee80211_frequency_to_channel(
+                                               band->channels[i].center_freq),
+                                       band->channels[i].center_freq,
+                                       band->channels[i].hw_value,
+                                       band->channels[i].flags);
                printk(KERN_DEBUG " rates:\n");
-               for (i = 0; i < modes[m].num_rates; i++)
+               for (i = 0; i < band->n_bitrates; i++)
                        printk(KERN_DEBUG "  %4d %.4x %.4x %.4x\n",
-                                       modes[m].rates[i].rate,
-                                       modes[m].rates[i].val,
-                                       modes[m].rates[i].flags,
-                                       modes[m].rates[i].val2);
+                                       band->bitrates[i].bitrate,
+                                       band->bitrates[i].hw_value,
+                                       band->bitrates[i].flags,
+                                       band->bitrates[i].hw_value_short);
        }
 }
 
@@ -548,4 +565,4 @@ ath5k_debug_printtxbuf(struct ath5k_softc *sc,
                !done ? ' ' : (ds->ds_txstat.ts_status == 0) ? '*' : '!');
 }
 
-#endif /* if ATH5K_DEBUG */
+#endif /* ifdef CONFIG_ATH5K_DEBUG */