/*
* (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0
*/
#include "common.h"
#include <string.h>
#include <stdlib.h>
+#include <stdbool.h>
#include <avr/eeprom.h>
#include "config.h"
#include "debug.h"
#include "xmalloc.h"
#include "crc.h"
+#include "getopt-min.h"
#include "command.h"
#include "env.h"
const FLASH char default_env[] = {
ENV_BAUDRATE "=" "115200" DELIM
ENV_BOOTDELAY "=" "3" DELIM
- ENV_BOOTCMD "=" "reset; loadf; go ${startaddr}" 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
};
}
-char *getenv(const MEMX char *name)
+char *getenv_str(const MEMX char *name)
{
env_item_t *ep;
char *ret = NULL;
static
-int env_item_print(env_item_t *ep)
+int env_item_print(env_item_t *ep, bool mode)
{
int len;
char *ev = ep->envvar;
+ if (mode) {
+ len = printf_P(PSTR("setenv %s "), ev) - 7;
+ len += printf_P(PSTR("'%s'\n"), ev + len) - 2;
+ } else {
len = printf_P(PSTR("%s="), ev);
len += printf_P(PSTR("%s\n"), ev + len);
-
+ }
return len;
}
* Returns -1 in case of error, or length of printed string
*/
static
-int env_print(const MEMX char *name)
+int env_print(const MEMX char *name, bool mode)
{
int len = -1;
env_item_t *ep = envlist_search(name);
if (ep != NULL)
- len = env_item_print(ep);
+ len = env_item_print(ep, mode);
} else { /* print whole list */
len = 0;
for (int i = 0 ; i < entrycount; i++) {
- len += env_item_print(&env_list[i]);
+ len += env_item_print(&env_list[i], mode);
}
}
return len;
}
+/*
+ * Read an environment variable as a boolean
+ */
+bool getenv_yesno(const MEMX char *name)
+{
+ char *s = getenv_str(name);
+
+ if (s == NULL)
+ return false;
+
+ return strchr_P(PSTR("1yYtT"), *s) != NULL;
+
+/*
+ return *s == '1' || *s == 'y' || *s == 'Y' || *s == 't' || *s == 'T' ?
+ 1 : 0;
+*/
+}
+
command_ret_t do_env_print(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
+ (void) cmdtp; (void) flag;
+
+ bool mode = 0;
command_ret_t rc = CMD_RET_SUCCESS;
- (void) cmdtp; (void) flag;
+ /* reset getopt() */
+ optind = 0;
+
+ int opt;
+ while ((opt = getopt(argc, argv, PSTR("s"))) != -1) {
+ switch (opt) {
+ case 's':
+ mode = 1;
+ break;
+ default: /* '?' */
+ return CMD_RET_USAGE;
+ }
+ }
- if (argc == 1) {
+ if (optind == argc) {
/* print all env vars */
- int size = env_print(NULL);
+ int size = env_print(NULL, mode);
if (size < 0)
return CMD_RET_FAILURE;
- printf_P(PSTR("\nEnvironment size: %d/%d bytes\n"),
- size, ENV_SIZE);
+ if (mode == 0)
+ printf_P(PSTR("\nEnvironment size: %d/%d bytes\n"),
+ size, ENV_SIZE);
return CMD_RET_SUCCESS;
}
/* print selected env vars */
- for (int i = 1; i < argc; ++i) {
- int rc = env_print(argv[i]);
+ while (optind < argc) {
+ int rc = env_print(argv[optind], mode);
if (rc < 0) {
- printf_P(PSTR("## Error: \"%s\" not defined\n"), argv[i]);
+ printf_P(PSTR("## Error: \"%s\" not defined\n"), argv[optind]);
rc = CMD_RET_FAILURE;
}
+ optind++;
}
return rc;