Changeset 2478

Show
Ignore:
Timestamp:
06/17/07 10:34:51 (2 years ago)
Author:
mtaylor
Message:

Remove hand-written ath_hal_reset and allow wrapper to be generated normally.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ath/if_ath_hal.h

    r2477 r2478  
    306306                ATH_HAL_UNLOCK_IRQ(GET_ATH_SOFTC(ah)); 
    307307        }) 
     308__hal_wrapper HAL_BOOL ath_hal_reset(struct ath_hal* ah, HAL_OPMODE a1, HAL_CHANNEL* a2, HAL_BOOL bChannelChange, HAL_STATUS* status) 
     309        IMPLEMENTATION({ 
     310                HAL_BOOL ret; 
     311                ATH_HAL_LOCK_IRQ(GET_ATH_SOFTC(ah)); 
     312                ret = ah->ah_reset(ah, a1, a2, bChannelChange, status); 
     313                ATH_HAL_UNLOCK_IRQ(GET_ATH_SOFTC(ah)); 
     314                return ret; 
     315        }) 
    308316__hal_wrapper HAL_BOOL ath_hal_setdecompmask(struct ath_hal* ah, u_int16_t a1, int a2) 
    309317        IMPLEMENTATION({ 
    …… 
    722730        return ret; 
    723731        }) 
    724 __hal_wrapper HAL_BOOL ath_hal_reset(struct ath_hal* ah, HAL_OPMODE opMode, HAL_CHANNEL* chan, HAL_BOOL bChannelChange, HAL_STATUS* status) 
    725         IMPLEMENTATION({ 
    726         HAL_BOOL  ret; 
    727         ATH_HAL_LOCK_IRQ(GET_ATH_SOFTC(ah)); 
    728         ret = ah->ah_reset(ah, opMode, chan, bChannelChange, status); 
    729         ATH_HAL_UNLOCK_IRQ(GET_ATH_SOFTC(ah)); 
    730         return ret; 
    731         }) 
    732732__hal_wrapper HAL_BOOL ath_hal_burstsupported(struct ath_hal * ah) 
    733733        IMPLEMENTATION({  

  • trunk/scripts/if_ath_hal_settings.pl

    r2477 r2478  
    7070        "ah_releaseTxQueue"           => "ath_hal_releasetxqueue", 
    7171        "ah_reqTxIntrDesc"            => "ath_hal_txreqintrdesc", 
     72        "ah_reset"                    => "ath_hal_reset", 
    7273        "ah_resetKeyCacheEntry"       => "ath_hal_keyreset", 
    7374        "ah_resetStationBeaconTimers" => "ath_hal_beaconreset", 
    …… 
    120121# other functions, perhaps. 
    121122# 
    122 @hal_functions_not_to_wrap = ( "ah_detach", "ah_reset" ); 
     123@hal_functions_not_to_wrap = ( "ah_detach" ); 
     124 
    123125# 
    124126# Boilerplate text 
    …… 
    190192        return ret; 
    191193        }) 
    192 __hal_wrapper HAL_BOOL ath_hal_reset(struct ath_hal* ah, HAL_OPMODE opMode, HAL_CHANNEL* chan, HAL_BOOL bChannelChange, HAL_STATUS* status) 
    193         IMPLEMENTATION({ 
    194         HAL_BOOL  ret; 
    195         ATH_HAL_LOCK_IRQ(GET_ATH_SOFTC(ah)); 
    196         ret = ah->ah_reset(ah, opMode, chan, bChannelChange, status); 
    197         ATH_HAL_UNLOCK_IRQ(GET_ATH_SOFTC(ah)); 
    198         return ret; 
    199         }) 
    200194__hal_wrapper HAL_BOOL ath_hal_burstsupported(struct ath_hal * ah) 
    201195        IMPLEMENTATION({