Changeset 21789a21 in rtems


Ignore:
Timestamp:
Jul 28, 2015, 12:45:42 PM (4 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
74ef2c1
Parents:
f7d95581
git-author:
Sebastian Huber <sebastian.huber@…> (07/28/15 12:45:42)
git-committer:
Sebastian Huber <sebastian.huber@…> (07/28/15 12:54:51)
Message:

score: Rename _POSIX_Absolute_timeout_to_ticks()

Rename _POSIX_Absolute_timeout_to_ticks() to
_TOD_Absolute_timeout_to_ticks() and move it to the score directory.
Delete empty <rtems/posix/time.h>.

Location:
cpukit
Files:
1 deleted
96 edited
1 moved

Legend:

Unmodified
Added
Removed
  • cpukit/posix/Makefile.am

    rf7d95581 r21789a21  
    4848include_rtems_posix_HEADERS += include/rtems/posix/semaphoreimpl.h
    4949include_rtems_posix_HEADERS += include/rtems/posix/threadsup.h
    50 include_rtems_posix_HEADERS += include/rtems/posix/time.h
    5150include_rtems_posix_HEADERS += include/rtems/posix/timer.h
    5251include_rtems_posix_HEADERS += include/rtems/posix/timerimpl.h
     
    196195
    197196## TIME_C_FILES
    198 libposix_a_SOURCES += src/adjtime.c src/posixtimespecabsolutetimeout.c \
     197libposix_a_SOURCES += src/adjtime.c \
    199198    src/clockgetcpuclockid.c src/clockgetenableattr.c src/clocksetenableattr.c
    200199
  • cpukit/posix/preinstall.am

    rf7d95581 r21789a21  
    126126PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/threadsup.h
    127127
    128 $(PROJECT_INCLUDE)/rtems/posix/time.h: include/rtems/posix/time.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
    129         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/time.h
    130 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/time.h
    131 
    132128$(PROJECT_INCLUDE)/rtems/posix/timer.h: include/rtems/posix/timer.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
    133129        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/timer.h
  • cpukit/posix/src/barrierattrdestroy.c

    rf7d95581 r21789a21  
    2525#include <rtems/score/watchdog.h>
    2626#include <rtems/posix/condimpl.h>
    27 #include <rtems/posix/time.h>
    2827#include <rtems/posix/muteximpl.h>
    2928
  • cpukit/posix/src/clockgetcpuclockid.c

    rf7d95581 r21789a21  
    2727
    2828#include <rtems/seterr.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/*
  • cpukit/posix/src/clockgetenableattr.c

    rf7d95581 r21789a21  
    2727
    2828#include <rtems/seterr.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/*
  • cpukit/posix/src/clocksetenableattr.c

    rf7d95581 r21789a21  
    2727
    2828#include <rtems/seterr.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/*
  • cpukit/posix/src/cond.c

    rf7d95581 r21789a21  
    2727#include <rtems/score/watchdog.h>
    2828#include <rtems/posix/condimpl.h>
    29 #include <rtems/posix/time.h>
    3029#include <rtems/posix/muteximpl.h>
    3130
  • cpukit/posix/src/condattrdestroy.c

    rf7d95581 r21789a21  
    2525#include <rtems/score/watchdog.h>
    2626#include <rtems/posix/condimpl.h>
    27 #include <rtems/posix/time.h>
    2827#include <rtems/posix/muteximpl.h>
    2928
  • cpukit/posix/src/condattrgetpshared.c

    rf7d95581 r21789a21  
    2525#include <rtems/score/watchdog.h>
    2626#include <rtems/posix/condimpl.h>
    27 #include <rtems/posix/time.h>
    2827#include <rtems/posix/muteximpl.h>
    2928
  • cpukit/posix/src/condattrinit.c

    rf7d95581 r21789a21  
    2525#include <rtems/score/watchdog.h>
    2626#include <rtems/posix/condimpl.h>
    27 #include <rtems/posix/time.h>
    2827#include <rtems/posix/muteximpl.h>
    2928
  • cpukit/posix/src/condattrsetpshared.c

    rf7d95581 r21789a21  
    2525#include <rtems/score/watchdog.h>
    2626#include <rtems/posix/condimpl.h>
    27 #include <rtems/posix/time.h>
    2827#include <rtems/posix/muteximpl.h>
    2928
  • cpukit/posix/src/condbroadcast.c

    rf7d95581 r21789a21  
    2525#include <rtems/score/watchdog.h>
    2626#include <rtems/posix/condimpl.h>
    27 #include <rtems/posix/time.h>
    2827#include <rtems/posix/muteximpl.h>
    2928
  • cpukit/posix/src/conddefaultattributes.c

    rf7d95581 r21789a21  
    2525#include <rtems/score/watchdog.h>
    2626#include <rtems/posix/condimpl.h>
    27 #include <rtems/posix/time.h>
    2827#include <rtems/posix/muteximpl.h>
    2928
  • cpukit/posix/src/conddestroy.c

    rf7d95581 r21789a21  
    2525#include <rtems/score/watchdog.h>
    2626#include <rtems/posix/condimpl.h>
    27 #include <rtems/posix/time.h>
    2827#include <rtems/posix/muteximpl.h>
    2928
  • cpukit/posix/src/condget.c

    rf7d95581 r21789a21  
    1818#include <rtems/score/watchdog.h>
    1919#include <rtems/posix/condimpl.h>
    20 #include <rtems/posix/time.h>
    2120#include <rtems/posix/muteximpl.h>
    2221
  • cpukit/posix/src/condinit.c

    rf7d95581 r21789a21  
    2525#include <rtems/score/watchdog.h>
    2626#include <rtems/posix/condimpl.h>
    27 #include <rtems/posix/time.h>
    2827#include <rtems/posix/muteximpl.h>
    2928
  • cpukit/posix/src/condsignal.c

    rf7d95581 r21789a21  
    2525#include <rtems/score/watchdog.h>
    2626#include <rtems/posix/condimpl.h>
    27 #include <rtems/posix/time.h>
    2827#include <rtems/posix/muteximpl.h>
    2928
  • cpukit/posix/src/condsignalsupp.c

    rf7d95581 r21789a21  
    2525#include <rtems/score/watchdog.h>
    2626#include <rtems/posix/condimpl.h>
    27 #include <rtems/posix/time.h>
    2827#include <rtems/posix/muteximpl.h>
    2928
  • cpukit/posix/src/condtimedwait.c

    rf7d95581 r21789a21  
    2323
    2424#include <rtems/system.h>
    25 #include <rtems/score/watchdog.h>
     25#include <rtems/score/todimpl.h>
    2626#include <rtems/posix/condimpl.h>
    27 #include <rtems/posix/time.h>
    2827#include <rtems/posix/muteximpl.h>
    2928
     
    4039  Watchdog_Interval                            ticks;
    4140  bool                                         already_timedout;
    42   POSIX_Absolute_timeout_conversion_results_t  status;
     41  TOD_Absolute_timeout_conversion_results  status;
    4342
    4443  /*
     
    5251   */
    5352  already_timedout = false;
    54   status = _POSIX_Absolute_timeout_to_ticks(abstime, &ticks);
    55   if ( status == POSIX_ABSOLUTE_TIMEOUT_INVALID )
     53  status = _TOD_Absolute_timeout_to_ticks(abstime, &ticks);
     54  if ( status == TOD_ABSOLUTE_TIMEOUT_INVALID )
    5655    return EINVAL;
    5756
    58   if ( status == POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST ||
    59        status == POSIX_ABSOLUTE_TIMEOUT_IS_NOW )
     57  if ( status == TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST ||
     58       status == TOD_ABSOLUTE_TIMEOUT_IS_NOW )
    6059    already_timedout = true;
    6160
  • cpukit/posix/src/condwait.c

    rf7d95581 r21789a21  
    2525#include <rtems/score/watchdog.h>
    2626#include <rtems/posix/condimpl.h>
    27 #include <rtems/posix/time.h>
    2827#include <rtems/posix/muteximpl.h>
    2928
  • cpukit/posix/src/condwaitsupp.c

    rf7d95581 r21789a21  
    2626#include <rtems/score/statesimpl.h>
    2727#include <rtems/posix/condimpl.h>
    28 #include <rtems/posix/time.h>
    2928#include <rtems/posix/muteximpl.h>
    3029
  • cpukit/posix/src/mqueue.c

    rf7d95581 r21789a21  
    3232#include <rtems/seterr.h>
    3333#include <rtems/posix/mqueueimpl.h>
    34 #include <rtems/posix/time.h>
    3534
    3635/*
  • cpukit/posix/src/mqueueclose.c

    rf7d95581 r21789a21  
    4343#include <rtems/seterr.h>
    4444#include <rtems/posix/mqueueimpl.h>
    45 #include <rtems/posix/time.h>
    4645
    4746/*
  • cpukit/posix/src/mqueuecreatesupp.c

    rf7d95581 r21789a21  
    3939#include <rtems/seterr.h>
    4040#include <rtems/posix/mqueueimpl.h>
    41 #include <rtems/posix/time.h>
    4241
    4342/*
  • cpukit/posix/src/mqueuedeletesupp.c

    rf7d95581 r21789a21  
    3232#include <rtems/seterr.h>
    3333#include <rtems/posix/mqueueimpl.h>
    34 #include <rtems/posix/time.h>
    3534#if defined(RTEMS_DEBUG)
    3635  #include <rtems/bspIo.h>
  • cpukit/posix/src/mqueuegetattr.c

    rf7d95581 r21789a21  
    4343#include <rtems/seterr.h>
    4444#include <rtems/posix/mqueueimpl.h>
    45 #include <rtems/posix/time.h>
    4645
    4746/*
  • cpukit/posix/src/mqueuenotify.c

    rf7d95581 r21789a21  
    3333#include <rtems/seterr.h>
    3434#include <rtems/posix/mqueueimpl.h>
    35 #include <rtems/posix/time.h>
    3635
    3736/*
  • cpukit/posix/src/mqueueopen.c

    rf7d95581 r21789a21  
    4242#include <rtems/score/watchdog.h>
    4343#include <rtems/posix/mqueueimpl.h>
    44 #include <rtems/posix/time.h>
    4544#include <rtems/seterr.h>
    4645
  • cpukit/posix/src/mqueuereceive.c

    rf7d95581 r21789a21  
    3131#include <rtems/seterr.h>
    3232#include <rtems/posix/mqueueimpl.h>
    33 #include <rtems/posix/time.h>
    3433
    3534ssize_t mq_receive(
  • cpukit/posix/src/mqueuerecvsupp.c

    rf7d95581 r21789a21  
    3131#include <rtems/seterr.h>
    3232#include <rtems/posix/mqueueimpl.h>
    33 #include <rtems/posix/time.h>
    3433
    3534/*
  • cpukit/posix/src/mqueuesend.c

    rf7d95581 r21789a21  
    4343#include <rtems/seterr.h>
    4444#include <rtems/posix/mqueueimpl.h>
    45 #include <rtems/posix/time.h>
    4645
    4746/*
  • cpukit/posix/src/mqueuesendsupp.c

    rf7d95581 r21789a21  
    4343#include <rtems/seterr.h>
    4444#include <rtems/posix/mqueueimpl.h>
    45 #include <rtems/posix/time.h>
    4645
    4746
  • cpukit/posix/src/mqueuesetattr.c

    rf7d95581 r21789a21  
    3131#include <rtems/seterr.h>
    3232#include <rtems/posix/mqueueimpl.h>
    33 #include <rtems/posix/time.h>
    3433
    3534int mq_setattr(
  • cpukit/posix/src/mqueuetimedreceive.c

    rf7d95581 r21789a21  
    4242
    4343#include <rtems/system.h>
    44 #include <rtems/score/watchdog.h>
     44#include <rtems/score/todimpl.h>
    4545#include <rtems/seterr.h>
    4646#include <rtems/posix/mqueueimpl.h>
    47 #include <rtems/posix/time.h>
    4847
    4948/*
     
    6362  Watchdog_Interval                            ticks;
    6463  bool                                         do_wait = true;
    65   POSIX_Absolute_timeout_conversion_results_t  status;
     64  TOD_Absolute_timeout_conversion_results  status;
    6665
    6766  /*
     
    7473   *  status into the appropriate error.
    7574   *
    76    *  If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID,
    77    *  POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST, or POSIX_ABSOLUTE_TIMEOUT_IS_NOW,
     75   *  If the status is TOD_ABSOLUTE_TIMEOUT_INVALID,
     76   *  TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST, or TOD_ABSOLUTE_TIMEOUT_IS_NOW,
    7877   *  then we should not wait.
    7978   */
    80   status = _POSIX_Absolute_timeout_to_ticks( abstime, &ticks );
    81   if ( status != POSIX_ABSOLUTE_TIMEOUT_IS_IN_FUTURE )
     79  status = _TOD_Absolute_timeout_to_ticks( abstime, &ticks );
     80  if ( status != TOD_ABSOLUTE_TIMEOUT_IS_IN_FUTURE )
    8281    do_wait = false;
    8382
  • cpukit/posix/src/mqueuetimedsend.c

    rf7d95581 r21789a21  
    2828
    2929#include <rtems/system.h>
    30 #include <rtems/score/watchdog.h>
     30#include <rtems/score/todimpl.h>
    3131#include <rtems/seterr.h>
    3232#include <rtems/posix/mqueueimpl.h>
    33 #include <rtems/posix/time.h>
    3433
    3534int mq_timedsend(
     
    4342  Watchdog_Interval                            ticks;
    4443  bool                                         do_wait = true;
    45   POSIX_Absolute_timeout_conversion_results_t  status;
     44  TOD_Absolute_timeout_conversion_results  status;
    4645
    4746  /*
     
    5453   *  status into the appropriate error.
    5554   *
    56    *  If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID,
    57    *  POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST, or POSIX_ABSOLUTE_TIMEOUT_IS_NOW,
     55   *  If the status is TOD_ABSOLUTE_TIMEOUT_INVALID,
     56   *  TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST, or TOD_ABSOLUTE_TIMEOUT_IS_NOW,
    5857   *  then we should not wait.
    5958   */
    60   status = _POSIX_Absolute_timeout_to_ticks( abstime, &ticks );
    61   if ( status != POSIX_ABSOLUTE_TIMEOUT_IS_IN_FUTURE )
     59  status = _TOD_Absolute_timeout_to_ticks( abstime, &ticks );
     60  if ( status != TOD_ABSOLUTE_TIMEOUT_IS_IN_FUTURE )
    6261    do_wait = false;
    6362
  • cpukit/posix/src/mqueueunlink.c

    rf7d95581 r21789a21  
    3232#include <rtems/seterr.h>
    3333#include <rtems/posix/mqueueimpl.h>
    34 #include <rtems/posix/time.h>
    3534
    3635/*
  • cpukit/posix/src/mutex.c

    rf7d95581 r21789a21  
    2929#include <rtems/posix/muteximpl.h>
    3030#include <rtems/posix/priorityimpl.h>
    31 #include <rtems/posix/time.h>
    3231
    3332/*
  • cpukit/posix/src/mutexattrdestroy.c

    rf7d95581 r21789a21  
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/**
  • cpukit/posix/src/mutexattrgetprioceiling.c

    rf7d95581 r21789a21  
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/*
  • cpukit/posix/src/mutexattrgetprotocol.c

    rf7d95581 r21789a21  
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/*
  • cpukit/posix/src/mutexattrgetpshared.c

    rf7d95581 r21789a21  
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/*
  • cpukit/posix/src/mutexattrgettype.c

    rf7d95581 r21789a21  
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130#if defined(_UNIX98_THREAD_MUTEX_ATTRIBUTES)
  • cpukit/posix/src/mutexattrinit.c

    rf7d95581 r21789a21  
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/**
  • cpukit/posix/src/mutexattrsetprioceiling.c

    rf7d95581 r21789a21  
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/*
  • cpukit/posix/src/mutexattrsetprotocol.c

    rf7d95581 r21789a21  
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/*
  • cpukit/posix/src/mutexattrsetpshared.c

    rf7d95581 r21789a21  
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/*
  • cpukit/posix/src/mutexattrsettype.c

    rf7d95581 r21789a21  
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130#if defined(_UNIX98_THREAD_MUTEX_ATTRIBUTES)
  • cpukit/posix/src/mutexdestroy.c

    rf7d95581 r21789a21  
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/*
  • cpukit/posix/src/mutexgetprioceiling.c

    rf7d95581 r21789a21  
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/*
  • cpukit/posix/src/mutexinit.c

    rf7d95581 r21789a21  
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/**
  • cpukit/posix/src/mutexlock.c

    rf7d95581 r21789a21  
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/*
  • cpukit/posix/src/mutexlocksupp.c

    rf7d95581 r21789a21  
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/*
  • cpukit/posix/src/mutexsetprioceiling.c

    rf7d95581 r21789a21  
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/*
  • cpukit/posix/src/mutextimedlock.c

    rf7d95581 r21789a21  
    2424#include <rtems/system.h>
    2525#include <rtems/score/coremuteximpl.h>
    26 #include <rtems/score/watchdog.h>
     26#include <rtems/score/todimpl.h>
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/**
     
    4140  Watchdog_Interval                            ticks;
    4241  bool                                         do_wait = true;
    43   POSIX_Absolute_timeout_conversion_results_t  status;
     42  TOD_Absolute_timeout_conversion_results  status;
    4443  int                                          lock_status;
    4544
     
    5352   *  status into the appropriate error.
    5453   *
    55    *  If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID,
    56    *  POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST, or POSIX_ABSOLUTE_TIMEOUT_IS_NOW,
     54   *  If the status is TOD_ABSOLUTE_TIMEOUT_INVALID,
     55   *  TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST, or TOD_ABSOLUTE_TIMEOUT_IS_NOW,
    5756   *  then we should not wait.
    5857   */
    59   status = _POSIX_Absolute_timeout_to_ticks( abstime, &ticks );
    60   if ( status != POSIX_ABSOLUTE_TIMEOUT_IS_IN_FUTURE )
     58  status = _TOD_Absolute_timeout_to_ticks( abstime, &ticks );
     59  if ( status != TOD_ABSOLUTE_TIMEOUT_IS_IN_FUTURE )
    6160    do_wait = false;
    6261
     
    6968   */
    7069  if ( !do_wait && (lock_status == EBUSY) ) {
    71     if ( status == POSIX_ABSOLUTE_TIMEOUT_INVALID )
     70    if ( status == TOD_ABSOLUTE_TIMEOUT_INVALID )
    7271      return EINVAL;
    73     if ( status == POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST ||
    74          status == POSIX_ABSOLUTE_TIMEOUT_IS_NOW )
     72    if ( status == TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST ||
     73         status == TOD_ABSOLUTE_TIMEOUT_IS_NOW )
    7574      return ETIMEDOUT;
    7675  }
  • cpukit/posix/src/mutextrylock.c

    rf7d95581 r21789a21  
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/**
  • cpukit/posix/src/mutexunlock.c

    rf7d95581 r21789a21  
    2727#include <rtems/posix/muteximpl.h>
    2828#include <rtems/posix/priorityimpl.h>
    29 #include <rtems/posix/time.h>
    3029
    3130/*
  • cpukit/posix/src/prwlocktimedrdlock.c

    rf7d95581 r21789a21  
    2323
    2424#include <rtems/posix/rwlockimpl.h>
    25 #include <rtems/posix/time.h>
    2625#include <rtems/score/thread.h>
     26#include <rtems/score/todimpl.h>
    2727
    2828/*
     
    4848  Watchdog_Interval                            ticks;
    4949  bool                                         do_wait = true;
    50   POSIX_Absolute_timeout_conversion_results_t  status;
     50  TOD_Absolute_timeout_conversion_results  status;
    5151  Thread_Control                              *executing;
    5252
     
    6060   *  status into the appropriate error.
    6161   *
    62    *  If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID,
    63    *  POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST, or POSIX_ABSOLUTE_TIMEOUT_IS_NOW,
     62   *  If the status is TOD_ABSOLUTE_TIMEOUT_INVALID,
     63   *  TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST, or TOD_ABSOLUTE_TIMEOUT_IS_NOW,
    6464   *  then we should not wait.
    6565   */
    66   status = _POSIX_Absolute_timeout_to_ticks( abstime, &ticks );
    67   if ( status != POSIX_ABSOLUTE_TIMEOUT_IS_IN_FUTURE )
     66  status = _TOD_Absolute_timeout_to_ticks( abstime, &ticks );
     67  if ( status != TOD_ABSOLUTE_TIMEOUT_IS_IN_FUTURE )
    6868    do_wait = false;
    6969
     
    8686      if ( !do_wait ) {
    8787        if ( executing->Wait.return_code == CORE_RWLOCK_UNAVAILABLE ) {
    88           if ( status == POSIX_ABSOLUTE_TIMEOUT_INVALID )
     88          if ( status == TOD_ABSOLUTE_TIMEOUT_INVALID )
    8989            return EINVAL;
    90           if ( status == POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST ||
    91                status == POSIX_ABSOLUTE_TIMEOUT_IS_NOW )
     90          if ( status == TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST ||
     91               status == TOD_ABSOLUTE_TIMEOUT_IS_NOW )
    9292            return ETIMEDOUT;
    9393        }
  • cpukit/posix/src/prwlocktimedwrlock.c

    rf7d95581 r21789a21  
    2525
    2626#include <rtems/posix/rwlockimpl.h>
    27 #include <rtems/posix/time.h>
    2827#include <rtems/score/thread.h>
     28#include <rtems/score/todimpl.h>
    2929
    3030/*
     
    5050  Watchdog_Interval                            ticks;
    5151  bool                                         do_wait = true;
    52   POSIX_Absolute_timeout_conversion_results_t  status;
     52  TOD_Absolute_timeout_conversion_results  status;
    5353  Thread_Control                              *executing;
    5454
     
    6262   *  status into the appropriate error.
    6363   *
    64    *  If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID,
    65    *  POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST, or POSIX_ABSOLUTE_TIMEOUT_IS_NOW,
     64   *  If the status is TOD_ABSOLUTE_TIMEOUT_INVALID,
     65   *  TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST, or TOD_ABSOLUTE_TIMEOUT_IS_NOW,
    6666   *  then we should not wait.
    6767   */
    68   status = _POSIX_Absolute_timeout_to_ticks( abstime, &ticks );
    69   if ( status != POSIX_ABSOLUTE_TIMEOUT_IS_IN_FUTURE )
     68  status = _TOD_Absolute_timeout_to_ticks( abstime, &ticks );
     69  if ( status != TOD_ABSOLUTE_TIMEOUT_IS_IN_FUTURE )
    7070    do_wait = false;
    7171
     
    8888      if ( !do_wait &&
    8989           (executing->Wait.return_code == CORE_RWLOCK_UNAVAILABLE) ) {
    90         if ( status == POSIX_ABSOLUTE_TIMEOUT_INVALID )
     90        if ( status == TOD_ABSOLUTE_TIMEOUT_INVALID )
    9191          return EINVAL;
    92         if ( status == POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST ||
    93              status == POSIX_ABSOLUTE_TIMEOUT_IS_NOW )
     92        if ( status == TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST ||
     93             status == TOD_ABSOLUTE_TIMEOUT_IS_NOW )
    9494          return ETIMEDOUT;
    9595      }
  • cpukit/posix/src/psignal.c

    rf7d95581 r21789a21  
    3232#include <rtems/posix/psignalimpl.h>
    3333#include <rtems/posix/pthreadimpl.h>
    34 #include <rtems/posix/time.h>
    3534#include <rtems/config.h>
    3635#include <rtems/seterr.h>
  • cpukit/posix/src/psignalchecksignal.c

    rf7d95581 r21789a21  
    3535#include <rtems/posix/psignalimpl.h>
    3636#include <rtems/posix/pthreadimpl.h>
    37 #include <rtems/posix/time.h>
    3837#include <stdio.h>
    3938
  • cpukit/posix/src/psignalclearsignals.c

    rf7d95581 r21789a21  
    3131#include <rtems/posix/psignalimpl.h>
    3232#include <rtems/posix/pthreadimpl.h>
    33 #include <rtems/posix/time.h>
    3433#include <stdio.h>
    3534
  • cpukit/posix/src/psignalsetprocesssignals.c

    rf7d95581 r21789a21  
    3131#include <rtems/posix/psignalimpl.h>
    3232#include <rtems/posix/pthreadimpl.h>
    33 #include <rtems/posix/time.h>
    3433#include <stdio.h>
    3534
  • cpukit/posix/src/psignalunblockthread.c

    rf7d95581 r21789a21  
    3333#include <rtems/posix/psignalimpl.h>
    3434#include <rtems/posix/pthreadimpl.h>
    35 #include <rtems/posix/time.h>
    3635#include <stdio.h>
    3736
  • cpukit/posix/src/psxtransschedparam.c

    rf7d95581 r21789a21  
    2525#include <rtems/posix/pthreadimpl.h>
    2626#include <rtems/posix/priorityimpl.h>
    27 #include <rtems/posix/time.h>
    2827
    2928int _POSIX_Thread_Translate_sched_param(
  • cpukit/posix/src/pthread.c

    rf7d95581 r21789a21  
    4040#include <rtems/posix/config.h>
    4141#include <rtems/posix/keyimpl.h>
    42 #include <rtems/posix/time.h>
    4342#include <rtems/score/timespec.h>
    4443#include <rtems/score/cpusetimpl.h>
  • cpukit/posix/src/pthreadcreate.c

    rf7d95581 r21789a21  
    2828#include <rtems/posix/priorityimpl.h>
    2929#include <rtems/posix/pthreadimpl.h>
    30 #include <rtems/posix/time.h>
    3130#include <rtems/score/cpusetimpl.h>
    3231#include <rtems/score/threadimpl.h>
  • cpukit/posix/src/pthreadinitthreads.c

    rf7d95581 r21789a21  
    3434#include <rtems/posix/priorityimpl.h>
    3535#include <rtems/posix/config.h>
    36 #include <rtems/posix/time.h>
    3736#include <rtems/rtems/config.h>
    3837
  • cpukit/posix/src/pthreadsetschedparam.c

    rf7d95581 r21789a21  
    2828#include <rtems/posix/pthreadimpl.h>
    2929#include <rtems/posix/priorityimpl.h>
    30 #include <rtems/posix/time.h>
    3130#include <rtems/score/threadimpl.h>
    3231#include <rtems/score/watchdogimpl.h>
  • cpukit/posix/src/ptimer.c

    rf7d95581 r21789a21  
    2828#include <rtems/score/thread.h>
    2929
    30 #include <rtems/posix/time.h>
    3130
    3231/************************************/
  • cpukit/posix/src/rwlockattrdestroy.c

    rf7d95581 r21789a21  
    2525#include <rtems/score/watchdog.h>
    2626#include <rtems/posix/condimpl.h>
    27 #include <rtems/posix/time.h>
    2827#include <rtems/posix/muteximpl.h>
    2928
  • cpukit/posix/src/sched_getscheduler.c

    rf7d95581 r21789a21  
    2828#include <rtems/seterr.h>
    2929#include <rtems/posix/priorityimpl.h>
    30 #include <rtems/posix/time.h>
    3130
    3231int sched_getscheduler(
  • cpukit/posix/src/sched_setparam.c

    rf7d95581 r21789a21  
    2828#include <rtems/seterr.h>
    2929#include <rtems/posix/priorityimpl.h>
    30 #include <rtems/posix/time.h>
    3130
    3231int sched_setparam(
  • cpukit/posix/src/sched_setscheduler.c

    rf7d95581 r21789a21  
    2626#include <rtems/seterr.h>
    2727#include <rtems/posix/priorityimpl.h>
    28 #include <rtems/posix/time.h>
    2928
    3029int sched_setscheduler(
  • cpukit/posix/src/semaphore.c

    rf7d95581 r21789a21  
    3030#include <rtems/config.h>
    3131#include <rtems/posix/semaphoreimpl.h>
    32 #include <rtems/posix/time.h>
    3332#include <rtems/seterr.h>
    3433
  • cpukit/posix/src/semaphorecreatesupp.c

    rf7d95581 r21789a21  
    3131#include <rtems/score/wkspace.h>
    3232#include <rtems/posix/semaphoreimpl.h>
    33 #include <rtems/posix/time.h>
    3433#include <rtems/seterr.h>
    3534
  • cpukit/posix/src/semaphoredeletesupp.c

    rf7d95581 r21789a21  
    2929#include <rtems/system.h>
    3030#include <rtems/posix/semaphoreimpl.h>
    31 #include <rtems/posix/time.h>
    3231#include <rtems/seterr.h>
    3332
  • cpukit/posix/src/semaphorewaitsupp.c

    rf7d95581 r21789a21  
    2929#include <rtems/system.h>
    3030#include <rtems/posix/semaphoreimpl.h>
    31 #include <rtems/posix/time.h>
    3231#include <rtems/seterr.h>
    3332
  • cpukit/posix/src/semclose.c

    rf7d95581 r21789a21  
    2929#include <rtems/system.h>
    3030#include <rtems/posix/semaphoreimpl.h>
    31 #include <rtems/posix/time.h>
    3231#include <rtems/seterr.h>
    3332
  • cpukit/posix/src/semdestroy.c

    rf7d95581 r21789a21  
    2929#include <rtems/system.h>
    3030#include <rtems/posix/semaphoreimpl.h>
    31 #include <rtems/posix/time.h>
    3231#include <rtems/seterr.h>
    3332
  • cpukit/posix/src/semgetvalue.c

    rf7d95581 r21789a21  
    2929#include <rtems/system.h>
    3030#include <rtems/posix/semaphoreimpl.h>
    31 #include <rtems/posix/time.h>
    3231#include <rtems/seterr.h>
    3332
  • cpukit/posix/src/seminit.c

    rf7d95581 r21789a21  
    2929#include <rtems/system.h>
    3030#include <rtems/posix/semaphoreimpl.h>
    31 #include <rtems/posix/time.h>
    3231#include <rtems/seterr.h>
    3332
  • cpukit/posix/src/semopen.c

    rf7d95581 r21789a21  
    2929#include <rtems/system.h>
    3030#include <rtems/posix/semaphoreimpl.h>
    31 #include <rtems/posix/time.h>
    3231#include <rtems/seterr.h>
    3332
  • cpukit/posix/src/sempost.c

    rf7d95581 r21789a21  
    2929#include <rtems/system.h>
    3030#include <rtems/posix/semaphoreimpl.h>
    31 #include <rtems/posix/time.h>
    3231#include <rtems/seterr.h>
    3332
  • cpukit/posix/src/semtimedwait.c

    rf7d95581 r21789a21  
    2828
    2929#include <rtems/system.h>
     30#include <rtems/score/todimpl.h>
    3031#include <rtems/posix/semaphoreimpl.h>
    31 #include <rtems/posix/time.h>
    3232#include <rtems/seterr.h>
    3333
     
    4545  Watchdog_Interval                            ticks;
    4646  bool                                         do_wait = true;
    47   POSIX_Absolute_timeout_conversion_results_t  status;
     47  TOD_Absolute_timeout_conversion_results  status;
    4848  int                                          lock_status;
    4949
     
    5757   *  status into the appropriate error.
    5858   *
    59    *  If the status is POSIX_ABSOLUTE_TIMEOUT_INVALID,
    60    *  POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST, or POSIX_ABSOLUTE_TIMEOUT_IS_NOW,
     59   *  If the status is TOD_ABSOLUTE_TIMEOUT_INVALID,
     60   *  TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST, or TOD_ABSOLUTE_TIMEOUT_IS_NOW,
    6161   *  then we should not wait.
    6262   */
    63   status = _POSIX_Absolute_timeout_to_ticks( abstime, &ticks );
    64   if ( status != POSIX_ABSOLUTE_TIMEOUT_IS_IN_FUTURE )
     63  status = _TOD_Absolute_timeout_to_ticks( abstime, &ticks );
     64  if ( status != TOD_ABSOLUTE_TIMEOUT_IS_IN_FUTURE )
    6565    do_wait = false;
    6666
     
    7474   */
    7575  if ( !do_wait && (lock_status == EBUSY) ) {
    76     if ( lock_status == POSIX_ABSOLUTE_TIMEOUT_INVALID )
     76    if ( lock_status == TOD_ABSOLUTE_TIMEOUT_INVALID )
    7777      rtems_set_errno_and_return_minus_one( EINVAL );
    78     if ( lock_status == POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST ||
    79          lock_status == POSIX_ABSOLUTE_TIMEOUT_IS_NOW )
     78    if ( lock_status == TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST ||
     79         lock_status == TOD_ABSOLUTE_TIMEOUT_IS_NOW )
    8080      rtems_set_errno_and_return_minus_one( ETIMEDOUT );
    8181  }
  • cpukit/posix/src/semtrywait.c

    rf7d95581 r21789a21  
    2929#include <rtems/system.h>
    3030#include <rtems/posix/semaphoreimpl.h>
    31 #include <rtems/posix/time.h>
    3231#include <rtems/seterr.h>
    3332
  • cpukit/posix/src/semunlink.c

    rf7d95581 r21789a21  
    2929#include <rtems/system.h>
    3030#include <rtems/posix/semaphoreimpl.h>
    31 #include <rtems/posix/time.h>
    3231#include <rtems/seterr.h>
    3332
  • cpukit/posix/src/semwait.c

    rf7d95581 r21789a21  
    2929#include <rtems/system.h>
    3030#include <rtems/posix/semaphoreimpl.h>
    31 #include <rtems/posix/time.h>
    3231#include <rtems/seterr.h>
    3332
  • cpukit/posix/src/sigtimedwait.c

    rf7d95581 r21789a21  
    2727#include <rtems/score/threadqimpl.h>
    2828#include <rtems/seterr.h>
    29 #include <rtems/posix/time.h>
    3029#include <rtems/score/isr.h>
    3130
  • cpukit/posix/src/timercreate.c

    rf7d95581 r21789a21  
    2929#include <rtems/score/thread.h>
    3030#include <rtems/posix/sigset.h>
    31 #include <rtems/posix/time.h>
    3231#include <rtems/posix/timerimpl.h>
    3332#include <rtems/score/watchdogimpl.h>
  • cpukit/posix/src/timerdelete.c

    rf7d95581 r21789a21  
    2929#include <rtems/score/thread.h>
    3030#include <rtems/score/watchdogimpl.h>
    31 #include <rtems/posix/time.h>
    3231#include <rtems/posix/timerimpl.h>
    3332
  • cpukit/posix/src/timersettime.c

    rf7d95581 r21789a21  
    2424#include <errno.h>
    2525
    26 #include <rtems/posix/time.h>
    2726#include <rtems/posix/ptimer.h>
    2827#include <rtems/posix/timerimpl.h>
  • cpukit/posix/src/timertsr.c

    rf7d95581 r21789a21  
    2525#include <signal.h>
    2626
    27 #include <rtems/posix/time.h>
    2827#include <rtems/posix/ptimer.h>
    2928#include <rtems/posix/timerimpl.h>
  • cpukit/posix/src/ualarm.c

    rf7d95581 r21789a21  
    2424#include <rtems/posix/pthreadimpl.h>
    2525#include <rtems/posix/psignalimpl.h>
    26 #include <rtems/posix/time.h>
    2726#include <rtems/score/threaddispatch.h>
    2827#include <rtems/score/todimpl.h>
  • cpukit/sapi/src/posixapi.c

    rf7d95581 r21789a21  
    4444#include <rtems/posix/semaphoreimpl.h>
    4545#include <rtems/posix/spinlockimpl.h>
    46 #include <rtems/posix/time.h>
    4746#endif
    4847
  • cpukit/score/Makefile.am

    rf7d95581 r21789a21  
    325325    src/coretodtickspersec.c \
    326326    src/coretodadjust.c
     327libscore_a_SOURCES += src/coretodabsolutetimeout.c
    327328
    328329## WATCHDOG_C_FILES
  • cpukit/score/include/rtems/score/todimpl.h

    rf7d95581 r21789a21  
    2222#include <rtems/score/timestamp.h>
    2323#include <rtems/score/timecounterimpl.h>
     24#include <rtems/score/watchdog.h>
    2425
    2526#include <sys/time.h>
     
    340341}
    341342
     343/**
     344 * @brief Absolute timeout conversion results.
     345 *
     346 * This enumeration defines the possible results of converting
     347 * an absolute time used for timeouts to POSIX blocking calls to
     348 * a number of ticks for example.
     349 */
     350typedef enum {
     351  /** The timeout is invalid. */
     352  TOD_ABSOLUTE_TIMEOUT_INVALID,
     353  /** The timeout represents a time that is in the past. */
     354  TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST,
     355  /** The timeout represents a time that is equal to the current time. */
     356  TOD_ABSOLUTE_TIMEOUT_IS_NOW,
     357  /** The timeout represents a time that is in the future. */
     358  TOD_ABSOLUTE_TIMEOUT_IS_IN_FUTURE,
     359} TOD_Absolute_timeout_conversion_results;
     360
     361/**
     362 * @brief Convert absolute timeout to ticks.
     363 *
     364 * This method takes an absolute time being used as a timeout
     365 * to a blocking directive, validates it and returns the number
     366 * of corresponding clock ticks for use by the SuperCore.
     367 *
     368 * @param[in] abstime is a pointer to the timeout
     369 * @param[out] ticks_out will contain the number of ticks
     370 *
     371 * @return This method returns the number of ticks in @a ticks_out
     372 *         and a status value indicating whether the absolute time
     373 *         is valid, in the past, equal to the current time or in
     374 *         the future as it should be.
     375 */
     376TOD_Absolute_timeout_conversion_results _TOD_Absolute_timeout_to_ticks(
     377  const struct timespec *abstime,
     378  Watchdog_Interval     *ticks_out
     379);
     380
    342381/**@}*/
    343382
  • cpukit/score/src/coretodabsolutetimeout.c

    rf7d95581 r21789a21  
    33 *
    44 * @brief Convert Absolute Timeout to Ticks
    5  * @ingroup POSIX_TIMETYPES Time Types
     5 * @ingroup ScoreTOD
    66 */
    77
     
    1919#endif
    2020
    21 #include <stdarg.h>
    22 
    23 #include <errno.h>
    24 #include <fcntl.h>
    25 #include <pthread.h>
    26 #include <semaphore.h>
    27 #include <limits.h>
    28 
    29 #include <rtems/posix/semaphoreimpl.h>
    30 #include <rtems/posix/time.h>
    3121#include <rtems/score/todimpl.h>
    32 #include <rtems/seterr.h>
    3322
    3423/*
    3524 *  The abstime is a walltime.  We turn it into an interval.
    3625 */
    37 POSIX_Absolute_timeout_conversion_results_t _POSIX_Absolute_timeout_to_ticks(
     26TOD_Absolute_timeout_conversion_results _TOD_Absolute_timeout_to_ticks(
    3827  const struct timespec *abstime,
    3928  Watchdog_Interval     *ticks_out
     
    5342   */
    5443  if ( !_Timespec_Is_valid(abstime) )
    55     return POSIX_ABSOLUTE_TIMEOUT_INVALID;
     44    return TOD_ABSOLUTE_TIMEOUT_INVALID;
    5645
    5746  /*
     
    6150
    6251  if ( _Timespec_Less_than( abstime, &current_time ) )
    63     return POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST;
     52    return TOD_ABSOLUTE_TIMEOUT_IS_IN_PAST;
    6453
    6554  /*
     
    7867   */
    7968  if ( !*ticks_out )
    80     return POSIX_ABSOLUTE_TIMEOUT_IS_NOW;
     69    return TOD_ABSOLUTE_TIMEOUT_IS_NOW;
    8170
    8271  /*
     
    8473   *  get here.
    8574   */
    86   return POSIX_ABSOLUTE_TIMEOUT_IS_IN_FUTURE;
     75  return TOD_ABSOLUTE_TIMEOUT_IS_IN_FUTURE;
    8776}
    8877
Note: See TracChangeset for help on using the changeset viewer.