diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefile | 1 | ||||
| -rw-r--r-- | src/runtime/makefile | 5 | ||||
| -rw-r--r-- | src/runtime/rt_time.C | 35 | ||||
| -rw-r--r-- | src/usr/hwpf/plat/fapiPlatUtil.C | 7 |
4 files changed, 40 insertions, 8 deletions
diff --git a/src/makefile b/src/makefile index 554c24691..63dfeb907 100644 --- a/src/makefile +++ b/src/makefile @@ -211,6 +211,7 @@ RUNTIME_OBJECTS += rt_sync.o RUNTIME_OBJECTS += rt_assert.o RUNTIME_OBJECTS += rt_vfs.o RUNTIME_OBJECTS += rt_task.o +RUNTIME_OBJECTS += rt_time.o RUNTIME_MODULES += trace_rt RUNTIME_MODULES += errl_rt diff --git a/src/runtime/makefile b/src/runtime/makefile index f2606540e..ce84bc4c4 100644 --- a/src/runtime/makefile +++ b/src/runtime/makefile @@ -5,7 +5,9 @@ # # OpenPOWER HostBoot Project # -# COPYRIGHT International Business Machines Corp. 2013,2014 +# Contributors Listed Below - COPYRIGHT 2013,2014 +# [+] International Business Machines Corp. +# # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -31,5 +33,6 @@ OBJS += rt_sync.o OBJS += rt_assert.o OBJS += rt_vfs.o OBJS += rt_task.o +OBJS += rt_time.o include ${ROOTPATH}/config.mk diff --git a/src/runtime/rt_time.C b/src/runtime/rt_time.C new file mode 100644 index 000000000..a5d00157e --- /dev/null +++ b/src/runtime/rt_time.C @@ -0,0 +1,35 @@ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/runtime/rt_time.C $ */ +/* */ +/* OpenPOWER HostBoot Project */ +/* */ +/* Contributors Listed Below - COPYRIGHT 2014 */ +/* [+] International Business Machines Corp. */ +/* */ +/* */ +/* Licensed under the Apache License, Version 2.0 (the "License"); */ +/* you may not use this file except in compliance with the License. */ +/* You may obtain a copy of the License at */ +/* */ +/* http://www.apache.org/licenses/LICENSE-2.0 */ +/* */ +/* Unless required by applicable law or agreed to in writing, software */ +/* distributed under the License is distributed on an "AS IS" BASIS, */ +/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */ +/* implied. See the License for the specific language governing */ +/* permissions and limitations under the License. */ +/* */ +/* IBM_PROLOG_END_TAG */ +#include <sys/time.h> +#include <runtime/interface.h> + +void nanosleep(uint64_t sec, uint64_t nsec) +{ + if (g_hostInterfaces && g_hostInterfaces->nanosleep) + { + g_hostInterfaces->nanosleep(sec, nsec); + } +} + diff --git a/src/usr/hwpf/plat/fapiPlatUtil.C b/src/usr/hwpf/plat/fapiPlatUtil.C index 596802b4c..dcf83d3b5 100644 --- a/src/usr/hwpf/plat/fapiPlatUtil.C +++ b/src/usr/hwpf/plat/fapiPlatUtil.C @@ -92,14 +92,7 @@ void fapiAssert(bool i_expression) fapi::ReturnCode fapiDelay(uint64_t i_nanoSeconds, uint64_t i_simCycles) { FAPI_DBG( INFO_MRK "delay %lld nanosec", i_nanoSeconds ); -#ifndef __HOSTBOOT_RUNTIME nanosleep( 0, i_nanoSeconds ); -#else - if(g_hostInterfaces && g_hostInterfaces->nanosleep) - { - g_hostInterfaces->nanosleep(0, i_nanoSeconds); - } -#endif return fapi::FAPI_RC_SUCCESS; } |
