X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fmagpie_fw_dev%2Ftarget%2Fcmnos%2Fdbg_api.c;h=42215df253aada32cd3a40d9facd3104aaf1053b;hb=0daf1f48384f37635730f1e5410028e11a1be8db;hp=c528428c432902c02aa5d3caf4bd65055418adac;hpb=f2181f6eeafb156033107a37284e7054c5f3ecbe;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/magpie_fw_dev/target/cmnos/dbg_api.c b/target_firmware/magpie_fw_dev/target/cmnos/dbg_api.c
index c528428..42215df 100755
--- a/target_firmware/magpie_fw_dev/target/cmnos/dbg_api.c
+++ b/target_firmware/magpie_fw_dev/target/cmnos/dbg_api.c
@@ -75,10 +75,6 @@ static int db_ascii_to_hex(char *, unsigned long *);
 static int db_hex_to_ascii(unsigned long, char *);
 static void zf_debug_task(void);
 
-int db_info_intr(char* cmd, char* param1, char* param2, char* param3);
-
-extern u32_t this_is_global_variables;
-
 /* Console debug command table */
 const struct DB_COMMAND_STRUCT command_table[] =
 {
@@ -122,18 +118,10 @@ int cmd_not_found;
 uint16_t gvLen;
 int pressed_time;
 
-//////////////////////////////////////////////////
-#define MAX_REG_NUM 16
-
-typedef struct reg_elem {
-	unsigned char valid;
-	unsigned char mode;     // byte, half-word word
-	unsigned long reg_addr;
-} t_reg_elem;
-
-t_reg_elem reg_buffer[MAX_REG_NUM];
-
-//////////////////////////////////////////////////
+static void db_incorect_format(void)
+{
+	A_PRINTF("Error! Incorrect format.\n\r");
+}
 
 static void zf_debug_init(void)
 {
@@ -448,12 +436,9 @@ static int db_ldr_cmd(char *cmd, char *param1, char *param2, char *param3)
 		A_PRINTF("%s : %s\n\r", addr_str, val_str);
 		return 0;
 	}
-	else
-	{
-		A_PRINTF("Error! Incorrect format.\n\r");
 
-		return -1;
-	}
+	db_incorect_format();
+	return -1;
 }
 
 static int db_str_cmd(char *cmd, char *param1, char *param2, char *param3)
@@ -496,12 +481,9 @@ static int db_str_cmd(char *cmd, char *param1, char *param2, char *param3)
 		A_PRINTF("%s : %s\n\r", addr_str, val_str);
 		return 0;
 	}
-	else
-	{
-		A_PRINTF("Error! Incorrect format.\n\r");
 
-		return -1;
-	}
+	db_incorect_format();
+	return -1;
 }
 
 LOCAL void dbg_timer_func(A_HANDLE alarm, void *data)
@@ -567,8 +549,6 @@ static int db_intr_cmd(char *cmd, char *param1, char *param2, char *param3)
 	return 0;
 }
 
-uint32_t usb_swap_flag = 0; //default
-uint32_t usb_swap_flag_changed = 0;
 static int db_usb_cmd(char *cmd, char *param1, char *param2, char *param3)
 {
 	A_PRINTF("THIS IS USB COMMAND\n\r");
@@ -715,41 +695,6 @@ static int db_cmd_starthtc(char *cmd, char *param1, char *param2, char *param3)
     HTC_Ready(htc_handle);
 }
 
-#define WRITE_USB_DESC(pDesc, Offset)					\
-	{								\
-		uint16_t *pSrc = 0;					\
-		uint16_t mSize = 0;					\
-		pSrc = (uint16_t *)(pDesc);				\
-		mSize = (*pSrc&0xff)/2;					\
-		A_PRINTF("0x%04x, 0x%04x, 0x%08x\n", Offset, mSize, pSrc); \
-		A_EEP_WRITE(Offset, mSize, pSrc);			\
-		A_DELAY_USECS(500);					\
-	}
-
-#define READ_USB_DESC(pDesc, Offset, Size)				\
-	{								\
-		uint16_t *pDst;						\
-		uint16_t mSize;						\
-		pDst = (uint16_t *)pDesc;				\
-		A_EEP_READ(Offset, 1, &mSize);				\
-		mSize = mSize &0xff;					\
-		mSize = mSize/2;					\
-		if( mSize > Size)					\
-			mSize = Size;					\
-		A_PRINTF("0x%04x, 0x%04x, 0x%08x\n", Offset, mSize, pDst); \
-		A_EEP_READ(Offset, mSize, pDst);			\
-		A_DELAY_USECS(500);					\
-	}
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-extern uint16_t UsbDeviceDescriptor[];
-extern uint16_t String00Descriptor[];
-extern uint16_t String10Descriptor[];
-extern uint16_t String20Descriptor[];
-extern uint16_t String30Descriptor[];
-
 static int db_wdt_cmd(char *cmd, char *param1, char *param2, char *param3)
 {
         if ( strcmp(param1, "rst") == 0 )
@@ -851,11 +796,9 @@ static int db_cmd_sferase(char *cmd, char *param1, char *param2, char *param3)
 
 			return 0;
 		}
-		else
-		{
-			A_PRINTF("Error! Incorrect format.\n\r");
-			return -1;
-		}
+
+		db_incorect_format();
+		return -1;
 	}
 	else if (strcmp(param2, "b") == 0)
 	{
@@ -867,11 +810,10 @@ static int db_cmd_sferase(char *cmd, char *param1, char *param2, char *param3)
 
 			return 0;
 		}
-		else
-		{
-			A_PRINTF("Error! Incorrect format.\n\r");
-			return -1;
-		}
+
+		db_incorect_format();
+		return -1;
+
 	}
 	else if (strcmp(param1, "c") == 0)
 	{
@@ -904,11 +846,9 @@ static int db_cmd_sfpg(char *cmd, char *param1, char *param2, char *param3)
 		A_PRINTF("\n\r");
 		return 0;
 	}
-	else
-	{
-		A_PRINTF("Error! Incorrect format.\n\r");
-		return -1;
-	}
+
+	db_incorect_format();
+	return -1;
 }
 
 /* Serial Flash -> Read, Fast Read to UART */
@@ -948,11 +888,9 @@ static int db_cmd_sfru(char *cmd, char *param1, char *param2, char *param3)
 		A_PRINTF("\n\r");
 		return 0;
 	}
-	else
-	{
-		A_PRINTF("Error! Incorrect format.\n\r");
-		return -1;
-	}
+
+	db_incorect_format();
+	return -1;
 }
 
 /* Serial Flash -> Read, Fast Read to Memory */
@@ -986,11 +924,9 @@ static int db_cmd_sfrm(char *cmd, char *param1, char *param2, char *param3)
 		A_PRINTF("\n\r");
 		return 0;
 	}
-	else
-	{
-		A_PRINTF("Error! Incorrect format.\n\r");
-		return -1;
-	}
+
+	db_incorect_format();
+	return -1;
 }
 
 /* Serial Flash -> Read Status Register */
@@ -1019,11 +955,9 @@ static int db_cmd_memcmp(char *cmd, char *param1, char *param2, char *param3)
 		A_PRINTF("memcmp(buf1, buf2, len) = %d\n\r", A_MEMCMP(buf1, buf2, len));
 		return 0;
 	}
-	else
-	{
-		A_PRINTF("Error! Incorrect format.\n\r");
-		return -1;
-	}
+
+	db_incorect_format();
+	return -1;
 }
 
 /* Memory Dump */
@@ -1050,11 +984,9 @@ static int db_cmd_memdump(char *cmd, char *param1, char *param2, char *param3)
 		A_PRINTF("\n\r");
 		return 0;
 	}
-	else
-	{
-		A_PRINTF("Error! Incorrect format.\n\r");
-		return -1;
-	}
+
+	db_incorect_format();
+	return -1;
 }
 void cmnos_dbg_module_install(struct dbg_api *apis)
 {