remove duplicate: clock_api.h

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>

diff --git a/target_firmware/magpie_fw_dev/target/cmnos/clock_api.h b/target_firmware/magpie_fw_dev/target/cmnos/clock_api.h
index 82b80fe1f33fc0691a9a44738478dab05ff1c1dd..b268ddbad0722bbe5f48b9794ea34429caf3d5c2 100755 (executable)
--- a/target_firmware/magpie_fw_dev/target/cmnos/clock_api.h
+++ b/target_firmware/magpie_fw_dev/target/cmnos/clock_api.h
@@ -40,16 +40,20 @@
 #define MSEC_TO_TICK(msec)             ((msec)* TICK_MSEC_RATIO)
 
 struct clock_api {
-    void (* _clock_init)(A_UINT32 ref_clk);
-    void (* _clockregs_init)(void);
-    A_UINT32 (* _uart_frequency)(void);
-    void (* _delay_us)(int);
-    void (* _wlan_band_set)(int);
-    A_UINT32 (* _refclk_speed_get)(void);
-    A_UINT32 (* _milliseconds)(void);
-    void (* _sysclk_change)(void);
+       void (* _clock_init)(A_UINT32 ref_clk);
+       void (* _clockregs_init)(void);
+       A_UINT32 (* _uart_frequency)(void);
+       void (* _delay_us)(int);
+       void (* _wlan_band_set)(int);
+       A_UINT32 (* _refclk_speed_get)(void);
+       A_UINT32 (* _milliseconds)(void);
+       void (* _sysclk_change)(void);
 
-    void (* _clock_tick)(void);
+#if defined(PROJECT_K2)
+       A_UINT32 (* _sysclk_get)(void);
+#endif
+
+       void (* _clock_tick)(void);
 };
 
 #endif /* __CLOCK_API_H__ */

diff --git a/target_firmware/magpie_fw_dev/target/inc/k2/clock_api.h b/target_firmware/magpie_fw_dev/target/inc/k2/clock_api.h
deleted file mode 100755 (executable)
index 15ddc74..0000000
--- a/target_firmware/magpie_fw_dev/target/inc/k2/clock_api.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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 __CLOCK_API_H__
-#define __CLOCK_API_H__
-
-#define TICK_MSEC_RATIO                        1
-#define TICK_TO_MSEC(tick)             ((tick)/TICK_MSEC_RATIO)
-#define MSEC_TO_TICK(msec)             ((msec)* TICK_MSEC_RATIO)
-
-typedef struct date_s {
-       uint16_t miliseconds;
-       uint16_t seconds;
-       uint16_t minutes;
-       uint16_t hours;
-} A_DATE_T;
-
-struct clock_api {
-       void (* _clock_init)(A_UINT32 ref_clk);
-       void (* _clockregs_init)(void);
-       A_UINT32 (* _uart_frequency)(void);
-       void (* _delay_us)(int);
-       void (* _wlan_band_set)(int);
-       A_UINT32 (* _refclk_speed_get)(void);
-       A_UINT32 (* _milliseconds)(void);
-       void (* _sysclk_change)(uint32_t sys_clk);
-       A_UINT32 (* _sysclk_get)(void);
-
-       void (* _clock_tick)(void);
-};
-
-#endif /* __CLOCK_API_H__ */

diff --git a/target_firmware/magpie_fw_dev/target/inc/k2/cmnos_api.h b/target_firmware/magpie_fw_dev/target/inc/k2/cmnos_api.h
index 68149019fedaa562bbe59318cb716660d985b9dc..437050f49443bc5bd11ab668a1b3b67bcf1263b5 100755 (executable)
--- a/target_firmware/magpie_fw_dev/target/inc/k2/cmnos_api.h
+++ b/target_firmware/magpie_fw_dev/target/inc/k2/cmnos_api.h
@@ -414,9 +414,7 @@ do {                                                                    \
         A_CMN(clock._wlan_band_set(which_band))
 
 /* Called whenever the system clock changes speed */
-#define A_SYSCLK_CHANGE(mhz)               A_CMN(clock._sysclk_change(mhz))
-
-#define A_SYSCLK_GET()               A_CMN(clock._sysclk_get())
+#define A_SYSCLK_CHANGE()               A_CMN(clock._sysclk_change())
 
 #else
 
@@ -430,7 +428,6 @@ do {                                                                    \
 #define A_CLOCKREGS_INIT()
 #define A_WLAN_BAND_SET(which_band)
 #define A_SYSCLK_CHANGE(mhz)
-#define A_SYSCLK_GET()
 
 #endif