From: Daniel Lezcano dlezcano@fr.ibm.com
Signed-off-by: Daniel Lezcano dlezcano@fr.ibm.com --- clocks.c | 6 +++--- display.c | 6 +++--- powerdebug.c | 50 ++++++++++++++++++++++++++------------------------ powerdebug.h | 10 ++++------ 4 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/clocks.c b/clocks.c index 4fe8093..2f1f2e6 100644 --- a/clocks.c +++ b/clocks.c @@ -21,7 +21,7 @@ static char clk_dir_path[PATH_MAX]; static char clk_name[NAME_MAX]; static int bold[MAX_LINES];
-int init_clock_details(bool dump) +int init_clock_details(bool dump, int selectedwindow) { char *path = debugfs_locate_mpoint(); struct stat buf; @@ -30,7 +30,7 @@ int init_clock_details(bool dump) strcpy(clk_dir_path, path); else { if (!dump) { - create_selectedwindow(); + create_selectedwindow(selectedwindow); sprintf(clock_lines[0], "Unable to locate debugfs " "mount point. Mount debugfs " "and try again..\n"); @@ -48,7 +48,7 @@ int init_clock_details(bool dump) //strcpy(clk_dir_path, "/debug/clock"); // Hardcoded for testing.. if (stat(clk_dir_path, &buf)) { if (!dump) { - create_selectedwindow(); + create_selectedwindow(selectedwindow); sprintf(clock_lines[0], "Unable to find clock tree" " information at %s.\n", clk_dir_path); print_one_clock(0, clock_lines[0], 1, 0); diff --git a/display.c b/display.c index fbdce80..dfd119a 100644 --- a/display.c +++ b/display.c @@ -90,7 +90,7 @@ void init_curses(void) }
-void create_windows(void) +void create_windows(int selectedwindow) {
getmaxyx(stdscr, maxy, maxx); @@ -115,7 +115,7 @@ void create_windows(void)
}
-void create_selectedwindow(void) +void create_selectedwindow(int selectedwindow) { WINDOW *win;
@@ -141,7 +141,7 @@ void create_selectedwindow(void) refresh(); }
-void show_header(void) +void show_header(int selectedwindow) { int i, j = 0;
diff --git a/powerdebug.c b/powerdebug.c index db19e16..64c8853 100644 --- a/powerdebug.c +++ b/powerdebug.c @@ -19,7 +19,6 @@ #include "powerdebug.h"
int highlighted_row; -int selectedwindow = -1;
void usage(void) { @@ -81,6 +80,7 @@ struct powerdebug_options { bool clocks; bool dump; unsigned int ticktime; + int selectedwindow; char *clkarg; };
@@ -90,6 +90,7 @@ int getoptions(int argc, char *argv[], struct powerdebug_options *options)
memset(options, 0, sizeof(*options)); options->ticktime = 10; + options->selectedwindow = -1;
while (1) { int optindex = 0; @@ -102,15 +103,15 @@ int getoptions(int argc, char *argv[], struct powerdebug_options *options) switch (c) { case 'r': options->regulators = true; - selectedwindow = REGULATOR; + options->selectedwindow = REGULATOR; break; case 's': options->sensors = true; - selectedwindow = SENSOR; + options->selectedwindow = SENSOR; break; case 'c': options->clocks = true; - selectedwindow = CLOCK; + options->selectedwindow = CLOCK; break; case 'p': options->findparent = true; @@ -152,8 +153,8 @@ int getoptions(int argc, char *argv[], struct powerdebug_options *options) return -1; }
- if (!options->dump && selectedwindow == -1) - selectedwindow = REGULATOR; + if (!options->dump && options->selectedwindow == -1) + options->selectedwindow = REGULATOR;
return 0; } @@ -164,24 +165,24 @@ int keystroke_callback(bool *enter_hit, bool *findparent_ncurses, { char keychar; int keystroke = getch(); - int oldselectedwin = selectedwindow; + int oldselectedwin = options->selectedwindow;
if (keystroke == EOF) exit(0);
if (keystroke == KEY_RIGHT || keystroke == 9) - selectedwindow++; + options->selectedwindow++;
if (keystroke == KEY_LEFT || keystroke == 353) - selectedwindow--; + options->selectedwindow--;
- if (selectedwindow >= TOTAL_FEATURE_WINS) - selectedwindow = 0; + if (options->selectedwindow >= TOTAL_FEATURE_WINS) + options->selectedwindow = 0;
- if (selectedwindow < 0) - selectedwindow = TOTAL_FEATURE_WINS - 1; + if (options->selectedwindow < 0) + options->selectedwindow = TOTAL_FEATURE_WINS - 1;
- if (selectedwindow == CLOCK) { + if (options->selectedwindow == CLOCK) { if (keystroke == KEY_DOWN) highlighted_row++; if (keystroke == KEY_UP && highlighted_row > 0) @@ -190,7 +191,7 @@ int keystroke_callback(bool *enter_hit, bool *findparent_ncurses, *findparent_ncurses = true;
if ((keystroke == 27 || oldselectedwin != - selectedwindow) && *findparent_ncurses) { + options->selectedwindow) && *findparent_ncurses) { *findparent_ncurses = false; clkname_str[0] = '\0'; } @@ -259,25 +260,26 @@ int mainloop(struct powerdebug_options *options) if (!options->dump) { if(firsttime[0]) init_curses(); - create_windows(); - show_header(); + create_windows(options->selectedwindow); + show_header(options->selectedwindow); }
- if (options->regulators || selectedwindow == REGULATOR) { + if (options->regulators || options->selectedwindow == REGULATOR) { read_regulator_info(); if (!options->dump) { - create_selectedwindow(); + create_selectedwindow(options->selectedwindow); show_regulator_info(options->verbose); } else print_regulator_info(options->verbose); }
- if (options->clocks || selectedwindow == CLOCK) { + if (options->clocks || options->selectedwindow == CLOCK) { int ret = 0; if (firsttime[CLOCK]) { - ret = init_clock_details(options->dump); + ret = init_clock_details(options->dump, + options->selectedwindow); if (!ret) firsttime[CLOCK] = 0; strcpy(clkname_str, ""); @@ -285,7 +287,7 @@ int mainloop(struct powerdebug_options *options) if (!ret && !options->dump) { int hrow;
- create_selectedwindow(); + create_selectedwindow(options->selectedwindow); if (!findparent_ncurses) { int command = 0;
@@ -312,9 +314,9 @@ int mainloop(struct powerdebug_options *options) } }
- if (options->sensors || selectedwindow == SENSOR) { + if (options->sensors || options->selectedwindow == SENSOR) { if (!options->dump) { - create_selectedwindow(); + create_selectedwindow(options->selectedwindow); print_sensor_header(); } else read_and_print_sensor_info(options->verbose); diff --git a/powerdebug.h b/powerdebug.h index f6358e0..44c1d63 100644 --- a/powerdebug.h +++ b/powerdebug.h @@ -31,8 +31,6 @@ enum {CLOCK_SELECTED = 1, REFRESH_WINDOW};
extern struct regulator_info *regulators_info;
-extern int selectedwindow; - extern int numregulators;
extern int init_regulator_ds(void); @@ -51,7 +49,7 @@ extern void find_parents_for_clock(char *clkname, int complete, bool dump); extern int read_and_print_clock_info(int verbose, int hrow, int selected); extern void print_clock_info(int verbose, int hrow, int selected); extern void print_string_val(char *name, char *val); -extern int init_clock_details(bool dump); +extern int init_clock_details(bool dump, int selectedwindow); extern void print_clock_header(void); extern void print_one_clock(int line, char *str, int bold, int highlight); extern char *debugfs_locate_mpoint(void); @@ -63,7 +61,7 @@ extern void print_sensor_header(void); extern void init_curses(void); extern void fini_curses(void); extern void killall_windows(int all); -extern void show_header(void); -extern void create_windows(void); -extern void create_selectedwindow(void); +extern void show_header(int selectedwindow); +extern void create_windows(int selectedwindow); +extern void create_selectedwindow(int selectedwindow); extern void show_regulator_info(int verbose);