mirror of
https://github.com/genodelabs/genode.git
synced 2025-04-07 19:34:56 +00:00
Use cpu regulator in cli_monitor only on Arndale
This commit splits the Fiasco.OC-specific extension for the cli_monitor into one for the Arndale platform, and one for all others. On Arndale we add the cpu_frequency command beside the ones defined on all platforms.
This commit is contained in:
Stefan Kalkowski
parent
9f2097669a
commit
664d0036c8
@ -1,4 +1 @@
|
||||
SRC_CC = extension.cc
|
||||
INC_DIR += $(REP_DIR)/src/app/cli_monitor
|
||||
|
||||
vpath extension.cc $(REP_DIR)/src/app/cli_monitor/foc
|
||||
LIBS += foc_cli_monitor
|
||||
6
os/lib/mk/foc_cli_monitor.mk
Normal file
6
os/lib/mk/foc_cli_monitor.mk
Normal file
@ -0,0 +1,6 @@
|
||||
SRC_CC = extension.cc
|
||||
REQUIRES = foc
|
||||
INC_DIR += $(REP_DIR)/src/app/cli_monitor \
|
||||
$(REP_DIR)/src/app/cli_monitor/foc
|
||||
|
||||
vpath extension.cc $(REP_DIR)/src/app/cli_monitor/foc
|
||||
6
os/lib/mk/platform_arndale/foc_cli_monitor.mk
Normal file
6
os/lib/mk/platform_arndale/foc_cli_monitor.mk
Normal file
@ -0,0 +1,6 @@
|
||||
SRC_CC = extension.cc
|
||||
REQUIRES = foc_arndale
|
||||
INC_DIR += $(REP_DIR)/src/app/cli_monitor \
|
||||
$(REP_DIR)/src/app/cli_monitor/foc
|
||||
|
||||
vpath extension.cc $(REP_DIR)/src/app/cli_monitor/foc/arndale
|
||||
61
os/src/app/cli_monitor/foc/arndale/extension.cc
Normal file
61
os/src/app/cli_monitor/foc/arndale/extension.cc
Normal file
@ -0,0 +1,61 @@
|
||||
/*
|
||||
* \brief Fiasco.OC on Arndale specific CLI-monitor extensions
|
||||
* \author Norman Feske
|
||||
* \author Stefan Kalkowski
|
||||
* \date 2013-03-18
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (C) 2013 Genode Labs GmbH
|
||||
*
|
||||
* This file is part of the Genode OS framework, which is distributed
|
||||
* under the terms of the GNU General Public License version 2.
|
||||
*/
|
||||
|
||||
/* Genode includes */
|
||||
#include <regulator_session/connection.h>
|
||||
#include <util/string.h>
|
||||
|
||||
/* local includes */
|
||||
#include <common.h>
|
||||
|
||||
struct Cpufreq_command : Command
|
||||
{
|
||||
Regulator::Connection ®ulator;
|
||||
|
||||
Cpufreq_command(Regulator::Connection &r)
|
||||
: Command("cpu_frequency", "set/show CPU frequency"),
|
||||
regulator(r) { }
|
||||
|
||||
void execute(Command_line &cmd, Terminal::Session &terminal)
|
||||
{
|
||||
char freq[128];
|
||||
freq[0] = 0;
|
||||
if (cmd.argument(0, freq, sizeof(freq)) == false) {
|
||||
tprintf(terminal, "Current CPU frequency: %ld Hz\n",
|
||||
regulator.level());
|
||||
return;
|
||||
}
|
||||
|
||||
unsigned long f = 0;
|
||||
Genode::ascii_to(freq, &f, 10);
|
||||
tprintf(terminal, "set frequency to %ld Hz\n", f);
|
||||
regulator.level(f);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
void init_extension(Command_registry &commands)
|
||||
{
|
||||
try { /* only inserts commands if route to regulator session exists */
|
||||
static Regulator::Connection reg(Regulator::CLK_CPU);
|
||||
static Cpufreq_command cpufreq_command(reg);
|
||||
commands.insert(&cpufreq_command);
|
||||
} catch (...) { PDBG("No regulator session available!"); };
|
||||
|
||||
static Kdebug_command kdebug_command;
|
||||
commands.insert(&kdebug_command);
|
||||
|
||||
static Reboot_command reboot_command;
|
||||
commands.insert(&reboot_command);
|
||||
}
|
||||
70
os/src/app/cli_monitor/foc/common.h
Normal file
70
os/src/app/cli_monitor/foc/common.h
Normal file
@ -0,0 +1,70 @@
|
||||
/*
|
||||
* \brief Fiasco.OC-specific CLI-monitor extensions
|
||||
* \author Norman Feske
|
||||
* \date 2013-03-18
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (C) 2013 Genode Labs GmbH
|
||||
*
|
||||
* This file is part of the Genode OS framework, which is distributed
|
||||
* under the terms of the GNU General Public License version 2.
|
||||
*/
|
||||
|
||||
#ifndef _SRC__APP_CLI_MONITOR__FOC__COMMON_H_
|
||||
#define _SRC__APP_CLI_MONITOR__FOC__COMMON_H_
|
||||
|
||||
/* local includes */
|
||||
#include <extension.h>
|
||||
#include <terminal_util.h>
|
||||
#include <command_line.h>
|
||||
|
||||
/* Fiasco includes */
|
||||
namespace Fiasco {
|
||||
#include <l4/sys/kdebug.h>
|
||||
#include <l4/sys/ipc.h>
|
||||
}
|
||||
|
||||
|
||||
static void clear_host_terminal()
|
||||
{
|
||||
using namespace Fiasco;
|
||||
|
||||
outstring("\e[99S"); /* scroll up */
|
||||
outstring("\e[99T"); /* scroll down */
|
||||
outstring("\e[199A"); /* move cursor up */
|
||||
}
|
||||
|
||||
|
||||
struct Kdebug_command : Command
|
||||
{
|
||||
Kdebug_command() : Command("kdebug", "enter kernel debugger (via serial console)") { }
|
||||
|
||||
void execute(Command_line &, Terminal::Session &terminal)
|
||||
{
|
||||
using namespace Fiasco;
|
||||
|
||||
/* let kernel debugger detect the screen size */
|
||||
enter_kdebug("*#JS");
|
||||
|
||||
clear_host_terminal();
|
||||
enter_kdebug("Entering kernel debugger... Press [?] for help");
|
||||
clear_host_terminal();
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
struct Reboot_command : Command
|
||||
{
|
||||
Reboot_command() : Command("reboot", "reboot machine") { }
|
||||
|
||||
void execute(Command_line &, Terminal::Session &terminal)
|
||||
{
|
||||
using namespace Fiasco;
|
||||
|
||||
clear_host_terminal();
|
||||
enter_kdebug("*#^");
|
||||
}
|
||||
};
|
||||
|
||||
#endif /* _SRC__APP_CLI_MONITOR__FOC__COMMON_H_ */
|
||||
@ -11,98 +11,12 @@
|
||||
* under the terms of the GNU General Public License version 2.
|
||||
*/
|
||||
|
||||
/* Genode includes */
|
||||
#include <regulator_session/connection.h>
|
||||
#include <util/string.h>
|
||||
|
||||
/* local includes */
|
||||
#include <extension.h>
|
||||
#include <terminal_util.h>
|
||||
#include <command_line.h>
|
||||
|
||||
/* Fiasco includes */
|
||||
namespace Fiasco {
|
||||
#include <l4/sys/kdebug.h>
|
||||
#include <l4/sys/ipc.h>
|
||||
}
|
||||
|
||||
|
||||
static void clear_host_terminal()
|
||||
{
|
||||
using namespace Fiasco;
|
||||
|
||||
outstring("\e[99S"); /* scroll up */
|
||||
outstring("\e[99T"); /* scroll down */
|
||||
outstring("\e[199A"); /* move cursor up */
|
||||
}
|
||||
|
||||
|
||||
struct Kdebug_command : Command
|
||||
{
|
||||
Kdebug_command() : Command("kdebug", "enter kernel debugger (via serial console)") { }
|
||||
|
||||
void execute(Command_line &, Terminal::Session &terminal)
|
||||
{
|
||||
using namespace Fiasco;
|
||||
|
||||
/* let kernel debugger detect the screen size */
|
||||
enter_kdebug("*#JS");
|
||||
|
||||
clear_host_terminal();
|
||||
enter_kdebug("Entering kernel debugger... Press [?] for help");
|
||||
clear_host_terminal();
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
struct Reboot_command : Command
|
||||
{
|
||||
Reboot_command() : Command("reboot", "reboot machine") { }
|
||||
|
||||
void execute(Command_line &, Terminal::Session &terminal)
|
||||
{
|
||||
using namespace Fiasco;
|
||||
|
||||
clear_host_terminal();
|
||||
enter_kdebug("*#^");
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
struct Cpufreq_command : Command
|
||||
{
|
||||
Regulator::Connection ®ulator;
|
||||
|
||||
Cpufreq_command(Regulator::Connection &r)
|
||||
: Command("cpu_frequency", "set/show CPU frequency"),
|
||||
regulator(r) { }
|
||||
|
||||
void execute(Command_line &cmd, Terminal::Session &terminal)
|
||||
{
|
||||
char freq[128];
|
||||
freq[0] = 0;
|
||||
if (cmd.argument(0, freq, sizeof(freq)) == false) {
|
||||
tprintf(terminal, "Current CPU frequency: %ld Hz\n",
|
||||
regulator.level());
|
||||
return;
|
||||
}
|
||||
|
||||
unsigned long f = 0;
|
||||
Genode::ascii_to(freq, &f, 10);
|
||||
tprintf(terminal, "set frequency to %ld Hz\n", f);
|
||||
regulator.level(f);
|
||||
}
|
||||
};
|
||||
#include <common.h>
|
||||
|
||||
|
||||
void init_extension(Command_registry &commands)
|
||||
{
|
||||
try { /* only inserts commands if route to regulator session exists */
|
||||
static Regulator::Connection reg(Regulator::CLK_CPU);
|
||||
static Cpufreq_command cpufreq_command(reg);
|
||||
commands.insert(&cpufreq_command);
|
||||
} catch (...) { PDBG("No regulator session available!"); };
|
||||
|
||||
static Kdebug_command kdebug_command;
|
||||
commands.insert(&kdebug_command);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user