ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h

 //------------------------------------------------------------------------------
 // <copyright file="hif_internal.h" company="Atheros">
-//    Copyright (c) 2004-2007 Atheros Corporation.  All rights reserved.
+//    Copyright (c) 2004-2010 Atheros Corporation.  All rights reserved.
 // 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation;
 //
-// Software distributed under the License is distributed on an "AS
-// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-// implied. See the License for the specific language governing
-// rights and limitations under the License.
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 //
 //------------------------------------------------------------------------------
 //==============================================================================
 // internal header file for hif layer
 //
 // Author(s): ="Atheros"
 //==============================================================================
 #ifndef _HIF_INTERNAL_H_
 #define _HIF_INTERNAL_H_
 
 #include "a_config.h"
 #include "athdefs.h"
 #include "a_types.h"
 #include "a_osapi.h"
 #include "hif.h"
 #include "../../../common/hif_sdio_common.h"
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)   
 #include <linux/scatterlist.h>
 #define HIF_LINUX_MMC_SCATTER_SUPPORT
-#endif
 
 #define BUS_REQUEST_MAX_NUM                64
 
 #define SDIO_CLOCK_FREQUENCY_DEFAULT       25000000
 #define SDWLAN_ENABLE_DISABLE_TIMEOUT      20
 #define FLAGS_CARD_ENAB                    0x02
 #define FLAGS_CARD_IRQ_UNMSK               0x04
 
 #define HIF_MBOX_BLOCK_SIZE                HIF_DEFAULT_IO_BLOCK_SIZE
 #define HIF_MBOX0_BLOCK_SIZE               1
@@ skipping 27 matching lines @@
     BUS_REQUEST *taskreq;                       /*  async tasklet data */
     spinlock_t lock;
     BUS_REQUEST *s_busRequestFreeQueue;         /* free list */
     BUS_REQUEST busRequest[BUS_REQUEST_MAX_NUM]; /* available bus requests */
     void     *claimedContext;
     HTC_CALLBACKS htcCallbacks;
     A_UINT8     *dma_buffer;
     DL_LIST      ScatterReqHead;                /* scatter request list head */
     A_BOOL       scatter_enabled;               /* scatter enabled flag */
     A_BOOL   is_suspend;
+    A_BOOL   is_disabled;
     atomic_t   irqHandling;
+    HIF_DEVICE_POWER_CHANGE_TYPE powerConfig;
+    const struct sdio_device_id *id;
 };
 
 #define HIF_DMA_BUFFER_SIZE (32 * 1024)
 #define CMD53_FIXED_ADDRESS 1
 #define CMD53_INCR_ADDRESS  2
 
 BUS_REQUEST *hifAllocateBusRequest(HIF_DEVICE *device);
 void hifFreeBusRequest(HIF_DEVICE *device, BUS_REQUEST *busrequest);
 void AddToAsyncList(HIF_DEVICE *device, BUS_REQUEST *busrequest);
 
@@ skipping 28 matching lines @@
 {
     return A_ENOTSUP;
 }
 
 #define CleanupHIFScatterResources(d) { }
 
 #endif // HIF_LINUX_MMC_SCATTER_SUPPORT
 
 #endif // _HIF_INTERNAL_H_