diff options
author | John Koleszar <jkoleszar@google.com> | 2011-07-13 05:46:30 -0700 |
---|---|---|
committer | Code Review <code-review@webmproject.org> | 2011-07-13 05:46:30 -0700 |
commit | 7f0b11c0ae8d90144bb44118350dd1cd0498c0ee (patch) | |
tree | 5541cbc383e31fc34376d285fe95ef65529f9be1 /vpx_mem | |
parent | 211694f67e16c83ed61d69160ed60b7be0ab4882 (diff) | |
parent | d89eb6ad5a597b8651295326c9d5f31d4c392cd2 (diff) | |
download | libvpx-7f0b11c0ae8d90144bb44118350dd1cd0498c0ee.tar libvpx-7f0b11c0ae8d90144bb44118350dd1cd0498c0ee.tar.gz libvpx-7f0b11c0ae8d90144bb44118350dd1cd0498c0ee.tar.bz2 libvpx-7f0b11c0ae8d90144bb44118350dd1cd0498c0ee.zip |
Merge "Remove rotting NDS_NITRO code."
Diffstat (limited to 'vpx_mem')
-rw-r--r-- | vpx_mem/include/nds/vpx_mem_nds.h | 30 | ||||
-rw-r--r-- | vpx_mem/vpx_mem_tracker.c | 25 |
2 files changed, 0 insertions, 55 deletions
diff --git a/vpx_mem/include/nds/vpx_mem_nds.h b/vpx_mem/include/nds/vpx_mem_nds.h deleted file mode 100644 index e54f54d9b..000000000 --- a/vpx_mem/include/nds/vpx_mem_nds.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2010 The WebM project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - - -#ifndef __VPX_MEM_NDS_H__ -#define __VPX_MEM_NDS_H__ - -#if defined(__cplusplus) -extern "C" { -#endif - -#include <nitro.h> -#include <nitro/os.h> - - void *vpx_mem_nds_alloc(osarena_id id, osheap_handle handle, size_t size, size_t align); - void vpx_mem_nds_free(osarena_id id, osheap_handle handle, void *mem); - int vpx_nds_alloc_heap(osarena_id id, u32 size); - -#if defined(__cplusplus) -} -#endif - -#endif /*__VPX_MEM_NDS_H__*/ diff --git a/vpx_mem/vpx_mem_tracker.c b/vpx_mem/vpx_mem_tracker.c index 938ad0716..9e8623a9a 100644 --- a/vpx_mem/vpx_mem_tracker.c +++ b/vpx_mem/vpx_mem_tracker.c @@ -36,9 +36,6 @@ # include <winbase.h> #elif defined(VXWORKS) # include <sem_lib.h> -#elif defined(NDS_NITRO) -# include <nitro.h> -# include <nitro/os.h> #endif #include <stdio.h> @@ -112,8 +109,6 @@ struct memory_tracker HANDLE mutex; #elif defined(VXWORKS) SEM_ID mutex; -#elif defined(NDS_NITRO) - OSMutex mutex; #elif defined(NO_MUTEX) #else #error "No mutex type defined for this platform!" @@ -193,9 +188,6 @@ int vpx_memory_tracker_init(int padding_size, int pad_value) memtrack.mutex = sem_bcreate(SEM_Q_FIFO, /*SEM_Q_FIFO non-priority based mutex*/ SEM_FULL); /*SEM_FULL initial state is unlocked*/ ret = !memtrack.mutex; -#elif defined(NDS_NITRO) - os_init_mutex(&memtrack.mutex); - ret = 0; #elif defined(NO_MUTEX) ret = 0; #endif @@ -251,9 +243,7 @@ void vpx_memory_tracker_destroy() if (!g_logging.type && g_logging.file && g_logging.file != stderr) { -#if !defined(NDS_NITRO) fclose(g_logging.file); -#endif g_logging.file = NULL; } @@ -368,15 +358,12 @@ int vpx_memory_tracker_set_log_type(int type, char *option) g_logging.file = stderr; ret = 0; } - -#if !defined(NDS_NITRO) else { if ((g_logging.file = fopen((char *)option, "w"))) ret = 0; } -#endif break; #if defined(WIN32) && !defined(_WIN32_WCE) case 1: @@ -506,12 +493,6 @@ static void memory_tracker_dump() p->addr, i, p->size, p->file, p->line); -#ifdef NDS_NITRO - - if (!(i % 20)) os_sleep(500); - -#endif - p = p->next; ++i; } @@ -719,9 +700,6 @@ static int memory_tracker_lock_mutex() ret = WaitForSingleObject(memtrack.mutex, INFINITE); #elif defined(VXWORKS) ret = sem_take(memtrack.mutex, WAIT_FOREVER); -#elif defined(NDS_NITRO) - os_lock_mutex(&memtrack.mutex); - ret = 0; #endif if (ret) @@ -754,9 +732,6 @@ static int memory_tracker_unlock_mutex() ret = !ReleaseMutex(memtrack.mutex); #elif defined(VXWORKS) ret = sem_give(memtrack.mutex); -#elif defined(NDS_NITRO) - os_unlock_mutex(&memtrack.mutex); - ret = 0; #endif if (ret) |