summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-09-12 07:53:05 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-09-12 07:53:05 +0200
commit9b1102c02bfd39352e0d2995c733edb7be3b0601 (patch)
tree3f089c640bab75c020b69f5dcf44d744a0a7f2e4 /commands
parentf48a1596f4e911d4516b986e4778f18321b39b48 (diff)
parenta10dbfc4175867c0d15f02b7f244837c5d41478e (diff)
downloadbarebox-9b1102c02bfd39352e0d2995c733edb7be3b0601.tar.gz
Merge branch 'for-next/misc'
Diffstat (limited to 'commands')
-rw-r--r--commands/edit.c10
-rw-r--r--commands/mmc_extcsd.c11
2 files changed, 14 insertions, 7 deletions
diff --git a/commands/edit.c b/commands/edit.c
index 290222c..ba6a8c7 100644
--- a/commands/edit.c
+++ b/commands/edit.c
@@ -524,12 +524,12 @@ static int do_edit(int argc, char *argv[])
} else
delete_char(textx);
break;
- case 13:
- case 10:
+ case '\r':
+ case '\n':
split_line();
break;
case 127:
- case 8:
+ case '\b':
if (textx > 0) {
textx--;
delete_char(textx);
@@ -542,10 +542,10 @@ static int do_edit(int argc, char *argv[])
merge_line(curline);
}
break;
- case 4:
+ case CTL_CH('d'):
ret = save_file(argv[1]);
goto out;
- case 3:
+ case CTL_CH('c'):
goto out;
default:
if ((signed char)c != -1)
diff --git a/commands/mmc_extcsd.c b/commands/mmc_extcsd.c
index c27bb72..ad8e9ad 100644
--- a/commands/mmc_extcsd.c
+++ b/commands/mmc_extcsd.c
@@ -222,8 +222,8 @@ static struct extcsd_reg extcsd[] = {
.access = ACC_R,
.width = 2,
},
- [EXT_CSD_EXCEPTION_EVENTS_STATUS] = {
- .name = "EXT_CSD_EXCEPTION_EVENTS_STATUS",
+ [EXT_CSD_EXCEPTION_DYNCAP_NEEDED] = {
+ .name = "EXT_CSD_EXCEPTION_DYNCAP_NEEDED",
.access = ACC_R,
.width = 1,
},
@@ -1833,6 +1833,13 @@ static int print_field(u8 *reg, int index)
printf("\t[4] EXTENDED_SECURITY_FAILURE: %i\n", val);
return 1;
+ case EXT_CSD_EXCEPTION_DYNCAP_NEEDED:
+ if (get_field_val(EXT_CSD_EXCEPTION_EVENTS_STATUS, 2, 0x1)) {
+ val = get_field_val(EXT_CSD_EXCEPTION_DYNCAP_NEEDED, 0, 0x1);
+ printf("\t[0] DYNCAP_NEEDED: %i\n", val);
+ }
+ return 1;
+
case EXT_CSD_EXCEPTION_EVENTS_CTRL:
val = get_field_val(EXT_CSD_EXCEPTION_EVENTS_CTRL, 1, 0x1);
printf("\t[1] DYNCAP_EVENT_EN: %i\n", val);