ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/hif/common/hif_sdio_common.h

 //------------------------------------------------------------------------------
-// <copyright file="hif_sdio_common.h" company="Atheros">
-//    Copyright (c) 2009 Atheros Corporation.  All rights reserved.
+// Copyright (c) 2009-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.
 //
 //
 //------------------------------------------------------------------------------
 //==============================================================================
 // common header file for HIF modules designed for SDIO
 //
 // Author(s): ="Atheros"
 //==============================================================================
 
 #ifndef HIF_SDIO_COMMON_H_
 #define HIF_SDIO_COMMON_H_
 
     /* SDIO manufacturer ID and Codes */
-#define MANUFACTURER_ID_AR6001_BASE        0x100
 #define MANUFACTURER_ID_AR6002_BASE        0x200
 #define MANUFACTURER_ID_AR6003_BASE        0x300
 #define MANUFACTURER_ID_AR6K_BASE_MASK     0xFF00
 #define FUNCTION_CLASS                     0x0
 #define MANUFACTURER_CODE                  0x271    /* Atheros */
 
     /* Mailbox address in SDIO address space */
 #define HIF_MBOX_BASE_ADDR                 0x800
 #define HIF_MBOX_WIDTH                     0x800
 #define HIF_MBOX_START_ADDR(mbox)               \
@@ skipping 15 matching lines @@
 #define HIF_GMBOX_BASE_ADDR                0x7000
 #define HIF_GMBOX_WIDTH                    0x4000
 
     /* for SDIO we recommend a 128-byte block size */
 #define HIF_DEFAULT_IO_BLOCK_SIZE          128
 
     /* set extended MBOX window information for SDIO interconnects */
 static INLINE void SetExtendedMboxWindowInfo(A_UINT16 Manfid, HIF_DEVICE_MBOX_INFO *pInfo)
 {
     switch (Manfid & MANUFACTURER_ID_AR6K_BASE_MASK) {                   
-        case MANUFACTURER_ID_AR6001_BASE :
-            /* no extended MBOX */
-            break;
         case MANUFACTURER_ID_AR6002_BASE :
                 /* MBOX 0 has an extended range */
             pInfo->MboxProp[0].ExtendedAddress = HIF_MBOX0_EXTENDED_BASE_ADDR;             
             pInfo->MboxProp[0].ExtendedSize = HIF_MBOX0_EXTENDED_WIDTH_AR6002;
             break;
         case MANUFACTURER_ID_AR6003_BASE :
                 /* MBOX 0 has an extended range */
             pInfo->MboxProp[0].ExtendedAddress = HIF_MBOX0_EXTENDED_BASE_ADDR_AR6003_V1;             
             pInfo->MboxProp[0].ExtendedSize = HIF_MBOX0_EXTENDED_WIDTH_AR6003_V1;
             pInfo->GMboxAddress = HIF_GMBOX_BASE_ADDR;
             pInfo->GMboxSize = HIF_GMBOX_WIDTH;
             break;
         default:
             A_ASSERT(FALSE);
             break;
     }
 }
              
 /* special CCCR (func 0) registers */
 
 #define CCCR_SDIO_IRQ_MODE_REG         0xF0        /* interrupt mode register */
 #define SDIO_IRQ_MODE_ASYNC_4BIT_IRQ   (1 << 0)    /* mode to enable special 4-bit interrupt assertion without clock*/ 
                         
 #endif /*HIF_SDIO_COMMON_H_*/