From: Adrian Chadd <adrian.chadd@gmail.com>
Date: Wed, 10 Apr 2013 08:32:43 +0000 (-0700)
Subject: Merge pull request #12 from KrasnikovEugene/master
X-Git-Tag: 1.3.2~6
X-Git-Url: https://jxself.org/git/?p=open-ath9k-htc-firmware.git;a=commitdiff_plain;h=3a1149f27e5a2a72349cc0a8cf86c374b74c2643;hp=edb72047db93a3cf9c52404096f8ad4edc4a154f

Merge pull request #12 from KrasnikovEugene/master

Build warning fix
---

diff --git a/target_firmware/magpie_fw_dev/build/utility/Makefile b/target_firmware/magpie_fw_dev/build/utility/Makefile
index a7f6581..c1fc0ec 100755
--- a/target_firmware/magpie_fw_dev/build/utility/Makefile
+++ b/target_firmware/magpie_fw_dev/build/utility/Makefile
@@ -7,4 +7,3 @@ all:
 
 clean :
 	@for i in $(DIRS) ; do $(MAKE) -C $$i clean; done
-	@rm -r $(TARGET_DIR)
diff --git a/target_firmware/magpie_fw_dev/target/inc/k2/athos_api.h b/target_firmware/magpie_fw_dev/target/inc/k2/athos_api.h
index ed3ff66..01f75aa 100755
--- a/target_firmware/magpie_fw_dev/target/inc/k2/athos_api.h
+++ b/target_firmware/magpie_fw_dev/target/inc/k2/athos_api.h
@@ -56,7 +56,7 @@
 /* ROM Patch API */
 
 /* save the ROM printf function point */
-extern uint32_t save_cmnos_printf;
+extern int (* save_cmnos_printf)(const char * fmt, ...);
 
 extern unsigned int _data_start_in_rom;
 extern unsigned int _data_start;
diff --git a/target_firmware/magpie_fw_dev/target/init/app_start.c b/target_firmware/magpie_fw_dev/target/init/app_start.c
index 64552aa..136f966 100644
--- a/target_firmware/magpie_fw_dev/target/init/app_start.c
+++ b/target_firmware/magpie_fw_dev/target/init/app_start.c
@@ -128,13 +128,13 @@ void app_start()
 	A_PRINTF(" A_WDT_INIT()\n\r");
 
 #if defined(PROJECT_K2)
-	save_cmnos_printf = (uint32_t) fw_cmnos_printf;
+	save_cmnos_printf = fw_cmnos_printf;
 #endif
 
 	if( hostif == HIF_USB ) {
 #if defined(PROJECT_K2)
 #if MOVE_PRINT_TO_RAM
-		save_cmnos_printf = (uint32_t) _indir_tbl.cmnos.printf._printf;
+		save_cmnos_printf = _indir_tbl.cmnos.printf._printf;
 		_indir_tbl.cmnos.printf._printf = fw_cmnos_printf;
 #endif
 		_indir_tbl.cmnos.usb._usb_fw_task = _fw_usb_fw_task;
diff --git a/target_firmware/magpie_fw_dev/target/init/init.c b/target_firmware/magpie_fw_dev/target/init/init.c
index b32661e..54885b2 100755
--- a/target_firmware/magpie_fw_dev/target/init/init.c
+++ b/target_firmware/magpie_fw_dev/target/init/init.c
@@ -60,7 +60,7 @@ uint32_t idle_cnt = 0;
 
 #if defined(PROJECT_K2)
 // save the ROM printf function point
-uint32_t save_cmnos_printf;
+int (* save_cmnos_printf)(const char * fmt, ...);
 #endif
 
 #define ATH_DATE_STRING     __DATE__" "__TIME__