remove ath_hal_reg_write_target and OS_REG_WRITE

[open-ath9k-htc-firmware.git] / target_firmware / wlan / ah_osdep.c

diff --git a/target_firmware/wlan/ah_osdep.c b/target_firmware/wlan/ah_osdep.c
index bfcc608c7c355f0c25ad173f0ba5131af0adfa80..a984be79f361d43b01be62831a5b1888e5a7c15d 100755 (executable)
--- a/target_firmware/wlan/ah_osdep.c
+++ b/target_firmware/wlan/ah_osdep.c
@@ -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.
+ */
+
 #include <stdarg.h>
 #include <adf_os_types.h>
 #include <adf_os_dma.h>
@@ -13,7 +48,6 @@
 #include <adf_os_atomic.h>
 #include <adf_nbuf.h>
 #include <adf_net.h>
-#include <adf_net_types.h>
 
 #include "ah.h"
 #include<ah_internal.h>
@@ -27,49 +61,17 @@ ath_hal_getuptime(struct ath_hal *ah)
 
 struct ath_hal *
 _ath_hal_attach_tgt(a_uint32_t devid, HAL_SOFTC sc,
-                   adf_os_device_t dev,HAL_BUS_HANDLE sh, a_uint32_t flags, void* s)
+                   adf_os_device_t dev, a_uint32_t flags, void* s)
 {
        HAL_STATUS status;
-       struct ath_hal *ah = ath_hal_attach_tgt(devid,sc,dev,sh, flags, &status);
+       struct ath_hal *ah = ath_hal_attach_tgt(devid, sc, dev, flags, &status);
        adf_os_print(" ath_hal = %p \n",ah);
        *(HAL_STATUS *)s = status;
        return ah;
 }
 
-void
-ath_hal_detach(struct ath_hal *ah)
-{
-       (*ah->ah_detach)(ah);
-}
-
 extern void *global_hdl;
 
-/*
- * Memory-mapped device register read/write.  These are here
- * as routines when debugging support is enabled and/or when
- * explicitly configured to use function calls.  The latter is
- * for architectures that might need to do something before
- * referencing memory (e.g. remap an i/o window).
- *
- * NB: see the comments in ah_osdep.h about byte-swapping register
- *     reads and writes to understand what's going on below.
- */
-void __ahdecl
-ath_hal_reg_write_target(struct ath_hal *ah, a_uint32_t reg, a_uint32_t val)
-{ 
-       adf_os_reg_write32(ah->ah_dev, reg, val); 
-}
-
-a_uint32_t __ahdecl
-ath_hal_reg_read_target(struct ath_hal *ah, a_uint32_t reg)
-{
-       a_uint32_t val;
-
-       val = adf_os_reg_read32(ah->ah_dev, reg);
-
-       return val;
-}
-
 /*
  * Delay n microseconds.
  */
@@ -100,31 +102,16 @@ ath_hal_free(void* p)
        adf_os_mem_free(p);
 }
 
-void __ahdecl
-ath_hal_memzero(void *dst, adf_os_size_t n)
-{
-       adf_os_mem_set(dst, 0, n);
-}
-
 void * __ahdecl
-ath_hal_memcpy(void *dst, void *src, adf_os_size_t n)
+ath_hal_memcpy(void *dst, const void *src, adf_os_size_t n)
 {
        adf_os_mem_copy(dst, src, n);
        return 0;
 }
 
-/*
- * Print/log message support.
- */
-void __ahdecl
-ath_hal_vprintf(struct ath_hal *ah, const char* fmt, va_list ap)
-{
-}
-
 enum {
        DEV_ATH     = 9,            /* XXX must match driver */
 };
 
 adf_os_module_dep(hal, adf_net);
 adf_os_module_dep(hal, hal);
-adf_os_virt_module_name(hal);