Changeset 1367

Show
Ignore:
Timestamp:
12/28/05 17:52:15 (3 years ago)
Author:
mrenzmann
Message:

Updating HAL to v0.9.16.13 from Sam. Although this is still 'inofficial' it seems to work better than 0.9.16.3.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/hal/ah.h

    r1260 r1367  
    3434 * SUCH DAMAGES. 
    3535 * 
    36  * $Id: //depot/sw/linuxsrc/src/802_11/madwifi/hal/main/ah.h#122 $ 
     36 * $Id: //depot/sw/linuxsrc/src/802_11/madwifi/hal/main/ah.h#128 $ 
    3737 */ 
    3838 
    …… 
    115115        HAL_CAP_CHAN_QUARTERRATE = 24,  /* hardware can support quarter rate channels */ 
    116116        HAL_CAP_RFSILENT        = 25,   /* hardware has rfsilent support  */ 
     117        HAL_CAP_TPC_ACK         = 26,   /* ack txpower with per-packet tpc */ 
     118        HAL_CAP_TPC_CTS         = 27,   /* cts txpower with per-packet tpc */ 
    117119} HAL_CAPABILITY_TYPE; 
    118120 
    …… 
    238240 
    239241typedef enum { 
    240         HAL_PM_UNDEFINED      = 0, 
    241         HAL_PM_AWAKE          = 1, 
    242         HAL_PM_FULL_SLEEP     = 2, 
    243         HAL_PM_NETWORK_SLEEP  = 3 
     242        HAL_PM_AWAKE          = 0, 
     243        HAL_PM_FULL_SLEEP     = 1, 
     244        HAL_PM_NETWORK_SLEEP  = 2, 
     245        HAL_PM_UNDEFINED      = 3 
    244246} HAL_POWER_MODE; 
    245247 
    …… 
    268270        HAL_INT_BMISS   = 0x00040000, 
    269271        HAL_INT_BNR     = 0x00100000,   /* Non-common mapping */ 
     272        HAL_INT_TIM     = 0x00200000,   /* Non-common mapping */ 
     273        HAL_INT_DTIM    = 0x00400000,   /* Non-common mapping */ 
     274        HAL_INT_DTIMSYNC= 0x00800000,   /* Non-common mapping */ 
    270275        HAL_INT_GPIO    = 0x01000000, 
     276        HAL_INT_CABEND  = 0x02000000,   /* Non-common mapping */ 
    271277        HAL_INT_FATAL   = 0x40000000,   /* Non-common mapping */ 
    272278        HAL_INT_GLOBAL  = 0x80000000,   /* Set/clear IER */ 
     279        HAL_INT_BMISC   = HAL_INT_TIM 
     280                        | HAL_INT_DTIM 
     281                        | HAL_INT_DTIMSYNC 
     282                        | HAL_INT_CABEND, 
    273283 
    274284        /* Interrupt bits that map directly to ISR/IMR bits */ 
    …… 
    495505        u_int32_t       ah_magic;       /* consistency check magic number */ 
    496506        u_int32_t       ah_abi;         /* HAL ABI version */ 
    497 #define HAL_ABI_VERSION 0x05091300    /* YYMMDDnn */ 
     507#define HAL_ABI_VERSION 0x05120700    /* YYMMDDnn */ 
    498508        u_int16_t       ah_devid;       /* PCI device ID */ 
    499509        u_int16_t       ah_subvendorid; /* PCI subvendor ID */ 
    …… 
    547557        HAL_BOOL  __ahdecl(*ah_startTxDma)(struct ath_hal*, u_int); 
    548558        HAL_BOOL  __ahdecl(*ah_stopTxDma)(struct ath_hal*, u_int); 
    549         HAL_BOOL  __ahdecl(*ah_updateCTSForBursting)(struct ath_hal *, 
    550                                 struct ath_desc *, struct ath_desc *, 
    551                                 struct ath_desc *, struct ath_desc *, 
    552                                 u_int32_t, u_int32_t); 
    553559        HAL_BOOL  __ahdecl(*ah_setupTxDesc)(struct ath_hal *, struct ath_desc *, 
    554560                                u_int pktLen, u_int hdrLen, 
    …… 
    654660                                HAL_POWER_MODE mode, int setChip); 
    655661        HAL_POWER_MODE __ahdecl(*ah_getPowerMode)(struct ath_hal*); 
     662        int16_t   __ahdecl(*ah_getChanNoise)(struct ath_hal *, HAL_CHANNEL *); 
     663 
    656664 
    657665        /* Beacon Management Functions */ 
    …… 
    712720 
    713721/* 
     722 * Calibrate noise floor data following a channel scan or similar. 
     723 * This must be called prior retrieving noise floor data. 
     724 */ 
     725extern  void __ahdecl ath_hal_process_noisefloor(struct ath_hal *ah); 
     726 
     727/* 
    714728 * Return bit mask of wireless modes supported by the hardware. 
    715729 */ 

  • trunk/hal/linux/ah_osdep.c

    r1260 r1367  
    3434 * SUCH DAMAGES. 
    3535 * 
    36  * $Id: //depot/sw/linuxsrc/src/802_11/madwifi/hal/main/linux/ah_osdep.c#45 $ 
     36 * $Id: //depot/sw/linuxsrc/src/802_11/madwifi/hal/main/linux/ah_osdep.c#46 $ 
    3737 */ 
    3838#include "opt_ah.h" 
    …… 
    546546EXPORT_SYMBOL(ath_hal_computetxtime); 
    547547EXPORT_SYMBOL(ath_hal_mhz2ieee); 
     548EXPORT_SYMBOL(ath_hal_process_noisefloor); 
    548549 
    549550static int __init 

  • trunk/hal/public/alpha-elf.inc

    r1263 r1367  
    6464NM=     ${TOOLPREFIX}nm 
    6565 
     66# 
     67# Force register read/write operations to go through a function. 
     68# 
     69AH_REGOPS_FUNC=1 
     70 
    6671COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN 

  • trunk/hal/public/alpha-elf.opt_ah.h

    r1263 r1367  
    66#define AH_SUPPORT_2413 1 
    77#define AH_SUPPORT_5413 1 
     8#define AH_REGOPS_FUNC 1 
    89#define AH_SUPPORT_DFS  1 

  • trunk/hal/public/xscale-be-elf.inc

    r1275 r1367  
    7474COPTS+= -DAH_BYTE_ORDER=AH_BIG_ENDIAN -DAH_REGOPS_FUNC 
    7575COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \ 
    76         -mtune=xscale $(call cc-option,-mshort-load-bytes, \ 
    77         $(call cc-option,-malignment-traps,)) -msoft-float -mfp=2 
     76        -mtune=xscale  -mshort-load-bytes -msoft-float -mfp=2 

  • trunk/hal/public/xscale-le-elf.inc

    r1275 r1367  
    7575COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN -DAH_REGOPS_FUNC 
    7676COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \ 
    77         -mapcs-32 -mtune=xscale $(call cc-option,-mshort-load-bytes, \ 
    78         $(call cc-option,-malignment-traps,)) -msoft-float -mfp=2 
     77        -mapcs-32 -mtune=xscale  -mshort-load-bytes -msoft-float -mfp=2 

  • trunk/hal/version.h

    r1260 r1367  
    3434 * THE POSSIBILITY OF SUCH DAMAGES. 
    3535 * 
    36  * $Id: //depot/sw/linuxsrc/src/802_11/madwifi/hal/main/version.h#121 $ 
     36 * $Id: //depot/sw/linuxsrc/src/802_11/madwifi/hal/main/version.h#131 $ 
    3737 */ 
    38 #define ATH_HAL_VERSION "0.9.16.3" 
     38#define ATH_HAL_VERSION "0.9.16.13"