X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fif_ath_pci.c;h=19b03301545850dbfc414f9857c8faed2228570c;hb=f0b8b3a676098d2a6191e6d813bd9e26dcadfa81;hp=d4499ffaeb9b4680b863b4052e5d52dee3ff8360;hpb=16998c7f8ef070f1382e3ddf19f54d609f0458fe;p=open-ath9k-htc-firmware.git diff --git a/target_firmware/wlan/if_ath_pci.c b/target_firmware/wlan/if_ath_pci.c index d4499ff..19b0330 100755 --- a/target_firmware/wlan/if_ath_pci.c +++ b/target_firmware/wlan/if_ath_pci.c @@ -1,40 +1,43 @@ /*- * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting * Copyright (c) 2004 Atheros Communications, Inc. + * Copyright (c) 2013 Qualcomm Atheros, Inc. + * * All rights reserved. * * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * without modification. - * 2. Redistributions in binary form must reproduce at minimum a disclaimer - * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any - * redistribution must be conditioned upon including a substantially - * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived + * 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. * * Alternatively, this software may be distributed under the terms of the * GNU General Public License ("GPL") version 2 as published by the Free * Software Foundation. * - * NO WARRANTY - * 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 NONINFRINGEMENT, MERCHANTIBILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES. - * - * $Id: //depot/sw/branches/fusion_usb/target_firmware/wlan/target/madwifi/ath/if_ath_pci.c#1 $ + * 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 EXPORT_SYMTAB @@ -57,15 +60,13 @@ #include #include -#include #include #include #include "if_athvar.h" #include "if_ath_pci.h" -extern a_int32_t ath_tgt_attach(a_uint32_t devid,a_uint32_t mem_start, - struct ath_softc_tgt *sc, adf_os_device_t osdev); +extern a_int32_t ath_tgt_attach(a_uint32_t devid, struct ath_softc_tgt *sc, adf_os_device_t osdev); extern a_int32_t ath_detach(void *); extern adf_os_irq_resp_t ath_intr(adf_drv_handle_t hdl); @@ -114,7 +115,6 @@ static adf_os_pci_dev_id_t ath_pci_id_table[] = { }; #endif -void bus_read_cachesize(struct ath_softc *sc, a_uint8_t *csz); void exit_ath_pci(void); a_int32_t init_ath_pci(void); @@ -145,7 +145,7 @@ ath_pci_probe(adf_os_resource_t *res,a_int32_t count, adf_os_attach_data_t *data adf_os_print("ath_pci_probe %x\n",id->device); - if (ath_tgt_attach(id->device, res->start, &sc->aps_sc, osdev) != 0) + if (ath_tgt_attach(id->device, &sc->aps_sc, osdev) != 0) goto bad3; /* ready to process interrupts */ @@ -176,12 +176,6 @@ ath_pci_resume(adf_drv_handle_t hdl) { } -void -bus_read_cachesize(struct ath_softc *sc, a_uint8_t *csz) -{ - *csz = adf_os_cache_line_size(); -} - static adf_drv_info_t ath_drv_info = adf_os_pci_set_drv_info(ath_pci_tgt,&ath_pci_id_table[0], ath_pci_probe, ath_pci_remove, ath_pci_suspend, ath_pci_resume); a_int32_t