From 3909b6408c0125fe311d49a3029a2806993615f7 Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Thu, 29 Nov 2018 19:24:28 +0800 Subject: Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325 Some of the INVALID_ are likely erroneously placed, due to lack of documentation --- src/task.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/task.c') diff --git a/src/task.c b/src/task.c index f067e21b4..2a77b8a9b 100644 --- a/src/task.c +++ b/src/task.c @@ -19,7 +19,7 @@ void ResetTasks(void) gTasks[i].func = TaskDummy; gTasks[i].prev = i; gTasks[i].next = i + 1; - gTasks[i].priority = -1; + gTasks[i].priority = INVALID_S8; memset(gTasks[i].data, 0, sizeof(gTasks[i].data)); } @@ -186,7 +186,7 @@ u8 FindTaskIdByFunc(TaskFunc func) if (gTasks[i].isActive == TRUE && gTasks[i].func == func) return (u8)i; - return -1; + return INVALID_U8; } u8 GetTaskCount(void) -- cgit v1.2.3 From f9ff7316d5c7277eb7482e30121388cd65f4ecfc Mon Sep 17 00:00:00 2001 From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> Date: Wed, 5 Dec 2018 22:31:01 +0800 Subject: Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs --- src/task.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/task.c') diff --git a/src/task.c b/src/task.c index 2a77b8a9b..14b97a361 100644 --- a/src/task.c +++ b/src/task.c @@ -19,7 +19,7 @@ void ResetTasks(void) gTasks[i].func = TaskDummy; gTasks[i].prev = i; gTasks[i].next = i + 1; - gTasks[i].priority = INVALID_S8; + gTasks[i].priority = -1; memset(gTasks[i].data, 0, sizeof(gTasks[i].data)); } @@ -186,7 +186,7 @@ u8 FindTaskIdByFunc(TaskFunc func) if (gTasks[i].isActive == TRUE && gTasks[i].func == func) return (u8)i; - return INVALID_U8; + return 0xFF; } u8 GetTaskCount(void) -- cgit v1.2.3