[rtos] Update processing module for a:FreeRTOS

modm-io · Apr 26, 2019 · 578b9e2 · 578b9e2
1 parent 5ca7270
commit 578b9e2
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 27 deletions.
diff --git a/src/modm/processing/rtos/freertos/mutex.cpp b/src/modm/processing/rtos/freertos/mutex.cpp
@@ -26,7 +26,7 @@ modm::rtos::Mutex::~Mutex()
 
 // ----------------------------------------------------------------------------
 bool
-modm::rtos::Mutex::acquire(portTickType timeout)
+modm::rtos::Mutex::acquire(TickType_t timeout)
 {
 	return (xSemaphoreTake(this->handle, timeout) == pdTRUE);
 }

diff --git a/src/modm/processing/rtos/freertos/mutex.hpp b/src/modm/processing/rtos/freertos/mutex.hpp
@@ -42,7 +42,7 @@ namespace modm
 			~Mutex();
 
 			bool
-			acquire(portTickType timeout = portMAX_DELAY);
+			acquire(TickType_t timeout = portMAX_DELAY);
 
 			void
 			release();
@@ -55,7 +55,7 @@ namespace modm
 			Mutex&
 			operator = (const Mutex& other);
 
-			xSemaphoreHandle handle;
+			SemaphoreHandle_t handle;
 		};
 
 		/**

diff --git a/src/modm/processing/rtos/freertos/queue.cpp b/src/modm/processing/rtos/freertos/queue.cpp
@@ -27,25 +27,25 @@ modm::rtos::QueueBase::~QueueBase()
 
 // ----------------------------------------------------------------------------
 bool
-modm::rtos::QueueBase::append(const void *item, portTickType timeout)
+modm::rtos::QueueBase::append(const void *item, TickType_t timeout)
 {
 	return (xQueueSendToBack(this->handle, item, timeout) == pdTRUE);
 }
 
 bool
-modm::rtos::QueueBase::prepend(const void *item, portTickType timeout)
+modm::rtos::QueueBase::prepend(const void *item, TickType_t timeout)
 {
 	return (xQueueSendToFront(this->handle, item, timeout) == pdTRUE);
 }
 
 bool
-modm::rtos::QueueBase::peek(void *item, portTickType timeout) const
+modm::rtos::QueueBase::peek(void *item, TickType_t timeout) const
 {
 	return (xQueuePeek(this->handle, item, timeout) == pdTRUE);
 }
 
 bool
-modm::rtos::QueueBase::get(void *item, portTickType timeout)
+modm::rtos::QueueBase::get(void *item, TickType_t timeout)
 {
 	return (xQueueReceive(this->handle, item, timeout) == pdTRUE);
 }

diff --git a/src/modm/processing/rtos/freertos/queue.hpp b/src/modm/processing/rtos/freertos/queue.hpp
@@ -55,16 +55,16 @@ namespace modm
 			 * routine. Use appendFromInterrupt() for this purpose.
 			 */
 			bool
-			append(const void *item, portTickType timeout = portMAX_DELAY);
+			append(const void *item, TickType_t timeout = portMAX_DELAY);
 
 			bool
-			prepend(const void *item, portTickType timeout = portMAX_DELAY);
+			prepend(const void *item, TickType_t timeout = portMAX_DELAY);
 
 			bool
-			peek(void *item, portTickType timeout = portMAX_DELAY) const;
+			peek(void *item, TickType_t timeout = portMAX_DELAY) const;
 
 			bool
-			get(void *item, portTickType timeout = portMAX_DELAY);
+			get(void *item, TickType_t timeout = portMAX_DELAY);
 
 			bool
 			appendFromInterrupt(const void *item);
@@ -76,7 +76,7 @@ namespace modm
 			getFromInterrupt(void *item);
 
 		protected:
-			xQueueHandle handle;
+			QueueHandle_t handle;
 
 		private:
 			// disable copy constructor
@@ -105,25 +105,25 @@ namespace modm
 			using QueueBase::getSize;
 
 			inline bool
-			append(const T& item, portTickType timeout = portMAX_DELAY)
+			append(const T& item, TickType_t timeout = portMAX_DELAY)
 			{
 				return QueueBase::append(&item, timeout);
 			}
 
 			inline bool
-			prepend(const T& item, portTickType timeout = portMAX_DELAY)
+			prepend(const T& item, TickType_t timeout = portMAX_DELAY)
 			{
 				return QueueBase::prepend(&item, timeout);
 			}
 
 			inline bool
-			peek(T& item, portTickType timeout = portMAX_DELAY)
+			peek(T& item, TickType_t timeout = portMAX_DELAY)
 			{
 				return QueueBase::peek(&item, timeout);
 			}
 
 			inline bool
-			get(T& item, portTickType timeout = portMAX_DELAY)
+			get(T& item, TickType_t timeout = portMAX_DELAY)
 			{
 				return QueueBase::get(&item, timeout);
 			}

diff --git a/src/modm/processing/rtos/freertos/scheduler.hpp b/src/modm/processing/rtos/freertos/scheduler.hpp
@@ -71,7 +71,7 @@ namespace modm
 			}
 
 			/// The count of ticks since Scheduler::schedule() was called
-			static inline portTickType
+			static inline TickType_t
 			getTicks()
 			{
 				return xTaskGetTickCount();

diff --git a/src/modm/processing/rtos/freertos/semaphore.cpp b/src/modm/processing/rtos/freertos/semaphore.cpp
@@ -22,7 +22,7 @@ modm::rtos::SemaphoreBase::~SemaphoreBase()
 
 // ----------------------------------------------------------------------------
 bool
-modm::rtos::SemaphoreBase::acquire(portTickType timeout)
+modm::rtos::SemaphoreBase::acquire(TickType_t timeout)
 {
 
 	return (xSemaphoreTake(this->handle, timeout) == pdTRUE);

diff --git a/src/modm/processing/rtos/freertos/semaphore.hpp b/src/modm/processing/rtos/freertos/semaphore.hpp
@@ -36,7 +36,7 @@ namespace modm
 			 * 'take' or 'wait' in other implementations.
 			 */
 			bool
-			acquire(portTickType timeout = portMAX_DELAY);
+			acquire(TickType_t timeout = portMAX_DELAY);
 
 			/**
 			 * \brief	Release the semaphore
@@ -61,7 +61,7 @@ namespace modm
 			{
 			}
 
-			xSemaphoreHandle handle;
+			SemaphoreHandle_t handle;
 
 		private:
 			// disable copy constructor

diff --git a/src/modm/processing/rtos/freertos/thread.cpp b/src/modm/processing/rtos/freertos/thread.cpp
@@ -48,7 +48,7 @@ modm::rtos::Thread::Thread(uint32_t priority,
 {
 	xTaskCreate(
 			&wrapper,
-			(const signed char*) name,
+			name ? name : "anon",
 			(stackDepth / 4) + 1,
 			this,
 			priority,

diff --git a/src/modm/processing/rtos/freertos/thread.hpp b/src/modm/processing/rtos/freertos/thread.hpp
@@ -42,9 +42,9 @@
  * \ingroup	modm_processing_rtos
  */
 #define	TIME_LOOP(frequency)										\
-		for(portTickType lastTime = xTaskGetTickCount() ;			\
+		for(TickType_t lastTime = xTaskGetTickCount() ;			\
 			vTaskDelayUntil(&lastTime,								\
-					static_cast<portTickType>(frequency)), true ;	\
+					static_cast<TickType_t>(frequency)), true ;	\
 			)
 
 /**
@@ -61,7 +61,7 @@
  *
  * For non constant value use the following formula:
  * \code
- * static_cast<portTickType>((time * configTICK_RATE_HZ) / 1000)
+ * static_cast<TickType_t>((time * configTICK_RATE_HZ) / 1000)
  * \endcode
  * The parentheses are important because otherwise the division might be done
  * first which will lead to wrong results.
@@ -124,7 +124,7 @@ namespace modm
 			 */
 			Thread(uint32_t priority = 0,
 					uint16_t stackDepth = minimalStackSize,
-					const char* name = NULL);
+					const char* name = nullptr);
 
 			/// Delete the thread
 			virtual ~Thread();
@@ -182,7 +182,7 @@ namespace modm
 			 * \see		MILLISECONDS
 			 */
 			static inline void
-			sleep(portTickType ticks)
+			sleep(TickType_t ticks)
 			{
 				vTaskDelay(ticks);
 			}
@@ -220,7 +220,7 @@ namespace modm
 			Thread&
 			operator = (const Thread& other);
 
-			xTaskHandle handle;
+			TaskHandle_t handle;
 		};
 	}
 }