Merge branch 'master' into cmdline_edit

1 files changed, 37 insertions, 9 deletions

diff --git a/avr/env.c b/avr/env.c
index 017053c..9ea355f 100644
--- a/avr/env.c
+++ b/avr/env.c
@@ -1,3 +1,9 @@
+/*
+ * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
 #include "common.h"
 #include <string.h>
 #include <stdlib.h>
@@ -8,7 +14,6 @@
 #include "xmalloc.h"
 #include "crc.h"
 #include "command.h"
-
 #include "env.h"
 
 
@@ -26,13 +31,17 @@
 #define DELIM 		"\0"
 
 const FLASH char default_env[] = {
-	"bootdelay="	"3"		DELIM
-	"bootcmd="	"reset; loadf; go ${startaddr}"	DELIM
-	"baudrate="	"115200"	DELIM
-	"startaddr="	"0"		DELIM
+	ENV_BAUDRATE	  "=" "115200" DELIM
+	ENV_BOOTDELAY	  "=" "3" DELIM
+	ENV_BOOTCMD		  "=" "reset; loadf; go ${startaddr}" 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
 	DELIM
 };
 
+
 /* EEPROM storage */
 typedef struct environment_s {
 	uint16_t	crc;		/* CRC16 over data bytes	*/
@@ -447,7 +456,6 @@ command_ret_t _do_env_set(int flag, int argc, char * const argv[])
 	env_item_t e, *ep;
 
 	(void) flag;
-	debug("Initial value for argc=%d\n", argc);
 
 	name = argv[1];
 	value = argv[2];
@@ -514,15 +522,35 @@ command_ret_t _do_env_set(int flag, int argc, char * const argv[])
  * @return 0 if ok, 1 on error
  */
 static
-int setenv(const char *varname, const char *varvalue)
+int setenv(const MEMX char *varname, const char *varvalue)
 {
-	const char * const argv[3] = { NULL, varname, varvalue };
+	int rc;
+
+#ifdef __MEMX
+	char *tmpname = NULL;
+	if (__builtin_avr_flash_segment(varname) != -1) {
+		tmpname = malloc(strlen_P(varname)+1);
+		if (tmpname == NULL) {
+			printf_P(PSTR("setenv: Out of Memory!\n"));
+			return 1;
+		}
+		strcpy_P(tmpname, varname);
+	} else
+		tmpname = (char *) varname;
+#endif
+
+	const char * const argv[3] = { NULL, tmpname, varvalue };
 	int argc = 3;
 
 	if (varvalue == NULL || varvalue[0] == '\0')
 		--argc;
 
-	return (int) _do_env_set(0, argc, (char * const *)argv);
+	rc = (int) _do_env_set(0, argc, (char * const *)argv);
+
+#ifdef __MEMX
+	free(tmpname);
+#endif
+	return rc;
 }
 
 /**