1.优化代码文件命名

MDK-ARM/TestF7.uvoptx

@@ -350,7 +350,7 @@
 
   <Group>
     <GroupName>Application/User</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -1809,8 +1809,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\lib\lib_buffer.h</PathWithFileName>
-      <FilenameWithoutPath>lib_buffer.h</FilenameWithoutPath>
+      <PathWithFileName>..\lib\lib_ringfs\lib_ringfs.h</PathWithFileName>
+      <FilenameWithoutPath>lib_ringfs.h</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1821,56 +1821,56 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\lib\lib_buffer.c</PathWithFileName>
-      <FilenameWithoutPath>lib_buffer.c</FilenameWithoutPath>
+      <PathWithFileName>..\lib\lib_ringfs\lib_ringfs.c</PathWithFileName>
+      <FilenameWithoutPath>lib_ringfs.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>17</GroupNumber>
       <FileNumber>113</FileNumber>
-      <FileType>1</FileType>
+      <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\lib\lib_buffer_test.c</PathWithFileName>
-      <FilenameWithoutPath>lib_buffer_test.c</FilenameWithoutPath>
+      <PathWithFileName>..\lib\lib_ringfs\tests\lib_ringfs_ram.h</PathWithFileName>
+      <FilenameWithoutPath>lib_ringfs_ram.h</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>17</GroupNumber>
       <FileNumber>114</FileNumber>
-      <FileType>5</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\lib\lib_ringfs\lib_ringfs.h</PathWithFileName>
-      <FilenameWithoutPath>lib_ringfs.h</FilenameWithoutPath>
+      <PathWithFileName>..\lib\lib_ringfs\tests\lib_ringfs_ram.c</PathWithFileName>
+      <FilenameWithoutPath>lib_ringfs_ram.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>17</GroupNumber>
       <FileNumber>115</FileNumber>
-      <FileType>1</FileType>
+      <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\lib\lib_ringfs\lib_ringfs.c</PathWithFileName>
-      <FilenameWithoutPath>lib_ringfs.c</FilenameWithoutPath>
+      <PathWithFileName>..\lib\lib_ringfs\tests\lib_ringfs_w25q.h</PathWithFileName>
+      <FilenameWithoutPath>lib_ringfs_w25q.h</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>17</GroupNumber>
       <FileNumber>116</FileNumber>
-      <FileType>5</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\lib\lib_ringfs\tests\lib_ringfs_ram.h</PathWithFileName>
-      <FilenameWithoutPath>lib_ringfs_ram.h</FilenameWithoutPath>
+      <PathWithFileName>..\lib\lib_ringfs\tests\lib_ringfs_w25q.c</PathWithFileName>
+      <FilenameWithoutPath>lib_ringfs_w25q.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1881,8 +1881,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\lib\lib_ringfs\tests\lib_ringfs_ram.c</PathWithFileName>
-      <FilenameWithoutPath>lib_ringfs_ram.c</FilenameWithoutPath>
+      <PathWithFileName>..\lib\lib_ringfs\lib_ringfs_func.c</PathWithFileName>
+      <FilenameWithoutPath>lib_ringfs_func.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1893,8 +1893,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\lib\lib_ringfs\tests\lib_ringfs_w25q.h</PathWithFileName>
-      <FilenameWithoutPath>lib_ringfs_w25q.h</FilenameWithoutPath>
+      <PathWithFileName>..\lib\lib_ringfs\lib_ringfs_func.h</PathWithFileName>
+      <FilenameWithoutPath>lib_ringfs_func.h</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1905,8 +1905,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\lib\lib_ringfs\tests\lib_ringfs_w25q.c</PathWithFileName>
-      <FilenameWithoutPath>lib_ringfs_w25q.c</FilenameWithoutPath>
+      <PathWithFileName>..\lib\lib_ringbuf.c</PathWithFileName>
+      <FilenameWithoutPath>lib_ringbuf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1917,8 +1917,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\lib\lib_ringfs\lib_ringfs_func.c</PathWithFileName>
-      <FilenameWithoutPath>lib_ringfs_func.c</FilenameWithoutPath>
+      <PathWithFileName>..\lib\lib_ringbuf_test.c</PathWithFileName>
+      <FilenameWithoutPath>lib_ringbuf_test.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1929,8 +1929,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\lib\lib_ringfs\lib_ringfs_func.h</PathWithFileName>
-      <FilenameWithoutPath>lib_ringfs_func.h</FilenameWithoutPath>
+      <PathWithFileName>..\lib\lib_ringbuf.h</PathWithFileName>
+      <FilenameWithoutPath>lib_ringbuf.h</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>

MDK-ARM/TestF7.uvprojx

@@ -1013,21 +1013,6 @@
         <Group>
           <GroupName>lib</GroupName>
           <Files>
-            <File>
-              <FileName>lib_buffer.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\lib\lib_buffer.h</FilePath>
-            </File>
-            <File>
-              <FileName>lib_buffer.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\lib\lib_buffer.c</FilePath>
-            </File>
-            <File>
-              <FileName>lib_buffer_test.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\lib\lib_buffer_test.c</FilePath>
-            </File>
             <File>
               <FileName>lib_ringfs.h</FileName>
               <FileType>5</FileType>
@@ -1068,6 +1053,21 @@
               <FileType>5</FileType>
               <FilePath>..\lib\lib_ringfs\lib_ringfs_func.h</FilePath>
             </File>
+            <File>
+              <FileName>lib_ringbuf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\lib\lib_ringbuf.c</FilePath>
+            </File>
+            <File>
+              <FileName>lib_ringbuf_test.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\lib\lib_ringbuf_test.c</FilePath>
+            </File>
+            <File>
+              <FileName>lib_ringbuf.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\lib\lib_ringbuf.h</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>

func/func_ram_record.c

@@ -31,7 +31,7 @@
 
 #include "Data_deal.h"
 /* Private includes ----------------------------------------------------------*/
-#include "lib_buffer.h"
+#include "lib_ringbuf.h"
 #include "func_ram_record.h"
 /* Private typedef -----------------------------------------------------------*/
 
@@ -43,8 +43,8 @@
 
 /* Private variables ---------------------------------------------------------*/
 uint8_t  			ram_record_buf[DATA_UNIT_NUM][DATA_UNIT_SIZE] = {0};
-TBuffferOBJ 	ram_record_obj 					= {0};
-TBufffer 			ram_record_handle 			= {0}; 
+RingBufOBJ 		ram_record_obj 					= {0};
+RingBuf 			ram_record_handle 			= {0}; 
 /* Private function prototypes -----------------------------------------------*/
 
 
@@ -58,7 +58,7 @@ TBufffer 			ram_record_handle 			= {0};
   */
 uint32_t func_ram_record_write(uint8_t *buf ,uint32_t len)
 {
-	uint32_t 		data_len = TBuffer_Push(ram_record_handle, (void *)buf, (int) len);
+	uint32_t 		data_len = RingBuf_Push(ram_record_handle, (void *)buf, (int) len);
 	return data_len;
 
 }
@@ -70,7 +70,7 @@ uint32_t func_ram_record_write(uint8_t *buf ,uint32_t len)
   */
 uint32_t func_ram_record_read(uint8_t *buf, uint32_t len)
 {
-	uint32_t 		data_len = TBuffer_Peek(ram_record_handle, (void *)buf, (int) len);
+	uint32_t 		data_len = RingBuf_Peek(ram_record_handle, (void *)buf, (int) len);
 	
 	return data_len;
 }
@@ -78,14 +78,14 @@ uint32_t func_ram_record_read(uint8_t *buf, uint32_t len)
 
 uint32_t func_ram_record_delete(uint8_t *buf,uint32_t len)
 {
-	uint32_t 		read_len = TBuffer_Pop(ram_record_handle, (void *)buf, (int) len);
+	uint32_t 		read_len = RingBuf_Pop(ram_record_handle, (void *)buf, (int) len);
 	return read_len;
 }
 
 
 void func_ram_record_init(void)
 {	
-	ram_record_handle = TBuffer_Init(&ram_record_obj, ram_record_buf, sizeof(ram_record_buf));
+	ram_record_handle = RingBuf_Init(&ram_record_obj, ram_record_buf, sizeof(ram_record_buf));
 }
 
 

lib/lib_buffer.h

@@ -1,25 +0,0 @@
-#ifndef __BUFFER
-#define __BUFFER
-
-#include <stdint.h>
-
-typedef struct
-{
-    unsigned char  *pHead;//环形存储区的首地址
-    unsigned char  *pTail;//环形存储区的结尾地址   
-    unsigned char  *pValid;//已使用的缓冲区的首地址
-    unsigned char  *pValidTail;//已使用的缓冲区的尾地址
-    unsigned int 		pop_size;
-    unsigned int 		push_size;
-    unsigned int   	size;
-} TBuffferOBJ;
-
-typedef TBuffferOBJ* TBufffer;
-
-TBufffer TBuffer_Init(TBuffferOBJ *data, void *buffer, int buff_size);
-void TBuffer_Fini(TBuffferOBJ *data);
-int TBuffer_Push(TBufffer Object, const void *data, int size);
-int TBuffer_Peek(TBufffer Object, void *data, int size); //返回实际尺寸
-int TBuffer_Pop(TBufffer Object, void *data, int size);
-uint32_t TBuffer_obj_num(TBufffer Object,int obj_size);
-#endif 

lib/lib_buffer.c

@@ -1,13 +1,13 @@
 #include <stdio.h>
 #include "string.h"
 #include "stdlib.h"
-#include "lib_buffer.h"
+#include "lib_ringbuf.h"
 #define VALID_LEN (Object->push_size - Object->pop_size)    //缓冲区有效长度
-int TBuffer_discard(TBufffer Object, int size)   ;
+int RingBuf_discard(RingBuf Object, int size)   ;
 
-TBufffer TBuffer_Init(TBuffferOBJ *data, void *buffer, int buff_size)
+RingBuf RingBuf_Init(RingBufOBJ *data, void *buffer, int buff_size)
 {
-    TBufffer result = NULL;
+    RingBuf result = NULL;
     if (data != NULL && buffer != NULL && buff_size > 0)
     {
         data->pHead = buffer;
@@ -22,7 +22,7 @@ TBufffer TBuffer_Init(TBuffferOBJ *data, void *buffer, int buff_size)
     return result;
 }
 
-void TBuffer_Reset(TBufffer Object)
+void RingBuf_Reset(RingBuf Object)
 {
 
     if (Object != NULL)
@@ -35,7 +35,7 @@ void TBuffer_Reset(TBufffer Object)
     return ;
 }
 
-void TBuffer_Fini(TBuffferOBJ *data)
+void RingBuf_Fini(RingBufOBJ *data)
 {
     if (data != NULL)
     {
@@ -44,7 +44,7 @@ void TBuffer_Fini(TBuffferOBJ *data)
     }    
 }
 
-int TBuffer_Push(TBufffer Object, const void *data, int size)
+int RingBuf_Push(RingBuf Object, const void *data, int size)
 {
     int result = 0;
     int _ValidLength = Object->push_size - Object->pop_size;
@@ -52,12 +52,12 @@ int TBuffer_Push(TBufffer Object, const void *data, int size)
 	
 		if( _Size <= size )
 		{
-			TBuffer_discard(Object,size);
+			RingBuf_discard(Object,size);
 		}
 		
 		if(Object->pop_size >= Object->push_size )
 		{
-			TBuffer_Reset(Object);
+			RingBuf_Reset(Object);
 		}
 		
     if (data == NULL)
@@ -91,7 +91,7 @@ int TBuffer_Push(TBufffer Object, const void *data, int size)
     return result;
 }
 
-int TBuffer_Peek(TBufffer Object, void *data, int size)//返回实际尺寸
+int RingBuf_Peek(RingBuf Object, void *data, int size)//返回实际尺寸
 {
     int result = 0;
     if (data == NULL)
@@ -121,7 +121,7 @@ int TBuffer_Peek(TBufffer Object, void *data, int size)//返回实际尺寸
     return result;
 }
 
-int TBuffer_Pop(TBufffer Object, void *data, int size)
+int RingBuf_Pop(RingBuf Object, void *data, int size)
 {
     int result = 0;
     if (data == NULL)
@@ -160,7 +160,7 @@ int TBuffer_Pop(TBufffer Object, void *data, int size)
 }
 
 
-int TBuffer_Pop_head(TBufffer Object, void *data, int size)                                                                        
+int RingBuf_Pop_head(RingBuf Object, void *data, int size)                                                                        
 {
     int result = 0;
     if (data == NULL)
@@ -192,7 +192,7 @@ int TBuffer_Pop_head(TBufffer Object, void *data, int size)
 }
 
 
-int TBuffer_discard(TBufffer Object, int size)                                                                        
+int RingBuf_discard(RingBuf Object, int size)                                                                        
 {
     int result = 0;
 
@@ -221,7 +221,7 @@ int TBuffer_discard(TBufffer Object, int size)
     // printf("pop = %s\n",(char*)data);   
     return result;
 }
-uint32_t TBuffer_obj_num(TBufffer Object,int obj_size)
+uint32_t RingBuf_obj_num(RingBuf Object,int obj_size)
 {
 		uint32_t obj_num = 0;
 	

lib/lib_ringbuf.h

@@ -0,0 +1,25 @@
+#ifndef LIB_RINGBUF_H
+#define LIB_RINGBUF_H
+
+#include <stdint.h>
+
+typedef struct
+{
+    unsigned char  *pHead;//环形存储区的首地址
+    unsigned char  *pTail;//环形存储区的结尾地址   
+    unsigned char  *pValid;//已使用的缓冲区的首地址
+    unsigned char  *pValidTail;//已使用的缓冲区的尾地址
+    unsigned int 		pop_size;
+    unsigned int 		push_size;
+    unsigned int   	size;
+} RingBufOBJ;
+
+typedef RingBufOBJ* RingBuf;
+
+RingBuf RingBuf_Init(RingBufOBJ *data, void *buffer, int buff_size);
+void RingBuf_Fini(RingBufOBJ *data);
+int RingBuf_Push(RingBuf Object, const void *data, int size);
+int RingBuf_Peek(RingBuf Object, void *data, int size); //返回实际尺寸
+int RingBuf_Pop(RingBuf Object, void *data, int size);
+uint32_t RingBuf_obj_num(RingBuf Object,int obj_size);
+#endif 

lib/lib_buffer_test.c

@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include "signal.h"
-#include "lib_buffer.h"
+#include "lib_ringbuf.h"
 #include "cmsis_os.h"
 //用push_count 压入
 //检查pop_count-push_count ? 
@@ -23,12 +23,12 @@ void *push(void *arg)
 {
     int RetSize = 0;
     int Push_Ptr = 0;
-    TBufffer tmp = (TBufffer)arg;
+    RingBuf tmp = (RingBuf)arg;
     if (tmp != NULL)
     {
         while (!run_over)
         {
-            RetSize = TBuffer_Push(tmp, str + Push_Ptr, sizeof(str) - Push_Ptr);
+            RetSize = RingBuf_Push(tmp, str + Push_Ptr, sizeof(str) - Push_Ptr);
             if (RetSize < sizeof(str) - Push_Ptr)
             {
                 Push_Ptr += RetSize;
@@ -39,7 +39,7 @@ void *push(void *arg)
         }
     }
     else
-        printf("TBuffferOBJ  ERR");
+        printf("RingBufOBJ  ERR");
     return NULL;
 }
 
@@ -49,12 +49,12 @@ void *pop(void *arg)
     char buf[10];
     int RetSize = 0;
     int Pop_Ptr = 0;
-    TBufffer tmp = (TBufffer)arg;
+    RingBuf tmp = (RingBuf)arg;
     if (tmp != NULL)
     {
        while (!run_over)
        {
-            RetSize = TBuffer_Pop(tmp, buf, sizeof(buf) - 1);//size?
+            RetSize = RingBuf_Pop(tmp, buf, sizeof(buf) - 1);//size?
             if (RetSize == 0)   //无有效数据
                osDelay(1);
             else        //检查
@@ -89,17 +89,17 @@ void *pop(void *arg)
         }        
     }
     else
-       printf("TBuffferOBJ ERR");
+       printf("RingBufOBJ ERR");
     return NULL;
 }
 #if 0
-TBuffferOBJ _data;
+RingBufOBJ _data;
 
 
 int main() 
 {
      char buf[16];
-      TBufffer tmp = TBuffer_Init(&_data, buf, sizeof(buf));
+      RingBuf tmp = RingBuf_Init(&_data, buf, sizeof(buf));
     if (tmp != NULL)
     {
         pthread_t th1, th2;