From 600a241e3bb0d0c47fd5abe7db3d33fa4a4c7b86 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 13 Dec 2006 15:52:00 +0000 Subject: 2006-12-13 Joel Sherrill * librtems++/include/rtems++/rtemsEvent.h, librtems++/include/rtems++/rtemsMessageQueue.h, librtems++/include/rtems++/rtemsSemaphore.h, librtems++/include/rtems++/rtemsTask.h, librtems++/src/rtemsEvent.cc, librtems++/src/rtemsMessageQueue.cc, librtems++/src/rtemsSemaphore.cc, librtems++/src/rtemsTask.cc: Change rtems_unsigned32 to uint32_t. --- c/src/librtems++/include/rtems++/rtemsEvent.h | 4 +-- .../librtems++/include/rtems++/rtemsMessageQueue.h | 36 +++++++++++----------- c/src/librtems++/include/rtems++/rtemsSemaphore.h | 12 ++++---- c/src/librtems++/include/rtems++/rtemsTask.h | 16 +++++----- c/src/librtems++/src/rtemsEvent.cc | 4 +-- c/src/librtems++/src/rtemsMessageQueue.cc | 12 ++++---- c/src/librtems++/src/rtemsSemaphore.cc | 8 ++--- c/src/librtems++/src/rtemsTask.cc | 16 +++++----- 8 files changed, 54 insertions(+), 54 deletions(-) (limited to 'c/src/librtems++') diff --git a/c/src/librtems++/include/rtems++/rtemsEvent.h b/c/src/librtems++/include/rtems++/rtemsEvent.h index da1b6851f3..ea41d4919e 100644 --- a/c/src/librtems++/include/rtems++/rtemsEvent.h +++ b/c/src/librtems++/include/rtems++/rtemsEvent.h @@ -43,7 +43,7 @@ public: // only the first 4 characters of the name are taken // connect to a task - rtemsEvent(const char* name, rtems_unsigned32 node = RTEMS_SEARCH_ALL_NODES); + rtemsEvent(const char* name, uint32_t node = RTEMS_SEARCH_ALL_NODES); // copy and default constructors rtemsEvent(const rtemsEvent& event); @@ -54,7 +54,7 @@ public: // connect to an existing task object, will not be the owner const rtemsEvent& operator=(const rtemsEvent& event); virtual const rtems_status_code connect(const char *name, - const rtems_unsigned32 node = RTEMS_SEARCH_ALL_NODES); + const uint32_t node = RTEMS_SEARCH_ALL_NODES); // send an event inline const rtems_status_code send(const rtems_id task, diff --git a/c/src/librtems++/include/rtems++/rtemsMessageQueue.h b/c/src/librtems++/include/rtems++/rtemsMessageQueue.h index 9c899ee655..704b0c657f 100644 --- a/c/src/librtems++/include/rtems++/rtemsMessageQueue.h +++ b/c/src/librtems++/include/rtems++/rtemsMessageQueue.h @@ -59,13 +59,13 @@ public: // creates a message queue rtemsMessageQueue(const char* name, - const rtems_unsigned32 count, - const rtems_unsigned32 max_message_size, + const uint32_t count, + const uint32_t max_message_size, const WaitMode wait_mode = wait_by_fifo, const Scope scope = local); // connects to a message queue - rtemsMessageQueue(const char *name, const rtems_unsigned32 node = RTEMS_SEARCH_ALL_NODES); + rtemsMessageQueue(const char *name, const uint32_t node = RTEMS_SEARCH_ALL_NODES); // copy and default constructors rtemsMessageQueue(const rtemsMessageQueue& message_queue); @@ -76,8 +76,8 @@ public: // create or destroy (delete) the message queue virtual const rtems_status_code create(const char* name, - const rtems_unsigned32 count, - const rtems_unsigned32 max_message_size, + const uint32_t count, + const uint32_t max_message_size, const WaitMode wait_mode = wait_by_fifo, const Scope scope = local); virtual const rtems_status_code destroy(); @@ -85,25 +85,25 @@ public: // connect to an existing message queue object, will not be the owner const rtemsMessageQueue& operator=(const rtemsMessageQueue& message_queue); virtual const rtems_status_code connect(const char *name, - const rtems_unsigned32 node = RTEMS_SEARCH_ALL_NODES); + const uint32_t node = RTEMS_SEARCH_ALL_NODES); // send a message of size from the buffer inline const rtems_status_code send(const void *buffer, - const rtems_unsigned32 size); + const uint32_t size); inline const rtems_status_code urgent(const void *buffer, - const rtems_unsigned32 size); + const uint32_t size); inline const rtems_status_code broadcast(const void *buffer, - const rtems_unsigned32 size, - rtems_unsigned32& count); + const uint32_t size, + uint32_t& count); // receive a message of size, the timeout is in micro-secs inline const rtems_status_code receive(const void *buffer, - rtems_unsigned32& size, + uint32_t& size, rtems_interval micro_secs = RTEMS_NO_TIMEOUT, bool wait = true); // flush a message queue, returning the number of messages dropped - inline const rtems_status_code flush(rtems_unsigned32& size); + inline const rtems_status_code flush(uint32_t& size); // object id, and name const rtems_id id_is() const { return id; } @@ -128,20 +128,20 @@ private: }; const rtems_status_code rtemsMessageQueue::send(const void *buffer, - const rtems_unsigned32 size) + const uint32_t size) { return set_status_code(rtems_message_queue_send(id, (void*) buffer, size)); } const rtems_status_code rtemsMessageQueue::urgent(const void *buffer, - const rtems_unsigned32 size) + const uint32_t size) { return set_status_code(rtems_message_queue_urgent(id, (void*) buffer, size)); } const rtems_status_code rtemsMessageQueue::broadcast(const void *buffer, - const rtems_unsigned32 size, - rtems_unsigned32& count) + const uint32_t size, + uint32_t& count) { return set_status_code(rtems_message_queue_broadcast(id, (void*) buffer, @@ -150,7 +150,7 @@ const rtems_status_code rtemsMessageQueue::broadcast(const void *buffer, } const rtems_status_code rtemsMessageQueue::receive(const void *buffer, - rtems_unsigned32& size, + uint32_t& size, rtems_interval micro_secs, bool wait) { @@ -164,7 +164,7 @@ const rtems_status_code rtemsMessageQueue::receive(const void *buffer, TOD_MICROSECONDS_TO_TICKS(usecs))); } -const rtems_status_code rtemsMessageQueue::flush(rtems_unsigned32& count) +const rtems_status_code rtemsMessageQueue::flush(uint32_t& count) { return set_status_code(rtems_message_queue_flush(id, &count)); } diff --git a/c/src/librtems++/include/rtems++/rtemsSemaphore.h b/c/src/librtems++/include/rtems++/rtemsSemaphore.h index 997a4a8364..be68a0513e 100644 --- a/c/src/librtems++/include/rtems++/rtemsSemaphore.h +++ b/c/src/librtems++/include/rtems++/rtemsSemaphore.h @@ -64,7 +64,7 @@ public: // create a semaphore object rtemsSemaphore(const char* name, const Scope scope = local, - const rtems_unsigned32 counter = 1, + const uint32_t counter = 1, const WaitMode wait_mode = wait_by_fifo, const Type type = binary, const Priority priority = no_priority_inherit, @@ -72,7 +72,7 @@ public: const rtems_task_priority priority_ceiling = 0); // connect to an existing semaphore object by name - rtemsSemaphore(const char *name, const rtems_unsigned32 node); + rtemsSemaphore(const char *name, const uint32_t node); // attach this object to an other objects semaphore rtemsSemaphore(const rtemsSemaphore& semaphore); @@ -84,7 +84,7 @@ public: // create or destroy (delete) a semaphore virtual const rtems_status_code create(const char* name, const Scope scope = local, - const rtems_unsigned32 counter = 1, + const uint32_t counter = 1, const WaitMode wait_mode = wait_by_fifo, const Type type = binary, const Priority priority = no_priority_inherit, @@ -94,11 +94,11 @@ public: // connect to an existing semaphore object, will not be the owner const rtemsSemaphore& operator=(const rtemsSemaphore& semaphore); - virtual const rtems_status_code connect(const char *name, rtems_unsigned32 node); + virtual const rtems_status_code connect(const char *name, uint32_t node); // obtain the semaphore, timeout is in micro-seconds inline const rtems_status_code obtain(bool wait = true, - const rtems_unsigned32 micro_secs = RTEMS_NO_TIMEOUT); + const uint32_t micro_secs = RTEMS_NO_TIMEOUT); // release the semaphore, blocks threads eligble inline const rtems_status_code release(); @@ -126,7 +126,7 @@ private: }; const rtems_status_code rtemsSemaphore::obtain(const bool wait, - const rtems_unsigned32 micro_secs) + const uint32_t micro_secs) { rtems_interval usecs = micro_secs && (micro_secs < _TOD_Microseconds_per_tick) ? diff --git a/c/src/librtems++/include/rtems++/rtemsTask.h b/c/src/librtems++/include/rtems++/rtemsTask.h index d01315b8a2..45e6de156f 100644 --- a/c/src/librtems++/include/rtems++/rtemsTask.h +++ b/c/src/librtems++/include/rtems++/rtemsTask.h @@ -76,7 +76,7 @@ public: // creates a task rtemsTask(const char* name, const rtems_task_priority initial_priority, - const rtems_unsigned32 stack_size, + const uint32_t stack_size, const rtems_mode preemption = RTEMS_NO_PREEMPT, const rtems_mode timeslice = RTEMS_NO_TIMESLICE, const rtems_mode asr = RTEMS_NO_ASR, @@ -85,7 +85,7 @@ public: const Scope scope = local); // connects to a task - rtemsTask(const char *name, const rtems_unsigned32 node = RTEMS_SEARCH_ALL_NODES); + rtemsTask(const char *name, const uint32_t node = RTEMS_SEARCH_ALL_NODES); // copy and default constructors rtemsTask(const rtemsTask& task); @@ -97,7 +97,7 @@ public: // create or destroy (delete) the task virtual const rtems_status_code create(const char* name, const rtems_task_priority initial_priority, - const rtems_unsigned32 stack_size, + const uint32_t stack_size, const rtems_mode preemption = RTEMS_NO_PREEMPT, const rtems_mode timeslice = RTEMS_NO_TIMESLICE, const rtems_mode asr = RTEMS_NO_ASR, @@ -109,7 +109,7 @@ public: // connect to an existing task object, will not be the owner const rtemsTask& operator=(const rtemsTask& task); virtual const rtems_status_code connect(const char *name, - const rtems_unsigned32 node = RTEMS_SEARCH_ALL_NODES); + const uint32_t node = RTEMS_SEARCH_ALL_NODES); // run control virtual const rtems_status_code start(const rtems_task_argument argument); @@ -128,10 +128,10 @@ public: rtems_task_priority& old_priority); // notepad control - const rtems_status_code get_note(const rtems_unsigned32 notepad, - rtems_unsigned32& note); - const rtems_status_code set_note(const rtems_unsigned32 notepad, - const rtems_unsigned32 note); + const rtems_status_code get_note(const uint32_t notepad, + uint32_t& note); + const rtems_status_code set_note(const uint32_t notepad, + const uint32_t note); // object id, and name const rtems_id id_is() const { return id; } diff --git a/c/src/librtems++/src/rtemsEvent.cc b/c/src/librtems++/src/rtemsEvent.cc index 4658fe2607..34bcbfb828 100644 --- a/c/src/librtems++/src/rtemsEvent.cc +++ b/c/src/librtems++/src/rtemsEvent.cc @@ -24,7 +24,7 @@ rtemsEvent */ -rtemsEvent::rtemsEvent(const char *name_str, rtems_unsigned32 node) +rtemsEvent::rtemsEvent(const char *name_str, uint32_t node) : name(rtems_build_name('S', 'E', 'L', 'F')), id(RTEMS_SELF) { @@ -56,7 +56,7 @@ const rtemsEvent& rtemsEvent::operator=(const rtemsEvent& event) } const rtems_status_code rtemsEvent::connect(const char *name_str, - const rtems_unsigned32 node) + const uint32_t node) { name = rtems_build_name(name_str[0], name_str[1], diff --git a/c/src/librtems++/src/rtemsMessageQueue.cc b/c/src/librtems++/src/rtemsMessageQueue.cc index 850dbe0cab..6e6ff89d68 100644 --- a/c/src/librtems++/src/rtemsMessageQueue.cc +++ b/c/src/librtems++/src/rtemsMessageQueue.cc @@ -26,8 +26,8 @@ */ rtemsMessageQueue::rtemsMessageQueue(const char* mqname, - const rtems_unsigned32 count, - const rtems_unsigned32 max_message_size, + const uint32_t count, + const uint32_t max_message_size, const WaitMode wait_mode, const Scope scope) : name(0), @@ -39,7 +39,7 @@ rtemsMessageQueue::rtemsMessageQueue(const char* mqname, } rtemsMessageQueue::rtemsMessageQueue(const char *mqname, - const rtems_unsigned32 node) + const uint32_t node) : name(0), owner(false), id(0) @@ -80,8 +80,8 @@ void rtemsMessageQueue::make_invalid() } const rtems_status_code rtemsMessageQueue::create(const char* mqname, - const rtems_unsigned32 count, - const rtems_unsigned32 max_message_size, + const uint32_t count, + const uint32_t max_message_size, const WaitMode wait_mode, const Scope scope) { @@ -138,7 +138,7 @@ const rtemsMessageQueue& rtemsMessageQueue::operator=(const rtemsMessageQueue& m } const rtems_status_code rtemsMessageQueue::connect(const char *mqname, - const rtems_unsigned32 node) + const uint32_t node) { if (id && owner) return set_status_code(RTEMS_UNSATISFIED); diff --git a/c/src/librtems++/src/rtemsSemaphore.cc b/c/src/librtems++/src/rtemsSemaphore.cc index f7d9fda42a..5368b0cd05 100644 --- a/c/src/librtems++/src/rtemsSemaphore.cc +++ b/c/src/librtems++/src/rtemsSemaphore.cc @@ -27,7 +27,7 @@ rtemsSemaphore::rtemsSemaphore(const char* sname, const Scope scope, - const rtems_unsigned32 counter, + const uint32_t counter, const WaitMode wait_mode, const Type type, const Priority priority, @@ -48,7 +48,7 @@ rtemsSemaphore::rtemsSemaphore(const char* sname, priority_ceiling); } -rtemsSemaphore::rtemsSemaphore(const char *sname, const rtems_unsigned32 node) +rtemsSemaphore::rtemsSemaphore(const char *sname, const uint32_t node) : name(0), owner(false), id(0) @@ -90,7 +90,7 @@ void rtemsSemaphore::make_invalid() const rtems_status_code rtemsSemaphore::create(const char* sname, const Scope scope, - const rtems_unsigned32 counter, + const uint32_t counter, const WaitMode wait_mode, const Type type, const Priority priority, @@ -148,7 +148,7 @@ const rtemsSemaphore& rtemsSemaphore::operator=(const rtemsSemaphore& semaphore) } const rtems_status_code rtemsSemaphore::connect(const char *sname, - const rtems_unsigned32 node) + const uint32_t node) { if (id && owner) return set_status_code(RTEMS_UNSATISFIED); diff --git a/c/src/librtems++/src/rtemsTask.cc b/c/src/librtems++/src/rtemsTask.cc index 845aeb54d9..de02dba9c6 100644 --- a/c/src/librtems++/src/rtemsTask.cc +++ b/c/src/librtems++/src/rtemsTask.cc @@ -29,7 +29,7 @@ rtemsTask::rtemsTask(const char* tname, const rtems_task_priority initial_priority, - const rtems_unsigned32 stack_size, + const uint32_t stack_size, const rtems_mode preemption, const rtems_mode timeslice, const rtems_mode asr, @@ -53,7 +53,7 @@ rtemsTask::rtemsTask(const char* tname, scope); } -rtemsTask::rtemsTask(const char *tname, rtems_unsigned32 node) +rtemsTask::rtemsTask(const char *tname, uint32_t node) : name(rtems_build_name('S', 'E', 'L', 'F')), owner(false), id(RTEMS_SELF), @@ -99,7 +99,7 @@ void rtemsTask::make_self() const rtems_status_code rtemsTask::create(const char* tname, const rtems_task_priority initial_priority, - const rtems_unsigned32 stack_size, + const uint32_t stack_size, const rtems_mode preemption, const rtems_mode timeslice, const rtems_mode asr, @@ -165,7 +165,7 @@ const rtemsTask& rtemsTask::operator=(const rtemsTask& task) } const rtems_status_code rtemsTask::connect(const char *sname, - const rtems_unsigned32 node) + const uint32_t node) { if (id && owner) return set_status_code(RTEMS_UNSATISFIED); @@ -265,14 +265,14 @@ const rtems_status_code rtemsTask::set_priority(const rtems_task_priority priori &old_priority)); } -const rtems_status_code rtemsTask::get_note(const rtems_unsigned32 notepad, - rtems_unsigned32& note) +const rtems_status_code rtemsTask::get_note(const uint32_t notepad, + uint32_t& note) { return set_status_code(rtems_task_get_note(id, notepad, ¬e)); } -const rtems_status_code rtemsTask::set_note(const rtems_unsigned32 notepad, - const rtems_unsigned32 note) +const rtems_status_code rtemsTask::set_note(const uint32_t notepad, + const uint32_t note) { return set_status_code(rtems_task_set_note(id, notepad, note)); } -- cgit v1.2.3