Changeset 2485

Timestamp:

06/18/07 23:35:47 (2 years ago)

Author:

mtaylor

Message:

Fix a bug in ath_radar_get_params where same variable name was written twice. Change ordering of radar error parameters to be consistent.

Files:

• branches/madwifi-dfs/ath/if_ath_radar.c (modified) (2 diffs)
• branches/madwifi-dfs/ath/if_ath_radar.h (modified) (1 diff)

branches/madwifi-dfs/ath/if_ath_radar.c

@@ -99 +99 @@
-void ath_radar_get_params(struct ath_softc *sc, RADAR_PARAM* rp) {
-        u_int32_t radar = ath_reg_read(sc, AR5K_PHY_RADAR);
-eshold
+
-                (radar & AR5K_PHY_RADAR_FIRPWROUTTHR) 
-                >> AR5K_PHY_RADAR_FIRPWROUTTHR_S;
-
+
+
+
+
+
+
+
+
+
+
-                (radar & AR5K_PHY_RADAR_INBANDTHR) 
-                >> AR5K_PHY_RADAR_INBANDTHR_S;
-        rp->rp_radar_rssi_threshold = 
-                (radar & AR5K_PHY_RADAR_PULSERSSITHR) 
-                >> AR5K_PHY_RADAR_PULSERSSITHR_S;
-        rp->rp_pulse_rssi_threshold = 
-                (radar & AR5K_PHY_RADAR_RADARRSSITHR) 
-                >> AR5K_PHY_RADAR_RADARRSSITHR_S;
-        rp->rp_pulse_rssi_threshold = 
-                (radar & AR5K_PHY_RADAR_PULSEHEIGHTTHR) 
-                >> AR5K_PHY_RADAR_PULSEHEIGHTTHR_S;
-}
-
@@ -126 +126 @@
-                ((AR5K_PHY_RADAR_ENABLED_AR5213 & (_MASK))) : \
-                ((rp->_FIELD << (_SHIFT)) & (_MASK)))
-
-        ath_reg_write(sc, AR5K_PHY_RADAR, 
-                BUILD_PHY_RADAR_FIELD(
-                        AR5K_PHY_RADAR_FIRPWROUTTHR,
-                        AR5K_PHY_RADAR_FIRPWROUTTHR_S, 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                BUILD_PHY_RADAR_FIELD(
-                        AR5K_PHY_RADAR_INBANDTHR,
-                        AR5K_PHY_RADAR_INBANDTHR_S,
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                );
-#undef BUILD_PHY_RADAR_FIELD

branches/madwifi-dfs/ath/if_ath_radar.h

@@ -76 +76 @@
-pulse detection logic */
-typedef struct {
-
+
+
+
+
+
-         * 6-bits, dBm range {0..63} in dBm units. */
-
+
+
+
+
+
-
-        /* Pulse RSSI/SNR threshold
-         * 6-bits, dBm range {0..63} in dBm units. */
-
-
-
-
-
+
-
-        /* Inband threshold.  
-         * 5-bits, units unknown {0..31} (? MHz ?) */
-eshold
+
-
-        /* Finite Impulse Response (FIR) filter - power out threshold.
-         * 7-bits, standard power range {0..127} in 1/2 dBm units. */
-        int32_t rp_fir_filter_output_power_threshold;           
-} RADAR_PARAM;
-