From 5e87e645e0c03f0d6cf6ea4600bf1b2d0ddf0200 Mon Sep 17 00:00:00 2001 From: "W. Eric Norum" Date: Mon, 17 Dec 2007 19:47:51 +0000 Subject: [PATCH] Use standard types. --- src/libCom/osi/os/RTEMS/osdEvent.c | 2 +- src/libCom/osi/os/RTEMS/osdMessageQueue.c | 12 ++++++------ src/libCom/osi/os/RTEMS/osdThread.c | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/libCom/osi/os/RTEMS/osdEvent.c b/src/libCom/osi/os/RTEMS/osdEvent.c index 21217bdfa..9ac7b3ab9 100644 --- a/src/libCom/osi/os/RTEMS/osdEvent.c +++ b/src/libCom/osi/os/RTEMS/osdEvent.c @@ -131,7 +131,7 @@ epicsEventWaitWithTimeout(epicsEventId id, double timeOut) { rtems_id sid = (rtems_id)id; rtems_status_code sc; - rtems_unsigned32 wait; + uint32_t wait; rtems_interval delay; extern double rtemsTicksPerSecond_double; diff --git a/src/libCom/osi/os/RTEMS/osdMessageQueue.c b/src/libCom/osi/os/RTEMS/osdMessageQueue.c index 6615a46ee..bf703b978 100644 --- a/src/libCom/osi/os/RTEMS/osdMessageQueue.c +++ b/src/libCom/osi/os/RTEMS/osdMessageQueue.c @@ -78,7 +78,7 @@ epicsMessageQueueCreate(unsigned int capacity, unsigned int maximumMessageSize) static rtems_status_code rtems_message_queue_send_timeout( rtems_id id, void *buffer, - rtems_unsigned32 size, + uint32_t size, rtems_interval timeout) { Message_queue_Control *the_message_queue; @@ -158,11 +158,11 @@ epicsShareFunc int epicsShareAPI epicsMessageQueueSendWithTimeout( static int receiveMessage( epicsMessageQueueId id, void *buffer, - rtems_unsigned32 size, - rtems_unsigned32 wait, + uint32_t size, + uint32_t wait, rtems_interval delay) { - rtems_unsigned32 rsize; + uint32_t rsize; rtems_status_code sc; if (size < id->maxSize) { @@ -207,7 +207,7 @@ epicsShareFunc int epicsShareAPI epicsMessageQueueReceiveWithTimeout( double timeout) { rtems_interval delay; - rtems_unsigned32 wait; + uint32_t wait; extern double rtemsTicksPerSecond_double; /* @@ -229,7 +229,7 @@ epicsShareFunc int epicsShareAPI epicsMessageQueueReceiveWithTimeout( epicsShareFunc int epicsShareAPI epicsMessageQueuePending( epicsMessageQueueId id) { - rtems_unsigned32 count; + uint32_t count; rtems_status_code sc; sc = rtems_message_queue_get_number_pending(id->id, &count); diff --git a/src/libCom/osi/os/RTEMS/osdThread.c b/src/libCom/osi/os/RTEMS/osdThread.c index 7fd8cea2d..61a521756 100644 --- a/src/libCom/osi/os/RTEMS/osdThread.c +++ b/src/libCom/osi/os/RTEMS/osdThread.c @@ -192,7 +192,7 @@ static void setThreadInfo (rtems_id tid, const char *name, EPICSTHREADFUNC funptr,void *parm) { struct taskVar *v; - rtems_unsigned32 note; + uint32_t note; rtems_status_code sc; v = mallocMustSucceed (sizeof *v, "epicsThreadCreate_vars"); @@ -202,7 +202,7 @@ setThreadInfo (rtems_id tid, const char *name, EPICSTHREADFUNC funptr,void *parm v->parm = parm; v->threadVariableCapacity = 0; v->threadVariables = NULL; - note = (rtems_unsigned32)v; + note = (uint32_t)v; rtems_task_set_note (tid, RTEMS_NOTEPAD_TASKVAR, note); taskVarLock (); v->forw = taskVarHead; @@ -391,7 +391,7 @@ epicsThreadGetIdSelf (void) const char *epicsThreadGetNameSelf(void) { - rtems_unsigned32 note; + uint32_t note; struct taskVar *v; rtems_task_get_note (RTEMS_SELF, RTEMS_NOTEPAD_TASKVAR, ¬e); @@ -505,7 +505,7 @@ void epicsThreadPrivateDelete (epicsThreadPrivateId id) void epicsThreadPrivateSet (epicsThreadPrivateId id, void *pvt) { unsigned int varIndex = (unsigned int)id; - rtems_unsigned32 note; + uint32_t note; struct taskVar *v; int i; @@ -525,7 +525,7 @@ void epicsThreadPrivateSet (epicsThreadPrivateId id, void *pvt) void * epicsThreadPrivateGet (epicsThreadPrivateId id) { unsigned int varIndex = (unsigned int)id; - rtems_unsigned32 note; + uint32_t note; struct taskVar *v; rtems_task_get_note (RTEMS_SELF, RTEMS_NOTEPAD_TASKVAR, ¬e);