ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-20 17:52:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

omap4 fb_drv: remove use of deprecated API

Browse Source 
Issue #1987
This commit is contained in:
Norman Feske 2019-02-15 14:16:47 +01:00
parent cf70f65bec
commit 630cb96a54
2 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
repos/os/src/drivers/framebuffer/spec/omap4/driver.h
View File

@ -250,11 +250,13 @@ bool Framebuffer::Driver::_init_hdmi(Framebuffer::addr_t phys_base)
_dispc.write<Dispc::Control1::Tv_enable>(1);
_dispc.write<Dispc::Control1::Go_tv>(1);
if (!_dispc.wait_for<Dispc::Control1::Go_tv>(Dispc::Control1::Go_tv::HW_UPDATE_DONE, _delayer)) {
try {
_dispc.wait_for(_delayer, Dispc::Control1::Go_tv::Equal(Dispc::Control1::Go_tv::HW_UPDATE_DONE));
}
catch (Dispc::Polling_timeout) {
error("Go_tv timed out");
return false;
}
return true;
}

48
repos/os/src/drivers/framebuffer/spec/omap4/hdmi.h
View File

@ -77,14 +77,28 @@ struct Hdmi : Genode::Mmio
{
write<Pwr_ctrl::Pll_cmd>(cmd);
return wait_for<Pwr_ctrl::Pll_status>(cmd, delayer);
try {
wait_for(delayer, Pwr_ctrl::Pll_status::Equal(cmd));
}
catch (Polling_timeout) {
Genode::error("Pwr_ctrl::Pll_cmd failed");
return false;
}
return true;
}
bool issue_pwr_phy_command(Pwr_ctrl::Phy_cmd_type cmd, Delayer &delayer)
{
write<Pwr_ctrl::Phy_cmd>(cmd);
return wait_for<Pwr_ctrl::Phy_status>(cmd, delayer);
try {
wait_for(delayer, Pwr_ctrl::Phy_status::Equal(cmd));
}
catch (Polling_timeout) {
Genode::error("unexpected Pwr_ctrl::Phy_status");
return false;
}
return true;
}
struct Pll_control : Register<0x200, 32>
@ -105,8 +119,15 @@ struct Hdmi : Genode::Mmio
bool wait_until_pll_locked(Delayer &delayer)
{
return wait_for<Pll_status::Pll_locked>(1, delayer);
};
try {
wait_for(delayer, Pll_status::Pll_locked::Equal(1));
}
catch (Polling_timeout) {
Genode::error("Pll_locked::Pll_locked unexpectedly not set");
return false;
}
return true;
}
struct Pll_go : Register<0x208, 32>
{
@ -118,8 +139,14 @@ struct Hdmi : Genode::Mmio
write<Pll_go::Go>(1);
/* wait for PLL_GO bit change and the PLL reaching locked state */
return wait_for<Pll_go::Go>(1, delayer)
&& wait_until_pll_locked(delayer);
try {
wait_for(delayer, Pll_go::Go::Equal(1));
}
catch (Polling_timeout) {
Genode::error("Pll_go::Go unexpectedly not set");
return false;
}
return wait_until_pll_locked(delayer);
}
struct Cfg1 : Register<0x20c, 32>
@ -147,7 +174,14 @@ struct Hdmi : Genode::Mmio
{
write<Pll_control::Reset>(0);
return wait_for<Pll_status::Reset_done>(1, delayer);
try {
wait_for(delayer, Pll_status::Reset_done::Equal(1));
}
catch (Polling_timeout) {
Genode::error("Pll_status::Reset_done unexpectedly not set");
return false;
}
return true;
};
struct Txphy_tx_ctrl : Register<0x300, 32>