2008-02-09 Robert Millan <rmh@aybabtu.com>
* commands/sleep.c: New file.
* conf/common.rmk (pkglib_MODULES): Add `commands/sleep.c'.
(sleep_mod_SOURCES): New variable.
(sleep_mod_CFLAGS): Likewise.
(sleep_mod_LDFLAGS): Likewise.
This commit is contained in:
robertmh
parent
7a634e08cb
commit
3dac2e3fdd
5 changed files with 178 additions and 2 deletions
|
|
@ -1,3 +1,11 @@
|
|||
2008-02-09 Robert Millan <rmh@aybabtu.com>
|
||||
|
||||
* commands/sleep.c: New file.
|
||||
* conf/common.rmk (pkglib_MODULES): Add `commands/sleep.c'.
|
||||
(sleep_mod_SOURCES): New variable.
|
||||
(sleep_mod_CFLAGS): Likewise.
|
||||
(sleep_mod_LDFLAGS): Likewise.
|
||||
|
||||
2008-02-09 Robert Millan <rmh@aybabtu.com>
|
||||
|
||||
* disk/raid.c (grub_raid_scan_device): Add a pair of sanity checks for
|
||||
|
|
|
|||
1
DISTLIST
1
DISTLIST
|
|
@ -46,6 +46,7 @@ commands/ls.c
|
|||
commands/lspci.c
|
||||
commands/read.c
|
||||
commands/search.c
|
||||
commands/sleep.c
|
||||
commands/terminal.c
|
||||
commands/test.c
|
||||
commands/videotest.c
|
||||
|
|
|
|||
110
commands/sleep.c
Normal file
110
commands/sleep.c
Normal file
|
|
@ -0,0 +1,110 @@
|
|||
/* sleep.c - Command to wait a specified number of seconds. */
|
||||
/*
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
|
||||
*
|
||||
* GRUB is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* GRUB 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.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <grub/dl.h>
|
||||
#include <grub/term.h>
|
||||
#include <grub/types.h>
|
||||
#include <grub/misc.h>
|
||||
#include <grub/normal.h>
|
||||
#include <grub/machine/time.h>
|
||||
|
||||
static const struct grub_arg_option options[] =
|
||||
{
|
||||
{"verbose", 'v', 0, "verbose countdown", 0, 0},
|
||||
{"interruptible", 'i', 0, "interruptible with ESC", 0, 0},
|
||||
{0, 0, 0, 0, 0, 0}
|
||||
};
|
||||
|
||||
static grub_uint8_t x, y;
|
||||
|
||||
static void
|
||||
do_print (int n)
|
||||
{
|
||||
grub_gotoxy (x, y);
|
||||
/* NOTE: Do not remove the trailing space characters.
|
||||
They are required to clear the line. */
|
||||
grub_printf ("%d ", n);
|
||||
}
|
||||
|
||||
/* Based on grub_millisleep() from kern/misc.c. */
|
||||
static int
|
||||
grub_interruptible_millisleep (grub_uint32_t ms)
|
||||
{
|
||||
grub_uint32_t end_at;
|
||||
|
||||
end_at = grub_get_rtc () + grub_div_roundup (ms * GRUB_TICKS_PER_SECOND, 1000);
|
||||
|
||||
while (grub_get_rtc () < end_at)
|
||||
if (GRUB_TERM_ASCII_CHAR (grub_checkkey ()) == GRUB_TERM_ESC)
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static grub_err_t
|
||||
grub_cmd_sleep (struct grub_arg_list *state, int argc, char **args)
|
||||
{
|
||||
grub_uint16_t xy;
|
||||
int n;
|
||||
|
||||
if (argc != 1)
|
||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "missing operand");
|
||||
|
||||
n = grub_strtoul (args[0], 0, 10);
|
||||
|
||||
if (n == 0)
|
||||
{
|
||||
/* Either `0' or broken input. */
|
||||
return 0;
|
||||
}
|
||||
|
||||
xy = grub_getxy ();
|
||||
x = xy >> 8;
|
||||
y = xy & 0xff;
|
||||
|
||||
for (; n; n--)
|
||||
{
|
||||
if (state[0].set)
|
||||
do_print (n);
|
||||
|
||||
if (state[1].set)
|
||||
{
|
||||
if (grub_interruptible_millisleep (1000))
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
grub_millisleep (1000);
|
||||
}
|
||||
if (state[0].set)
|
||||
do_print (0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
GRUB_MOD_INIT(sleep)
|
||||
{
|
||||
grub_register_command ("sleep", grub_cmd_sleep, GRUB_COMMAND_FLAG_BOTH,
|
||||
"sleep NUMBER_OF_SECONDS", "Wait for a specified number of seconds", options);
|
||||
}
|
||||
|
||||
GRUB_MOD_FINI(sleep)
|
||||
{
|
||||
grub_unregister_command ("sleep");
|
||||
}
|
||||
|
|
@ -1709,7 +1709,7 @@ pkglib_MODULES += hello.mod boot.mod terminal.mod ls.mod \
|
|||
cmp.mod cat.mod help.mod font.mod search.mod \
|
||||
loopback.mod configfile.mod echo.mod \
|
||||
terminfo.mod test.mod blocklist.mod hexdump.mod \
|
||||
read.mod
|
||||
read.mod sleep.mod
|
||||
|
||||
# For hello.mod.
|
||||
hello_mod_SOURCES = hello/hello.c
|
||||
|
|
@ -2716,3 +2716,55 @@ fs-read_mod-commands_read.lst: commands/read.c $(commands/read.c_DEPENDENCIES) g
|
|||
|
||||
read_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
read_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
# For sleep.mod.
|
||||
sleep_mod_SOURCES = commands/sleep.c
|
||||
CLEANFILES += sleep.mod mod-sleep.o mod-sleep.c pre-sleep.o sleep_mod-commands_sleep.o und-sleep.lst
|
||||
ifneq ($(sleep_mod_EXPORTS),no)
|
||||
CLEANFILES += def-sleep.lst
|
||||
DEFSYMFILES += def-sleep.lst
|
||||
endif
|
||||
MOSTLYCLEANFILES += sleep_mod-commands_sleep.d
|
||||
UNDSYMFILES += und-sleep.lst
|
||||
|
||||
sleep.mod: pre-sleep.o mod-sleep.o
|
||||
-rm -f $@
|
||||
$(TARGET_CC) $(sleep_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ $^
|
||||
$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -R .note -R .comment $@
|
||||
|
||||
pre-sleep.o: $(sleep_mod_DEPENDENCIES) sleep_mod-commands_sleep.o
|
||||
-rm -f $@
|
||||
$(TARGET_CC) $(sleep_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ sleep_mod-commands_sleep.o
|
||||
|
||||
mod-sleep.o: mod-sleep.c
|
||||
$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(sleep_mod_CFLAGS) -c -o $@ $<
|
||||
|
||||
mod-sleep.c: moddep.lst genmodsrc.sh
|
||||
sh $(srcdir)/genmodsrc.sh 'sleep' $< > $@ || (rm -f $@; exit 1)
|
||||
|
||||
ifneq ($(sleep_mod_EXPORTS),no)
|
||||
def-sleep.lst: pre-sleep.o
|
||||
$(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 sleep/' > $@
|
||||
endif
|
||||
|
||||
und-sleep.lst: pre-sleep.o
|
||||
echo 'sleep' > $@
|
||||
$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
|
||||
|
||||
sleep_mod-commands_sleep.o: commands/sleep.c $(commands/sleep.c_DEPENDENCIES)
|
||||
$(TARGET_CC) -Icommands -I$(srcdir)/commands $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(sleep_mod_CFLAGS) -MD -c -o $@ $<
|
||||
-include sleep_mod-commands_sleep.d
|
||||
|
||||
CLEANFILES += cmd-sleep_mod-commands_sleep.lst fs-sleep_mod-commands_sleep.lst
|
||||
COMMANDFILES += cmd-sleep_mod-commands_sleep.lst
|
||||
FSFILES += fs-sleep_mod-commands_sleep.lst
|
||||
|
||||
cmd-sleep_mod-commands_sleep.lst: commands/sleep.c $(commands/sleep.c_DEPENDENCIES) gencmdlist.sh
|
||||
set -e; $(TARGET_CC) -Icommands -I$(srcdir)/commands $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(sleep_mod_CFLAGS) -E $< | sh $(srcdir)/gencmdlist.sh sleep > $@ || (rm -f $@; exit 1)
|
||||
|
||||
fs-sleep_mod-commands_sleep.lst: commands/sleep.c $(commands/sleep.c_DEPENDENCIES) genfslist.sh
|
||||
set -e; $(TARGET_CC) -Icommands -I$(srcdir)/commands $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(sleep_mod_CFLAGS) -E $< | sh $(srcdir)/genfslist.sh sleep > $@ || (rm -f $@; exit 1)
|
||||
|
||||
|
||||
sleep_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
sleep_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ pkglib_MODULES += hello.mod boot.mod terminal.mod ls.mod \
|
|||
cmp.mod cat.mod help.mod font.mod search.mod \
|
||||
loopback.mod configfile.mod echo.mod \
|
||||
terminfo.mod test.mod blocklist.mod hexdump.mod \
|
||||
read.mod
|
||||
read.mod sleep.mod
|
||||
|
||||
# For hello.mod.
|
||||
hello_mod_SOURCES = hello/hello.c
|
||||
|
|
@ -364,3 +364,8 @@ gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|||
read_mod_SOURCES = commands/read.c
|
||||
read_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
read_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
||||
# For sleep.mod.
|
||||
sleep_mod_SOURCES = commands/sleep.c
|
||||
sleep_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||
sleep_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue