removed unuseful clone_area
This is a temporary solution, until moving to a global kernel export data struct git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9819 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
3a88903282
commit
ca6e6e8d16
@ -5,9 +5,9 @@
|
|||||||
|
|
||||||
|
|
||||||
#include <OS.h>
|
#include <OS.h>
|
||||||
|
#include <string.h>
|
||||||
#include "syscalls.h"
|
#include "syscalls.h"
|
||||||
|
|
||||||
static area_id sCloneRtcArea;
|
|
||||||
static volatile bigtime_t *sBootTime = NULL;
|
static volatile bigtime_t *sBootTime = NULL;
|
||||||
|
|
||||||
|
|
||||||
@ -15,17 +15,21 @@ status_t
|
|||||||
setup_rtc_area()
|
setup_rtc_area()
|
||||||
{
|
{
|
||||||
area_id rtcArea = find_area("rtc_region");
|
area_id rtcArea = find_area("rtc_region");
|
||||||
|
area_info info;
|
||||||
|
status_t err;
|
||||||
|
|
||||||
if (rtcArea < 0) {
|
if (rtcArea < 0) {
|
||||||
printf("setup_rtc_area: error finding rtc_region %s\n",
|
printf("setup_rtc_area: error finding rtc_region %s\n",
|
||||||
strerror(rtcArea));
|
strerror(rtcArea));
|
||||||
|
return rtcArea;
|
||||||
}
|
}
|
||||||
sCloneRtcArea = clone_area("cloned_rtc_region", (void**)&sBootTime,
|
|
||||||
B_ANY_ADDRESS, B_READ_AREA, rtcArea);
|
err = get_area_info(rtcArea, &info);
|
||||||
if (sCloneRtcArea < 0) {
|
if (err < B_OK) {
|
||||||
printf("setup_rtc_area: error cloning rtc_region\n");
|
printf("setup_rtc_area: error getting rtc_region info\n");
|
||||||
return sCloneRtcArea;
|
return err;
|
||||||
}
|
}
|
||||||
|
sBootTime = (bigtime_t *)info.address;
|
||||||
return B_OK;
|
return B_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -33,10 +37,9 @@ setup_rtc_area()
|
|||||||
uint32
|
uint32
|
||||||
real_time_clock(void)
|
real_time_clock(void)
|
||||||
{
|
{
|
||||||
if (!sBootTime)
|
if (!sBootTime && (setup_rtc_area()!=B_OK))
|
||||||
setup_rtc_area();
|
return 0;
|
||||||
//return (*sBootTime + system_time()) / 1000000;
|
return (*sBootTime + system_time()) / 1000000;
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -50,10 +53,9 @@ set_real_time_clock(uint32 secs)
|
|||||||
bigtime_t
|
bigtime_t
|
||||||
real_time_clock_usecs(void)
|
real_time_clock_usecs(void)
|
||||||
{
|
{
|
||||||
if (!sBootTime)
|
if (!sBootTime && (setup_rtc_area() != B_OK))
|
||||||
setup_rtc_area();
|
return 0;
|
||||||
//return *sBootTime + system_time();
|
return *sBootTime + system_time();
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user