Author: adrian
Date: Sat Apr 28 08:15:40 2012
New Revision: 234750
URL: http://svn.freebsd.org/changeset/base/234750

Log:
  Fetch the channel survey code from the HAL.
  
  This information is currently not being populated by any of the HAL
  modules.

Modified:
  head/sys/dev/ath/ath_hal/ar5212/ar5212.h
  head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c

Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5212/ar5212.h    Sat Apr 28 08:12:51 2012        
(r234749)
+++ head/sys/dev/ath/ath_hal/ar5212/ar5212.h    Sat Apr 28 08:15:40 2012        
(r234750)
@@ -320,6 +320,7 @@ struct ath_hal_5212 {
        struct ar5212AniParams ah_aniParams5;   /* 5GHz parameters */
        struct ar5212AniState   *ah_curani;     /* cached last reference */
        struct ar5212AniState   ah_ani[AH_MAXCHAN]; /* per-channel state */
+       HAL_CHANNEL_SURVEY      ah_chansurvey[AH_MAXCHAN]; /* channel survey */
 
        /* AR5416 uses some of the AR5212 ANI code; these are the ANI methods */
        HAL_BOOL        (*ah_aniControl) (struct ath_hal *, HAL_ANI_CMD cmd, 
int param);

Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c       Sat Apr 28 08:12:51 
2012        (r234749)
+++ head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c       Sat Apr 28 08:15:40 
2012        (r234750)
@@ -1090,6 +1090,14 @@ ar5212GetDiagState(struct ath_hal *ah, i
                                return AH_FALSE;
                        return ar5212AniSetParams(ah, args, args);
                }
+               break;
+       case HAL_DIAG_CHANSURVEY:
+               if (AH_PRIVATE(ah)->ah_curchan == NULL)
+                       return AH_FALSE;
+               *result =
+                   &ahp->ah_chansurvey[AH_PRIVATE(ah)->ah_curchan->ic_devdata];
+               *resultsize = sizeof(HAL_CHANNEL_SURVEY);
+               return AH_TRUE;
        }
        return AH_FALSE;
 }
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to