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

rtc_drv: API transition (fix 'deprecated' warnings)

Browse Source 
Issue #1987
This commit is contained in:
Christian Prochaska 2017-01-13 13:10:47 +01:00 committed by Norman Feske
parent c16ee836cf
commit 60aebe3005
4 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
repos/os/src/drivers/rtc/spec/x86/linux.cc
View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (C) 2015 Genode Labs GmbH
* Copyright (C) 2015-2017 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.
@ -17,7 +17,7 @@
#include "rtc.h"
Rtc::Timestamp Rtc::get_time(void)
Rtc::Timestamp Rtc::get_time(Env &)
{
Timestamp ts { 0 };

24
repos/os/src/drivers/rtc/spec/x86/main.cc
View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (C) 2015 Genode Labs GmbH
* Copyright (C) 2015-2017 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.
@ -15,7 +15,6 @@
#include <base/component.h>
#include <base/heap.h>
#include <root/component.h>
#include <rtc_session/rtc_session.h>
#include "rtc.h"
@ -31,32 +30,41 @@ namespace Rtc {
struct Rtc::Session_component : public Genode::Rpc_object<Session>
{
Env &_env;
Timestamp current_time() override
{
Timestamp ret = Rtc::get_time();
Timestamp ret = Rtc::get_time(_env);
return ret;
}
Session_component(Env &env) : _env(env) { }
};
class Rtc::Root : public Genode::Root_component<Session_component>
{
private:
Env &_env;
protected:
Session_component *_create_session(const char *args)
{
return new (md_alloc()) Session_component();
return new (md_alloc()) Session_component(_env);
}
public:
Root(Entrypoint &ep, Allocator &md_alloc)
Root(Env &env, Allocator &md_alloc)
:
Genode::Root_component<Session_component>(&ep.rpc_ep(), &md_alloc)
Genode::Root_component<Session_component>(&env.ep().rpc_ep(), &md_alloc),
_env(env)
{
/* trigger initial RTC read */
Rtc::get_time();
Rtc::get_time(_env);
}
};
@ -67,7 +75,7 @@ struct Rtc::Main
Sliced_heap sliced_heap { env.ram(), env.rm() };
Root root { env.ep(), sliced_heap };
Root root { env, sliced_heap };
Main(Env &env) : env(env) { env.parent().announce(env.ep().manage(root)); }
};

53
repos/os/src/drivers/rtc/spec/x86/rtc.cc
View File

@ -6,7 +6,7 @@
*/
/*
* Copyright (C) 2007-2015 Genode Labs GmbH
* Copyright (C) 2007-2017 Genode Labs GmbH
* Copyright (C) 2012 Intel Corporation
*
* This file is part of the Genode OS framework, which is distributed
@ -14,13 +14,6 @@
*/
/* Genode */
#include <base/env.h>
#include <base/sleep.h>
#include <base/rpc_server.h>
#include <root/component.h>
#include <cap_session/connection.h>
#include <rtc_session/rtc_session.h>
#include <base/printf.h>
#include <io_port_session/connection.h>
#include "rtc.h"
@ -73,23 +66,12 @@ enum RTC
};
/*
* Our RTC port session
*/
static Io_port_connection & rtc_ports()
{
static Io_port_connection inst(RTC_PORT_BASE, RTC_PORT_SIZE);
return inst;
}
static inline unsigned cmos_read(unsigned char addr)
static inline unsigned cmos_read(Io_port_connection &rtc_ports, unsigned char addr)
{
unsigned char val;
rtc_ports().outb(RTC_PORT_ADDR, addr);
rtc_ports.outb(RTC_PORT_ADDR, addr);
// iodelay();
val = rtc_ports().inb(RTC_PORT_DATA);
val = rtc_ports.inb(RTC_PORT_DATA);
// iodelay();
return val;
}
@ -100,8 +82,13 @@ static inline unsigned cmos_read(unsigned char addr)
#define BIN_TO_BCD(val) ((val) = (((val)/10) << 4) + (val) % 10)
Rtc::Timestamp Rtc::get_time(void)
Rtc::Timestamp Rtc::get_time(Env &env)
{
/*
* Our RTC port session
*/
static Io_port_connection rtc_ports(env, RTC_PORT_BASE, RTC_PORT_SIZE);
unsigned year, mon, day, hour, min, sec;
int i;
@ -112,22 +99,22 @@ Rtc::Timestamp Rtc::get_time(void)
/* read RTC exactly on falling edge of update flag */
for (i = 0 ; i < 1000000 ; i++)
if (cmos_read(RTC_FREQ_SELECT) & RTC_UIP) break;
if (cmos_read(rtc_ports, RTC_FREQ_SELECT) & RTC_UIP) break;
for (i = 0 ; i < 1000000 ; i++)
if (!(cmos_read(RTC_FREQ_SELECT) & RTC_UIP)) break;
if (!(cmos_read(rtc_ports, RTC_FREQ_SELECT) & RTC_UIP)) break;
do {
sec = cmos_read(RTC_SECONDS);
min = cmos_read(RTC_MINUTES);
hour = cmos_read(RTC_HOURS);
day = cmos_read(RTC_DAY_OF_MONTH);
mon = cmos_read(RTC_MONTH);
year = cmos_read(RTC_YEAR);
} while (sec != cmos_read(RTC_SECONDS));
sec = cmos_read(rtc_ports, RTC_SECONDS);
min = cmos_read(rtc_ports, RTC_MINUTES);
hour = cmos_read(rtc_ports, RTC_HOURS);
day = cmos_read(rtc_ports, RTC_DAY_OF_MONTH);
mon = cmos_read(rtc_ports, RTC_MONTH);
year = cmos_read(rtc_ports, RTC_YEAR);
} while (sec != cmos_read(rtc_ports, RTC_SECONDS));
/* convert BCD to binary format if needed */
if (!(cmos_read(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
if (!(cmos_read(rtc_ports, RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
BCD_TO_BIN(sec);
BCD_TO_BIN(min);
BCD_TO_BIN(hour);

8
repos/os/src/drivers/rtc/spec/x86/rtc.h
View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (C) 2015 Genode Labs GmbH
* Copyright (C) 2015-2017 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.
@ -14,12 +14,14 @@
#ifndef _DRIVERS__RTC__SPEC__X86__RTC_H_
#define _DRIVERS__RTC__SPEC__X86__RTC_H_
#include <base/stdint.h>
#include <base/env.h>
#include <rtc_session/rtc_session.h>
namespace Rtc {
using namespace Genode;
Timestamp get_time();
Timestamp get_time(Env &env);
}
#endif /* _DRIVERS__RTC__SPEC__X86__RTC_H_ */