Commit: 5bc4a729112383c7e15a3c1219f9cfca8f1ab853 - shared_foo_backup (git)

shared_fooの不要ディレクトリ削除前のもの

Commit MetaInfo

• Revision: 5bc4a729112383c7e15a3c1219f9cfca8f1ab853 (tree)
• Time: 2018-03-01 07:58:48
• Author: takemasa <suikan@user...>
• Commiter: takemasa

Log Message

Added new classes

Change Summary

• modified: stm32_development/murasaki/NUCLEO-F746ZG.xml
• modified: stm32_development/murasaki/murasaki/abstractfifo.hpp
• modified: stm32_development/murasaki/murasaki/debugger.cpp
• add: stm32_development/murasaki/murasaki/debuggerfifo.cpp
• add: stm32_development/murasaki/murasaki/debuggerfifo.hpp

Incremental Difference

--- a/stm32_development/murasaki/NUCLEO-F746ZG.xml
+++ b/stm32_development/murasaki/NUCLEO-F746ZG.xml
@@ -12,8 +12,8 @@
 <targetDefinitions>
   <board id="nucleo-f746zg">
     <name>NUCLEO-F746ZG</name>
-    <dbgIF>JTAG</dbgIF>
     <dbgIF>SWD</dbgIF>
+    <dbgIF>JTAG</dbgIF>
     <dbgDEV>ST-Link</dbgDEV>
     <mcuId>stm32f746zgtx</mcuId>
   </board>

--- a/stm32_development/murasaki/murasaki/abstractfifo.hpp
+++ b/stm32_development/murasaki/murasaki/abstractfifo.hpp
@@ -23,7 +23,7 @@ namespace murasaki {
  *
  * The Get member funciton returns with "copied" data count and data.
  * If the internal buffer is empty, it returns without copy data.
- *
+ * @ingroup MURASAKI_ABSTRACT_GROUP
  */
 class AbstractFifo
 {
@@ -46,18 +46,18 @@ class AbstractFifo
      * @param size Data count to be copied
      * @return The count of copied data. 0, if the internal buffer is full.
      */
-    unsigned int Put(uint8_t const data[], unsigned int size);
+    virtual unsigned int Put(uint8_t const data[], unsigned int size);
     /**
      * @brief Get the data from the internal buffer.
      * @param data Data buffer to receive from the internal buffer
      * @param size Size of the data parameter.
      * @return The count of copied data. 0, if the internal buffer is empty
      */
-    unsigned int Get(uint8_t data[], unsigned int size);
+    virtual unsigned int Get(uint8_t data[], unsigned int size);
     /*
      * @brief Mark all the data inside the internal buffer as "not sent".
      */
-    void ReWind();
+    virtual void ReWind();
  private:
     /**
      * @brief The index of where next data will be written.

--- a/stm32_development/murasaki/murasaki/debugger.cpp
+++ b/stm32_development/murasaki/murasaki/debugger.cpp
@@ -71,7 +71,7 @@ void Debugger::printf(const char * fmt, ...)
 
     MURASAKI_ASSERT(nullptr != fmt);  // nullptr check. Perhaps, overkill.
 
-    ::portDISABLE_INTERRUPTS();   // ARM dependent API. OK to use in task and ISR.
+    portDISABLE_INTERRUPTS();   // ARM dependent API. OK to use in task and ISR.
     {
 #if 0
         // Test the remains of task stack in byte.
@@ -94,7 +94,7 @@ void Debugger::printf(const char * fmt, ...)
         // Append the line to the buffer to be sent.
         AppendToBuffer();
     }
-    ::portENABLE_INTERRUPTS();
+    portENABLE_INTERRUPTS();
 
     // Notify to the consumer task, the new data has come.
     if (isTaskContext())    // Are we in the task context?
@@ -157,7 +157,7 @@ void Debugger::RePrint()
 {
     MURASAKI_ASSERT(isTaskContext());
 
-    ::taskENTER_CRITICAL();
+    taskENTER_CRITICAL();
     {
         // Mark the all old data as "not sent"
         // By setting the circular buffer length maximumn.
@@ -166,7 +166,7 @@ void Debugger::RePrint()
         if (tail_ >= sizeof(buffer_))
             tail_ = 0;
     }
-    ::taskEXIT_CRITICAL();
+    taskEXIT_CRITICAL();
 
     // tell there is data
     ::xSemaphoreGive(sem_notify_new_data_);
@@ -239,7 +239,7 @@ void Debugger::TxTask()
     while (true) {
         // To avoid race condition, Take a snapshot of the head_ and tail_ pointer.
         // head_ could be modified during this task is running but no problem.
-        ::taskENTER_CRITICAL();
+        taskENTER_CRITICAL();
         {
             // check whether the data area is wrapped araound at the end of buffer. Note : Data is added to the head.
             if (head_ > tail_) {    // not wrapped around
@@ -264,7 +264,7 @@ void Debugger::TxTask()
                 // head_ == tail_ . Do nothing.
                 copy_size = 0;
         }
-        ::taskEXIT_CRITICAL();
+        taskEXIT_CRITICAL();
 
         if (copy_size != 0)  // if copied
             logger_->putMessage((char *) block, copy_size);

--- /dev/null
+++ b/stm32_development/murasaki/murasaki/debuggerfifo.cpp
@@ -0,0 +1,74 @@
+/*
+ * debuggerfifo.cpp
+ *
+ *  Created on: 2018/03/01
+ *      Author: takemasa
+ */
+
+#include <FreeRTOS.h>
+#include <task.h>
+#include <semphr.h>
+
+#include "murasaki_defs.hpp"
+#include <debuggerfifo.hpp>
+#include "murasaki_assert.hpp"
+
+namespace murasaki {
+
+
+DebuggerFifo::DebuggerFifo(unsigned int buffer_size)
+        : AbstractFifo(buffer_size),
+          sync_(new Synchronizer())
+{
+    MURASAKI_ASSERT(sync_ != nullptr);
+}
+
+DebuggerFifo::~DebuggerFifo()
+{
+    if (sync_ != nullptr)
+        delete sync_;
+}
+
+unsigned int DebuggerFifo::Put(const uint8_t data[], unsigned int size)
+{
+    unsigned int ret_val;
+
+    portDISABLE_INTERRUPTS();
+    {
+        ret_val = inherited::Put(data, size);
+    }
+    portENABLE_INTERRUPTS();
+
+    sync_->ReleaseTask();
+
+    return ret_val;
+}
+
+unsigned int DebuggerFifo::Get(uint8_t data[], unsigned int size)
+{
+    MURASAKI_ASSERT(murasaki::isTaskContext())
+    unsigned int ret_val;
+
+    taskENTER_CRITICAL();
+    {
+        ret_val = inherited::Get(data, size);
+    }
+    taskEXIT_CRITICAL();
+
+    if ( ret_val == 0)
+        sync_->WaitForSignalFromTask();
+
+    return ret_val;
+
+}
+
+void DebuggerFifo::ReWind()
+{
+    portDISABLE_INTERRUPTS();
+    {
+        inherited::ReWind();
+    }
+    portENABLE_INTERRUPTS();
+}
+
+} /* namespace murasaki */

--- /dev/null
+++ b/stm32_development/murasaki/murasaki/debuggerfifo.hpp
@@ -0,0 +1,56 @@
+/*
+ * debuggerfifo.hpp
+ *
+ *  Created on: 2018/03/01
+ *      Author: takemasa
+ */
+
+#ifndef DEBUGGERFIFO_HPP_
+#define DEBUGGERFIFO_HPP_
+
+#include <abstractfifo.hpp>
+#include "synchronizer.hpp"
+
+namespace murasaki {
+
+class DebuggerFifo : public AbstractFifo
+{
+ public:
+    /**
+     * @brief Create an internal buffer
+     * @param buffer_size Size of the internal buffer to be allocated [byte]
+     * @details
+     * Allocate the internal buffer with given buffer_size.
+     */
+    DebuggerFifo(unsigned int buffer_size);
+    /**
+     * @brief Delete an internal buffer
+     */
+    virtual ~DebuggerFifo();
+    /**
+     * @brief Put the data into the internal buffer.
+     * @param data Data to be copied to the internal buffer
+     * @param size Data count to be copied
+     * @return The count of copied data. 0, if the internal buffer is full.
+     */
+    virtual unsigned int Put(uint8_t const data[], unsigned int size);
+    /**
+     * @brief Get the data from the internal buffer.
+     * @param data Data buffer to receive from the internal buffer
+     * @param size Size of the data parameter.
+     * @return The count of copied data. 0, if the internal buffer is empty
+     */
+    virtual unsigned int Get(uint8_t data[], unsigned int size);
+    /*
+     * @brief Mark all the data inside the internal buffer as "not sent".
+     */
+    virtual void ReWind();
+ private:
+    typedef AbstractFifo inherited;
+    Synchronizer * const sync_;
+
+};
+
+} /* namespace murasaki */
+
+#endif /* DEBUGGERFIFO_HPP_ */