From fcf36dd4f9879a82342e5606535d2dcf46d1de2a Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Mon, 17 May 2010 12:34:05 +0000 Subject: Simplify mpegplayer a bit and use array-based lists rather than linked lists for stream management. Move a couple useful functions to handle pointer arrays from kernel.c into general.c; mpeglayer now makes use of them. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26101 a1c6a512-1295-4272-9138-f99709370657 --- firmware/kernel.c | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'firmware/kernel.c') diff --git a/firmware/kernel.c b/firmware/kernel.c index d8c67e8485..fe40c35002 100644 --- a/firmware/kernel.c +++ b/firmware/kernel.c @@ -27,6 +27,7 @@ #include "system.h" #include "panic.h" #include "debug.h" +#include "general.h" /* Make this nonzero to enable more elaborate checks on objects */ #if defined(DEBUG) || defined(SIMULATOR) @@ -61,40 +62,6 @@ static struct IF_COP( struct corelock cl; ) } all_queues SHAREDBSS_ATTR; -/**************************************************************************** - * Common utilities - ****************************************************************************/ - -/* Find a pointer in a pointer array. Returns the addess of the element if - * found or the address of the terminating NULL otherwise. */ -static void ** find_array_ptr(void **arr, void *ptr) -{ - void *curr; - for(curr = *arr; curr != NULL && curr != ptr; curr = *(++arr)); - return arr; -} - -/* Remove a pointer from a pointer array if it exists. Compacts it so that - * no gaps exist. Returns 0 on success and -1 if the element wasn't found. */ -static int remove_array_ptr(void **arr, void *ptr) -{ - void *curr; - arr = find_array_ptr(arr, ptr); - - if(*arr == NULL) - return -1; - - /* Found. Slide up following items. */ - do - { - void **arr1 = arr + 1; - *arr++ = curr = *arr1; - } - while(curr != NULL); - - return 0; -} - /**************************************************************************** * Standard kernel stuff ****************************************************************************/ -- cgit v1.2.3