ehmry/genode
ehmry/genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regulator: add missing inline and static constexpr

Browse Source 
The exynos5/consts header defined global symbols. If included by
multiple compilation units, this lead to multiple-definition errors.

Ref #2206
This commit is contained in:
Martin Stein 2017-01-04 15:25:21 +01:00 committed by Norman Feske
parent a9eecc1a2d
commit 8c1e2f0555
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
repos/os/include/spec/exynos5/regulator/consts.h
View File

@ -38,7 +38,7 @@ namespace Regulator {
const char * name;
};
Regulator_name names[] = {
static constexpr Regulator_name names[] = {
{ CLK_CPU, "clock-cpu" },
{ CLK_SATA, "clock-sata" },
{ CLK_USB30, "clock-usb3.0" },
@ -51,7 +51,7 @@ namespace Regulator {
{ PWR_HDMI, "power-hdmi"},
};
Regulator_id regulator_id_by_name(const char * name)
inline Regulator_id regulator_id_by_name(const char * name)
{
for (unsigned i = 0; i < sizeof(names)/sizeof(names[0]); i++)
if (Genode::strcmp(names[i].name, name) == 0)
@ -59,7 +59,7 @@ namespace Regulator {
return INVALID;
}
const char * regulator_name_by_id(Regulator_id id) {
inline const char * regulator_name_by_id(Regulator_id id) {
return (id < sizeof(names)/sizeof(names[0])) ? names[id].name : 0; }