X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=sidebyside;f=test_src%2Fcli-core.S;h=1c76c392625c119c2de8e3023453c86aa265f985;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hp=69671f6339320ba59b57d75efd25ac2cbdd61f94;hpb=24e4a90f4aea9941ff89472ea7d1349d6db82029;p=avr-crypto-lib.git

diff --git a/test_src/cli-core.S b/test_src/cli-core.S
index 69671f6..1c76c39 100644
--- a/test_src/cli-core.S
+++ b/test_src/cli-core.S
@@ -1,7 +1,7 @@
 /* cli-core.S */
 /*
     This file is part of the AVR-Huffman.
-    Copyright (C) 2009  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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;
@@ -39,6 +39,7 @@
  */
 TMP_CNT_0 = 26
 TMP_CNT_1 = 27
+
 .global max_cmd_length
 max_cmd_length:
 	movw r30, r24
@@ -133,7 +134,7 @@ 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
@@ -256,7 +257,7 @@ 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
  */
@@ -345,7 +346,7 @@ cli_auto_help:
 	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
@@ -391,6 +392,7 @@ cli_auto_help:
 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"