fixed some bugs

Author: EDI-Systems

MProkaron/Benchmark/test.c

@@ -2,12 +2,10 @@
 
 void Func_1(void* Param)
 {
-    ptr_t Time=0;
     while(1)
     {
         RMP_Thd_Delay(30000);
-        RMP_Thd_Snd(&Thd_2, Time, RMP_MAX_SLICES);
-        Time++;
+        RMP_Sem_Post(&Sem_1, 1);
     };
 }
 
@@ -16,15 +14,15 @@ void Func_2(void* Param)
     ptr_t Data;
     while(1)
     {
-        RMP_Thd_Rcv(&Data, RMP_MAX_SLICES);
-        RMP_PRINTK_S("Received ");
-        RMP_PRINTK_I(Data);
-        RMP_PRINTK_S("\r\n\r\n");
+        RMP_Sem_Pend(&Sem_1, RMP_MAX_SLICES);
+        RMP_PRINTK_S("Semaphore successfully acquired!\r\n\r\n");
     };
 }
 
 void RMP_Init_Hook(void)
 {
+    /* Counting semaphore */
+    RMP_Sem_Crt(&Sem_1,0);
     /* Start threads */
     RMP_Thd_Crt(&Thd_1, Func_1, &Stack_1[238], (void*)0x12345678, 1, 5);
     RMP_Thd_Crt(&Thd_2, Func_2, &Stack_2[238], (void*)0x87654321, 1, 5);

MProkaron/Benchmark/test.h

@@ -49,6 +49,8 @@ struct RMP_Thd Thd_1={0};
 ptr_t Stack_2[256];
 struct RMP_Thd Thd_2={0};
 
+struct RMP_Sem Sem_1={0};
+
 ptr_t Time;
 
 

MProkaron/Kernel/kernel.c

@@ -1244,9 +1244,10 @@ ret_t RMP_Sem_Pend(struct RMP_Sem* Semaphore, ptr_t Slices)
             return RMP_ERR_OPER;
         }
 
-        /* We must be running */
+        /* We must be running - place into waitlist now */
         _RMP_Clr_Rdy(RMP_Cur_Thd);
-
+        RMP_List_Ins(&(RMP_Cur_Thd->Run_Head),Semaphore->Wait_List.Prev,&(Semaphore->Wait_List));
+        
         if(Slices<RMP_MAX_SLICES)
         {
             _RMP_Dly_Ins(RMP_Cur_Thd, Slices);
@@ -1345,7 +1346,7 @@ ret_t RMP_Sem_Post(struct RMP_Sem* Semaphore, ptr_t Number)
 
     Semaphore->Cur_Num+=Number;
     /* Is there any thread waiting on it? If there are, clean them up*/
-    while((&(Semaphore->Wait_List)!=Semaphore->Wait_List.Next)||(Semaphore->Cur_Num==0))
+    while((&(Semaphore->Wait_List)!=Semaphore->Wait_List.Next)&&(Semaphore->Cur_Num!=0))
     {
         Thread=(struct RMP_Thd*)(Semaphore->Wait_List.Next);
         RMP_List_Del(Thread->Run_Head.Prev,Thread->Run_Head.Next);

Project/RVMDK-STM32F767IGT6/RTOS-Mutate.uvguix.pry

@@ -160,7 +160,40 @@
           <Name>-T0</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint/>
+      <Breakpoint>
+        <Bp>
+          <Number>0</Number>
+          <Type>0</Type>
+          <LineNumber>17</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134218486</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>..\..\MProkaron\Benchmark\test.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression>\\RMP\../../MProkaron/Benchmark/test.c\17</Expression>
+        </Bp>
+        <Bp>
+          <Number>1</Number>
+          <Type>0</Type>
+          <LineNumber>8</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>0</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>0</BreakIfRCount>
+          <Filename>..\..\MProkaron\Benchmark\test.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression></Expression>
+        </Bp>
+      </Breakpoint>
       <WatchWindow1>
         <Ww>
           <count>0</count>

Project/RVMDK-STM32F767IGT6/RTOS-Mutate.uvoptx

@@ -48,7 +48,7 @@ This operating system is much **leaner** than any other RTOSes, especilly when c
     }
 ```
 ### Send from one thread to another
-![Delay](https://raw.githubusercontent.com/EDI-Systems/M5P1_MuProkaron/master/Documents/Demo/Send.gif)
+![Send](https://raw.githubusercontent.com/EDI-Systems/M5P1_MuProkaron/master/Documents/Demo/Send.gif)
 ```C
     void Func_1(void* Param)
     {
@@ -81,6 +81,34 @@ This operating system is much **leaner** than any other RTOSes, especilly when c
 ```
 
 ### Counting semaphores
+![Semaphore](https://raw.githubusercontent.com/EDI-Systems/M5P1_MuProkaron/master/Documents/Demo/Semaphore.gif)
+```C
+    void Func_1(void* Param)
+    {
+        while(1)
+        {
+            RMP_Thd_Delay(30000);
+            RMP_Sem_Post(&Sem_1, 1);
+        };
+    }
+
+    void Func_2(void* Param)
+    {
+        ptr_t Data;
+        while(1)
+        {
+            RMP_Sem_Pend(&Sem_1, RMP_MAX_SLICES);
+            RMP_PRINTK_S("Semaphore successfully acquired!\r\n\r\n");
+        };
+    }
+
+    void RMP_Init_Hook(void)
+    {
+        RMP_Sem_Crt(&Sem_1,0);
+        RMP_Thd_Crt(&Thd_1, Func_1, &Stack_1[238], (void*)0x12345678, 1, 5);
+        RMP_Thd_Crt(&Thd_2, Func_2, &Stack_2[238], (void*)0x87654321, 1, 5);
+    }
+```
 
 ### Typical performance figures
 |Machine   |Toolchain     |Flash|SRAM|Yield|Mailbox|Semaphore|Mailbox/Int|Semaphore/Int|