X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/dab74a42d544d3f45777eff471f1ee0166b4aaae..6dbf5891f52b1e06f8448e2b0526214bc882c6ec:/avr/env.c

diff --git a/avr/env.c b/avr/env.c
index add281c..f167859 100644
--- a/avr/env.c
+++ b/avr/env.c
@@ -14,7 +14,7 @@
 
 #define DEBUG_ENV	0	/* set to 1 to debug */
 
-#define debug_env(fmt, args...)		                                              \
+#define debug_env(fmt, args...)                                                \
 	debug_cond(DEBUG_ENV, fmt, ##args)
 
 
@@ -25,13 +25,12 @@
 #define DELIM 		"\0"
 
 const FLASH char default_env[] = {
-	ENV_BAUDRATE	  "=" "115200" DELIM
-	ENV_BOOTDELAY	  "=" "3" DELIM
+	ENV_BAUDRATE	  "=" stringify(CONFIG_BAUDRATE) DELIM
+	ENV_BOOTDELAY	  "=" stringify(CONFIG_BOOTDELAY) DELIM
 	ENV_BOOTCMD		  "=" "pin ${pins};loadcpm3;go ${startaddress}" DELIM
 	ENV_CPM3_SYSFILE  "=" CONFIG_CPM3_SYSFILE DELIM
 	ENV_PINALIAS	  "=" "0:PG5,1:PG4,2:PB4,3:PB5,4:PB6,5:PB7,"
 						  "6:PG3,7:PG2,8:PG1,9:PG0,10:PE7" DELIM
-	//ENV_STARTADDRESS  "=" "0" DELIM
 	"pins"			  "=" "2,8 low 9 high 3 2" DELIM
 	DELIM
 };
@@ -64,6 +63,7 @@ char env_get_char(uint_fast16_t index)
 	switch (env_valid) {
 	case 2:
 		off += CONFIG_ENV_SIZE;
+		/* FALL TROUGH */
 	case 1:
 		ret = (char) eeprom_read_byte((const uint8_t *)off + index +
 				offsetof(env_t, data));
@@ -563,7 +563,7 @@ command_ret_t _do_env_set(uint_fast8_t flag UNUSED, int argc, char * const argv[
  * @param varvalue	Value to set it to
  * @return 0 if ok, 1 on error
  */
-static
+
 int setenv(const MEMX char *varname, const char *varvalue)
 {
 	int rc;
@@ -693,9 +693,6 @@ command_ret_t do_env_print(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED,
 	bool mode = 0;
 	command_ret_t rc = CMD_RET_SUCCESS;
 
-	/* reset getopt() */
-	optind = 0;
-
 	int opt;
 	while ((opt = getopt(argc, argv, PSTR("s"))) != -1) {
 		switch (opt) {
@@ -720,9 +717,8 @@ command_ret_t do_env_print(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED,
 
 	/* print selected env vars */
 	while (optind < argc) {
-		int rc = env_print(argv[optind], mode);
-		if (rc < 0) {
-			printf_P(PSTR("## Error: \"%s\" not defined\n"), argv[optind]);
+		int len = env_print(argv[optind], mode);
+		if (len < 0) {
 			rc = CMD_RET_FAILURE;
 		}
 		optind++;