X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fcli-core.S;h=43dcb6c21c0995576ce4a8acbffdcce6ca0c4e1f;hb=22985930c9c2c610ae18e2d8df0f3ea78a082134;hp=f074b045c6275b8183239f7371908bf31971bdb1;hpb=52ec168ece9d61bd9cb652235dfe8faee6232a11;p=avr-crypto-lib.git

diff --git a/test_src/cli-core.S b/test_src/cli-core.S
index f074b04..43dcb6c 100644
--- a/test_src/cli-core.S
+++ b/test_src/cli-core.S
@@ -24,7 +24,7 @@
 /******************************************************************************/
 /* uint16_t max_cmd_length(PGM_VOID_P cmdlist){
 	uint16_t t,ret=0;
-	char* str;
+	char *str;
 	for(;;){
 		str = (char*)pgm_read_word(cmdlist);
 		cmdlist = (uint8_t*)cmdlist + CMDLIST_ENTRY_SIZE;
@@ -38,7 +38,8 @@
  *    param cmdlist:  r24:r25
  */
 TMP_CNT_0 = 26
-TMP_CNT_1 = 27 
+TMP_CNT_1 = 27
+
 .global max_cmd_length
 max_cmd_length:
 	movw r30, r24
@@ -68,10 +69,10 @@ max_cmd_length:
 	brge 1b
 	movw r24, TMP_CNT_0
 	rjmp 1b
-		 
+
 /******************************************************************************/
 .global echo_ctrl
-echo_ctrl: 
+echo_ctrl:
 	call strstrip
 	tst r24
 	brne 3f
@@ -95,14 +96,14 @@ echo_ctrl:
 	cpi r20, 'n'
 	breq exit_1
 	cpi r20, 'f'
-	breq exit_0	
+	breq exit_0
 	ret
-exit_1: 	
+exit_1:
 	ldi r20, 1
 	rjmp exit
 exit_0:
 	ldi r20, 0
-exit:	
+exit:
 	sts cli_echo, r20
 	ret
 print_echo_status:
@@ -128,12 +129,12 @@ print_echo_status:
 	clr r25
 	ldi r24, '\n'
 	rcall cli_putc
-	ret		
+	ret
 pecho:
 .asciz "\r\necho is o"
 
 /******************************************************************************/
-/* int8_t search_and_call(char* cmd, uint16_t maxcmdlength, PGM_VOID_P cmdlist)	
+/* int8_t search_and_call(char *cmd, uint16_t maxcmdlength, PGM_VOID_P cmdlist)
  *    param cmd:          r24:r25
  *    param maxcmdlength: r22:r23
  *    param cmdlist:      r20:r21
@@ -146,7 +147,7 @@ CMD_1 = 17
 snc_auto_help:
 	movw r24, r22
 	movw r22, r20
-	rcall cli_auto_help	
+	rcall cli_auto_help
 snc_return_1:
 	ldi r24, 1
 	rjmp snc_return
@@ -154,7 +155,7 @@ snc_return_2:
 	ldi r24, 2
 snc_return:
 	clr r25
-	ret	 
+	ret
 
 .global search_and_call
 search_and_call:
@@ -183,7 +184,7 @@ search_and_call:
 	tst r18
 	brne 1f
 2:	rjmp snc_auto_help
-1:	
+1:
 	push r28
 	push r29
 	push CMD_0
@@ -237,7 +238,7 @@ snc_found:
 	icall
 	ldi r24, 1
 	rjmp 5f
-4:	ldi r24, 2	
+4:	ldi r24, 2
 snc_return_0:
 	clr r24
 5:	pop LEN_1
@@ -256,12 +257,12 @@ nocommand_str:
 .asciz "\r\ncommand not found, try 'help'"
 
 /******************************************************************************/
-/* void cli_option_listing(char* buffer, PGM_VOID_P cmdlist)
+/* void cli_option_listing(char *buffer, PGM_VOID_P cmdlist)
  *   param buffer:    r24:r25
  *   param cmdlist:   r22:r23
  */
 ITM_0 = 12
-ITM_1 = 13 
+ITM_1 = 13
 CMD_0 = 14
 CMD_1 = 15
 LEN_0 = 16
@@ -277,6 +278,9 @@ cli_option_listing:
 	call strlen
 	sbiw r24, 1
 	movw LEN_0, r24
+	brpl 1f
+	clr LEN_0
+	clr LEN_1
 1:
 	movw r30, LST_0
 	lpm r24, Z+
@@ -297,7 +301,7 @@ cli_option_listing:
 	movw r24, ITM_0
 	rcall cli_putstr_P
 	rjmp 1b
-99:	
+99:
 	ldi r24, lo8(prompt_str)
 	ldi r25, hi8(prompt_str)
 	rcall cli_putstr_P
@@ -307,9 +311,9 @@ cli_option_listing:
 	pop_range 12, 17
 	ret
 
-prompt_str:	
+prompt_str:
 .asciz "\r\n>"
-itemprefix_str:	
+itemprefix_str:
 .asciz "\r\n   "
 
 /******************************************************************************/
@@ -319,7 +323,7 @@ itemprefix_str:
  */
 
 TMP_0 = 14
-TMP_1 = 15 
+TMP_1 = 15
 LEN_0 = 16
 LEN_1 = 17
 LST_0 = 28
@@ -338,11 +342,11 @@ cli_auto_help:
 	lpm r25, Z+
 	movw r28, r30
 	adiw r24, 0
-	breq 99f	
+	breq 99f
 	movw TMP_0, r24
 	rcall cli_putstr_P
 	movw r24, TMP_0
-	call strlen_P
+	call strlen_PF
 	movw TMP_0, LEN_0
 	sub TMP_0, r24
 	sbc TMP_1, r25
@@ -354,9 +358,9 @@ cli_auto_help:
 	brne 2b
 4:	ldi r24, lo8(sep_str)
 	ldi r25, hi8(sep_str)
+	rcall cli_putstr_P
 	ldi r22, lo8(none_str)
 	ldi r23, hi8(none_str)
-	rcall cli_putstr_P
 	movw r30, r28
 	lpm r24, Z+
 	lpm r25, Z+
@@ -366,7 +370,7 @@ cli_auto_help:
 	ldi r22, lo8(yes_str)
 	ldi r23, hi8(yes_str)
 5:	movw r24, r22
-	rcall cli_putstr_P	
+	rcall cli_putstr_P
 	ldi r24, lo8(sep2_str)
 	ldi r25, hi8(sep2_str)
 	rcall cli_putstr_P
@@ -385,9 +389,10 @@ cli_auto_help:
 	rcall cli_putc
 	adiw r28, CMDLIST_ENTRY_SIZE-4
 	rjmp 1b
-99:	
+99:
 	pop_range 28, 29
 	pop_range 14, 17
+	ori r24, 1
 	ret
 ahelphead_str:
 .asciz "\r\n[auto help] available commands:\r\n <command> - <params> - <address>\r\n"