diff options
Diffstat (limited to 'common')
-rwxr-xr-x | common/Makefile | 2 | ||||
-rw-r--r-- | common/boottime.c | 83 | ||||
-rw-r--r-- | common/main.c | 5 |
3 files changed, 89 insertions, 1 deletions
diff --git a/common/Makefile b/common/Makefile index 557d9a197..de594b4a1 100755 --- a/common/Makefile +++ b/common/Makefile @@ -165,7 +165,7 @@ COBJS-$(CONFIG_LYNXKDI) += lynxkdi.o COBJS-$(CONFIG_MODEM_SUPPORT) += modem.o COBJS-$(CONFIG_UPDATE_TFTP) += update.o COBJS-$(CONFIG_USB_KEYBOARD) += usb_kbd.o - +COBJS-$(CONFIG_BOOTTIME) += boottime.o COBJS := $(sort $(COBJS-y)) SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/common/boottime.c b/common/boottime.c new file mode 100644 index 000000000..8aa29a643 --- /dev/null +++ b/common/boottime.c @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2009-2010 ST-Ericsson AB + * Jonas Aaberg <jonas.aberg@stericsson.com> + * + * This program 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 2 of the License, or + * (at your option) any later version. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + + +#include <common.h> +#include <boottime.h> +#include <asm/byteorder.h> +#include <asm/setup.h> + +static struct tag_boottime boottime = { + .idle = 0, + .total = 0, +}; + +int boottime_tag(char *name) +{ + if (boottime.num == BOOTTIME_MAX) { + printf("boottime: out of entries!\n"); + return -1; + } + + strncpy((char *)boottime.entry[boottime.num].name, + name, + BOOTTIME_MAX_NAME_LEN); + boottime.entry[boottime.num].name[BOOTTIME_MAX_NAME_LEN - 1] = '\0'; + boottime.entry[boottime.num].time = get_timer_us(); + + boottime.num++; + return 0; +} + + +struct boottime_entry *boottime_get_entry(unsigned int i) +{ + if (i >= boottime.num) + return NULL; + else + return &boottime.entry[i]; +} + + +void boottime_idle_add(unsigned long time) +{ + boottime.idle += time; +} + +unsigned long boottime_idle_done(void) +{ + return get_timer_us(); +} + +unsigned long boottime_idle_get(void) +{ + return boottime.idle; +} + +void boottime_remove_last(void) +{ + if (boottime.num > 0) + boottime.num--; +} + + + + + diff --git a/common/main.c b/common/main.c index 10d890417..88e7fd2e9 100644 --- a/common/main.c +++ b/common/main.c @@ -38,6 +38,7 @@ #include <hush.h> #endif +#include <boottime.h> #include <post.h> #if defined(CONFIG_SILENT_CONSOLE) || defined(CONFIG_POST) || defined(CONFIG_CMDLINE_EDITING) @@ -215,6 +216,10 @@ static __inline__ int abortboot(int bootdelay) { int abort = 0; +#ifdef CONFIG_BOOTTIME + boottime_tag("autoboot_delay"); +#endif + #ifdef CONFIG_MENUPROMPT printf(CONFIG_MENUPROMPT); #else |