Implemented fifo syscall

Author: tim37021

context_switch.S

@@ -7,7 +7,7 @@ sleep:
     bx lr
 
 .global get_ticks
-kget_ticks:
+get_ticks:
     svc GET_TICKS_SVC_NUMBER
     bx lr
 
@@ -16,6 +16,16 @@ sbrk:
     svc SBRK_SVC_NUMBER
     bx lr
 
+.global register_fifo
+register_fifo:
+    svc REGISTER_FIFO_SVC_NUMBER
+    bx lr
+
+.global unregister_fifo
+unregister_fifo:
+    svc UNREGISTER_FIFO_SVC_NUMBER
+    bx lr
+
 .global activate
 activate:
     /* save kernel state in ip register */

fifo.c

@@ -15,7 +15,7 @@ static void fp_dtor(void *(*malloc)(size_t), void (*free)(void *), void *dst) {
     free(((FIFO *)dst)->data);
 }
 
-ObjectPool fp_init(uint32_t size, void *(*malloc)(size_t), void *(*free)(size_t))
+ObjectPool fp_init(uint32_t size, void *(*malloc)(size_t), void (*free)(void *))
 {
     return op_allocate(size, sizeof(FIFO), malloc, free, fp_ctor, fp_dtor);
 }

fifo.h

@@ -16,7 +16,7 @@ typedef struct {
 } FIFOCreateInfo;
 
 // Helper function for FIFO Pool
-ObjectPool fp_init(uint32_t size, void *(*malloc)(size_t), void *(*free)(size_t));
+ObjectPool fp_init(uint32_t size, void *(*malloc)(size_t), void (*free)(void *));
 FIFO fifo_init(void *data, uint32_t size);
 int32_t fifo_write(FIFO *fifo, void *buffer, int32_t count);
 int32_t fifo_read(FIFO *fifo, void *buffer, int32_t count);

main.c

@@ -7,6 +7,7 @@
 #include "syscall.h"
 #include "priority_queue.h"
 #include "malloc.h"
+#include "fifo.h"
 #include <tm_stm32f4_usb_hid_device.h>
 
 const char *key_name[4][4] = {
@@ -41,6 +42,8 @@ struct TCB {
 struct TCB tasks[MAX_TASK];
 struct TCB *tasks_queue[MAX_TASK+1];
 
+#define MAX_FIFO 10
+
 static void init(void)
 {
 	STM_EVAL_PBInit(BUTTON_USER, BUTTON_MODE_GPIO);
@@ -93,6 +96,8 @@ void main_task() {
 	text[0] = '\0';
 	IOInterface *interface = init_stm32_keybd();
 
+	int id = register_fifo(100);
+
 	while(TM_USB_HIDDEVICE_GetStatus() != TM_USB_HIDDEVICE_Status_Connected);
 
 	while(1) {
@@ -130,7 +135,6 @@ struct TCB create_task(uint32_t *space, void (*start)(), void *param, int stack_
 	}
 	// r0
 	stack[9] = (uint32_t)param;
-	stack = activate(stack);
 	return (struct TCB) {.pid = next_pid++, .status=0, .orig_priority=priority, 
 		.priority=priority, .program_break=(uint8_t *)space, .stack=stack};
 }
@@ -161,7 +165,9 @@ int main(void)
 		pq_push(&q, &tasks[i]);
 	}
 
+	tasks[0].stack = activate(tasks[0].stack);
 
+	ObjectPool fifo_pool = fp_init(MAX_FIFO, kmalloc, kfree);
 	while (1) {
 		struct TCB *top;
 		void *stored_tasks[MAX_TASK];
@@ -202,6 +208,15 @@ int main(void)
 					*(int32_t *)param1 = -1;
 				// skip aging technique
 				continue;
+			case REGISTER_FIFO_SVC_NUMBER:
+				{
+					FIFOCreateInfo info = {.size = *(int32_t *)param1};
+					*(int32_t *)param1 = op_register(&fifo_pool, &info);
+				}
+				continue;
+			case UNREGISTER_FIFO_SVC_NUMBER:
+				op_unregister(&fifo_pool, *(int32_t *)param1);
+				continue;
 		} 
 		// no need to push back top
 

object_pool.c

@@ -28,9 +28,10 @@ int32_t op_register(ObjectPool *pool, void *args)
 {
     uint32_t i;
     for(i=0; i<pool->size; i++) {
-        if(pool->objects[i].data) {
+        if(pool->objects[i].data==NULL) {
             pool->objects[i].data = pool->malloc(pool->element_size);
             pool->ctor(pool->malloc, pool->free, pool->objects[i].data, args);
+            break;
         }
     }
     return i<pool->size? (int32_t)i: -1;

syscall.h

@@ -7,8 +7,8 @@
 void sleep(uint32_t miliseconds);
 uint32_t get_ticks();
 void *sbrk(int32_t inc);
-int32_t create_fifo(uint32_t size);
-int32_t destroy_fifo(int32_t id);
+int32_t register_fifo(uint32_t size);
+int32_t unregister_fifo(int32_t id);
 // attach fifo to process
 int32_t attach_fifo(int32_t id);
 int32_t send(int32_t pid, int32_t tag, void *buf, int32_t count);

syscall_number.h

@@ -5,5 +5,7 @@
 #define SLEEP_SVC_NUMBER 2
 #define GET_TICKS_SVC_NUMBER 3
 #define SBRK_SVC_NUMBER 4
+#define REGISTER_FIFO_SVC_NUMBER 5
+#define UNREGISTER_FIFO_SVC_NUMBER 6
 
 #endif