Changeset 3951

Show
Ignore:
Timestamp:
02/12/09 22:43:42 (3 years ago)
Author:
proski
Message:

Merge FreeBSD changes r185905:186019

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • madwifi/branches/madwifi-free/hal/ah.c

    r3882 r3951  
    1515 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
    1616 * 
    17  * $Id: ah.c,v 1.15 2008/11/15 22:15:44 sam Exp
     17 * $FreeBSD
    1818 */ 
    1919#include "opt_ah.h" 
     
    3333ath_hal_probe(uint16_t vendorid, uint16_t devid) 
    3434{ 
    35         struct ath_hal_chip **pchip; 
     35        struct ath_hal_chip * const *pchip; 
    3636 
    3737        OS_SET_FOREACH(pchip, ah_chips) { 
     
    5454        HAL_BUS_TAG st, HAL_BUS_HANDLE sh, HAL_STATUS *error) 
    5555{ 
    56         struct ath_hal_chip **pchip; 
     56        struct ath_hal_chip * const *pchip; 
    5757 
    5858        OS_SET_FOREACH(pchip, ah_chips) { 
     
    8989ath_hal_rfprobe(struct ath_hal *ah, HAL_STATUS *ecode) 
    9090{ 
    91         struct ath_hal_rf **prf; 
     91        struct ath_hal_rf * const *prf; 
    9292 
    9393        OS_SET_FOREACH(prf, ah_rfs) { 
  • madwifi/branches/madwifi-free/hal/ah_eeprom_v14.c

    r3926 r3951  
    1515 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
    1616 * 
    17  * $Id: ah_eeprom_v14.c,v 1.4 2008/11/10 19:04:26 sam Exp
     17 * $FreeBSD
    1818 */ 
    1919#include "opt_ah.h" 
     
    161161} 
    162162 
    163 /* XXX conditionalize by target byte order */ 
    164 #ifndef bswap16 
    165 static __inline__ uint16_t 
    166 __bswap16(uint16_t _x) 
    167 { 
    168         return ((uint16_t)( 
    169               (((const uint8_t *)(&_x))[0]    ) | 
    170               (((const uint8_t *)(&_x))[1]<< 8)) 
    171         ); 
    172 } 
    173 #endif 
    174  
    175163/* Do structure specific swaps if Eeprom format is non native to host */ 
    176164static void 
  • madwifi/branches/madwifi-free/hal/ah_eeprom_v3.c

    r3882 r3951  
    1515 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
    1616 * 
    17  * $Id: ah_eeprom_v3.c,v 1.4 2008/11/27 22:39:42 sam Exp
     17 * $FreeBSD
    1818 */ 
    1919#include "opt_ah.h" 
  • madwifi/branches/madwifi-free/hal/ah_osdep.h

    r3949 r3951  
    235235extern void *__ahdecl ath_hal_memcpy(void *, const void *, size_t); 
    236236 
     237#define __bswap16(val) __swab16(val) 
    237238#define __bswap32(val) __swab32(val) 
    238239 
  • madwifi/branches/madwifi-free/hal/ar5212/ar5111.c

    r3881 r3951  
    1515 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
    1616 * 
    17  * $Id: ar5111.c,v 1.7 2008/11/10 04:08:03 sam Exp
     17 * $FreeBSD
    1818 */ 
    1919#include "opt_ah.h" 
     
    9191        } CHAN_INFO_2GHZ; 
    9292 
    93         const static CHAN_INFO_2GHZ chan2GHzData[] = { 
     93        static const CHAN_INFO_2GHZ chan2GHzData[] = { 
    9494                { 1, 0x46, 96  },       /* 2312 -19 */ 
    9595                { 1, 0x46, 97  },       /* 2317 -18 */ 
  • madwifi/branches/madwifi-free/hal/ar5212/ar5212_misc.c

    r3944 r3951  
    1515 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
    1616 * 
    17  * $Id: ar5212_misc.c,v 1.12 2008/11/27 22:30:00 sam Exp
     17 * $FreeBSD
    1818 */ 
    1919#include "opt_ah.h" 
     
    804804                            AR_STA_ID1_CRPT_MIC_ENABLE) ?  HAL_OK : HAL_ENXIO; 
    805805                } 
     806                return HAL_EINVAL; 
    806807        case HAL_CAP_TKIP_SPLIT:        /* hardware TKIP uses split keys */ 
    807808                switch (capability) { 
  • madwifi/branches/madwifi-free/hal/ar5312/ar5312.h

    r3920 r3951  
    1515 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
    1616 * 
    17  * $Id: ar5312.h,v 1.5 2008/11/22 07:37:40 sam Exp
     17 * $FreeBSD
    1818 */ 
    1919#ifndef _ATH_AR5312_H_ 
  • madwifi/branches/madwifi-free/hal/ar5312/ar5312_attach.c

    r3948 r3951  
    1515 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
    1616 * 
    17  * $Id: ar5312_attach.c,v 1.8 2008/11/27 22:30:03 sam Exp
     17 * $FreeBSD
    1818 */ 
    1919#include "opt_ah.h"