2013-04-17 09:13:55 +00:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2013 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
|
|
|
|
*
|
|
|
|
* See file CREDITS for list of people who contributed to this
|
|
|
|
* project.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License version 2
|
|
|
|
* as published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <common.h>
|
|
|
|
#include <command.h>
|
|
|
|
#include <init.h>
|
|
|
|
#include <driver.h>
|
|
|
|
#include <malloc.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <fs.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <getopt.h>
|
|
|
|
#include <linux/stat.h>
|
|
|
|
#include <xfuncs.h>
|
|
|
|
|
|
|
|
static int do_mem_mm(int argc, char *argv[])
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
int fd;
|
|
|
|
char *filename = "/dev/mem";
|
|
|
|
int mode = O_RWSIZE_4;
|
|
|
|
loff_t adr;
|
|
|
|
int swab = 0;
|
|
|
|
u8 val8;
|
|
|
|
u16 val16;
|
|
|
|
u32 val32;
|
|
|
|
u32 value, mask;
|
|
|
|
|
|
|
|
if (mem_parse_options(argc, argv, "bwld:", &mode, NULL, &filename,
|
|
|
|
&swab) < 0)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
if (optind + 2 >= argc)
|
|
|
|
return COMMAND_ERROR_USAGE;
|
|
|
|
|
|
|
|
adr = strtoull_suffix(argv[optind++], NULL, 0);
|
|
|
|
value = simple_strtoul(argv[optind++], NULL, 0);
|
|
|
|
mask = simple_strtoul(argv[optind++], NULL, 0);
|
|
|
|
|
|
|
|
fd = open_and_lseek(filename, mode | O_RDWR, adr);
|
|
|
|
if (fd < 0)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
switch (mode) {
|
|
|
|
case O_RWSIZE_1:
|
|
|
|
ret = pread(fd, &val8, 1, adr);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out_read;
|
|
|
|
val8 &= ~mask;
|
|
|
|
val8 |= (value & mask);
|
|
|
|
ret = pwrite(fd, &val8, 1, adr);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out_write;
|
|
|
|
break;
|
|
|
|
case O_RWSIZE_2:
|
|
|
|
ret = pread(fd, &val16, 2, adr);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out_read;
|
|
|
|
val16 &= ~mask;
|
|
|
|
val16 |= (value & mask);
|
|
|
|
ret = pwrite(fd, &val16, 2, adr);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out_write;
|
|
|
|
break;
|
|
|
|
case O_RWSIZE_4:
|
|
|
|
if (ret < 0)
|
|
|
|
goto out_read;
|
|
|
|
ret = pread(fd, &val32, 4, adr);
|
|
|
|
val32 &= ~mask;
|
|
|
|
val32 |= (value & mask);
|
|
|
|
ret = pwrite(fd, &val32, 4, adr);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out_write;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
close(fd);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
out_read:
|
|
|
|
perror("read");
|
|
|
|
close(fd);
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
out_write:
|
|
|
|
perror("write");
|
|
|
|
close(fd);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
commands: harmonize in-barebox documentation
This patch does probably too much, but it's hard (and very
cumbersome/time consuming) to break it out. What is does is this:
* each command has one short description, e.g. "list MUX configuration"
* made sure the short descriptions start lowercase
* each command has one usage. That string contains just the
options, e.g. "[-npn]". It's not part of the long help text.
* that is, it doesn't say "[OPTIONS]" anymore, every usable option
is listed by character in this (short) option string (the long
description is in the long help text, as before)
* help texts have been reworked, to make them
- sometimes smaller
- sometimes describe the options better
- more often present themselves in a nicer format
* all long help texts are now created with BUSYBOX_CMD_HELP_
macros, no more 'static const __maybe_unused char cmd_foobar_help[]'
* made sure the long help texts starts uppercase
* because cmdtp->name and cmdtp->opts together provide the new usage,
all "Usage: foobar" texts have been removed from the long help texts
* BUSYBOX_CMD_HELP_TEXT() provides the trailing newline by itself, this
is nicer in the source code
* BUSYBOX_CMD_HELP_OPT() provides the trailing newline by itself
* made sure no line gets longer than 77 characters
* delibertely renamed cmdtp->usage, so that we can get compile-time
errors (e.g. in out-of-tree modules that use register_command()
* the 'help' command can now always emit the usage, even without
compiled long help texts
* 'help -v' gives a list of commands with their short description, this
is similar like the old "help" command before my patchset
* 'help -a' gives out help of all commands
Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-05-13 08:28:42 +00:00
|
|
|
BAREBOX_CMD_HELP_START(mm)
|
|
|
|
BAREBOX_CMD_HELP_TEXT("Set/clear bits specified with MASK in ADDR to VALUE")
|
|
|
|
BAREBOX_CMD_HELP_TEXT("")
|
|
|
|
BAREBOX_CMD_HELP_TEXT("Options:")
|
|
|
|
BAREBOX_CMD_HELP_OPT ("-b", "byte access")
|
|
|
|
BAREBOX_CMD_HELP_OPT ("-w", "word access (16 bit)")
|
|
|
|
BAREBOX_CMD_HELP_OPT ("-l", "long access (32 bit)")
|
|
|
|
BAREBOX_CMD_HELP_OPT ("-d FILE", "write file (default /dev/mem)")
|
|
|
|
BAREBOX_CMD_HELP_END
|
|
|
|
|
2013-04-17 09:13:55 +00:00
|
|
|
|
|
|
|
BAREBOX_CMD_START(mm)
|
|
|
|
.cmd = do_mem_mm,
|
commands: harmonize in-barebox documentation
This patch does probably too much, but it's hard (and very
cumbersome/time consuming) to break it out. What is does is this:
* each command has one short description, e.g. "list MUX configuration"
* made sure the short descriptions start lowercase
* each command has one usage. That string contains just the
options, e.g. "[-npn]". It's not part of the long help text.
* that is, it doesn't say "[OPTIONS]" anymore, every usable option
is listed by character in this (short) option string (the long
description is in the long help text, as before)
* help texts have been reworked, to make them
- sometimes smaller
- sometimes describe the options better
- more often present themselves in a nicer format
* all long help texts are now created with BUSYBOX_CMD_HELP_
macros, no more 'static const __maybe_unused char cmd_foobar_help[]'
* made sure the long help texts starts uppercase
* because cmdtp->name and cmdtp->opts together provide the new usage,
all "Usage: foobar" texts have been removed from the long help texts
* BUSYBOX_CMD_HELP_TEXT() provides the trailing newline by itself, this
is nicer in the source code
* BUSYBOX_CMD_HELP_OPT() provides the trailing newline by itself
* made sure no line gets longer than 77 characters
* delibertely renamed cmdtp->usage, so that we can get compile-time
errors (e.g. in out-of-tree modules that use register_command()
* the 'help' command can now always emit the usage, even without
compiled long help texts
* 'help -v' gives a list of commands with their short description, this
is similar like the old "help" command before my patchset
* 'help -a' gives out help of all commands
Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-05-13 08:28:42 +00:00
|
|
|
BAREBOX_CMD_DESC("memory modify with mask")
|
|
|
|
BAREBOX_CMD_OPTS("[-bwld] ADDR VAL MASK")
|
commands: group 'help' output
The old output of "help" was just producing a long list, that usually
scrolled of the screen (even on a X11 terminal). This list is more
compact, and also sorted by groups.
The old output format (plus grouping) is now available with 'help -v'.
Example:
Information commands:
?, devinfo, help, iomem, meminfo, version
Boot commands:
boot, bootm, go, loadb, loads, loadx, loady, saves, uimage
...
Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-05-13 14:14:05 +00:00
|
|
|
BAREBOX_CMD_GROUP(CMD_GRP_MEM)
|
2013-04-17 09:13:55 +00:00
|
|
|
BAREBOX_CMD_HELP(cmd_mm_help)
|
|
|
|
BAREBOX_CMD_END
|