build fix: ah_setupRxDesc should use ath_rx_desc

[open-ath9k-htc-firmware.git] / target_firmware / wlan / ah.h

diff --git a/target_firmware/wlan/ah.h b/target_firmware/wlan/ah.h
index c86d115c81be2ddc386a0f4a0c259b03838c0927..36758ef89074fc710d66214b22d5dd42bcec859c 100755 (executable)
--- a/target_firmware/wlan/ah.h
+++ b/target_firmware/wlan/ah.h
@@ -1,3 +1,38 @@
+/*
+ * Copyright (c) 2013 Qualcomm Atheros, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted (subject to the limitations in the
+ * disclaimer below) provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *  * Neither the name of Qualcomm Atheros nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+ * GRANTED BY THIS LICENSE.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+ * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #ifndef _ATH_AH_H_
 #define _ATH_AH_H_
 
@@ -9,6 +44,7 @@
 #endif
 
 #define AR5416_DEVID_PCIE   0x0024  /* AR5416 PCI-E (XB) (Owl) */
+#define HAL_RATE_TABLE_SIZE 33
 
 typedef enum {
        HAL_OK           = 0,    /* No error */
@@ -240,7 +276,7 @@ typedef struct {
 
 typedef struct {
        a_int32_t    rateCount;
-       a_uint8_t    rateCodeToIndex[32];
+       a_uint8_t    rateCodeToIndex[HAL_RATE_TABLE_SIZE];
        struct {
                a_uint8_t    valid;
                a_uint8_t    phy;
@@ -254,7 +290,7 @@ typedef struct {
                a_uint8_t    controlRate;
                a_uint16_t   lpAckDuration;
                a_uint16_t   spAckDuration;
-       } info[32];
+       } info[HAL_RATE_TABLE_SIZE];
 } HAL_RATE_TABLE;
 
 typedef struct {
@@ -271,7 +307,7 @@ typedef struct {
 
 typedef struct {
        a_int32_t    rateCount;
-       a_uint8_t    rateCodeToIndex[32];
+       a_uint8_t    rateCodeToIndex[HAL_RATE_TABLE_SIZE];
        struct {
                a_uint8_t    valid;
                a_uint8_t    phy;
@@ -282,7 +318,7 @@ typedef struct {
                a_uint8_t    controlRate;
                a_uint16_t   lpAckDuration;
                a_uint16_t   spAckDuration;
-       } info[32];
+       } info[HAL_RATE_TABLE_SIZE];
 } HAL_RATE_TABLE;
 
 #define HAL_RATESERIES_RTS_CTS    0x0001  /* use rts/cts w/this series */
@@ -421,7 +457,7 @@ struct ath_hal
        /* Target receive Functions */
        a_uint32_t __ahdecl(*ah_getRxDP)(struct ath_hal*);
        void       __ahdecl(*ah_setRxDP)(struct ath_hal*, a_uint32_t rxdp);
-       HAL_BOOL  __ahdecl(*ah_setupRxDesc)(struct ath_hal *, struct ath_desc *,
+       HAL_BOOL  __ahdecl(*ah_setupRxDesc)(struct ath_hal *, struct ath_rx_desc *,
                                            a_uint32_t size, a_uint32_t flags);
        HAL_STATUS __ahdecl(*ah_procRxDesc)(struct ath_hal *, struct ath_desc *,
                                            a_uint32_t phyAddr, struct ath_desc *next, u_int64_t tsf);