diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2011-06-20 19:32:43 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2011-06-20 19:32:43 +0000 |
| commit | 26ec41b028acfee3533def925c9abd705b66864c (patch) | |
| tree | 33dd8eabaab377adb7ac47d52fd930fc35522ac8 /firmware/include | |
| parent | 8d7eb5d59e1cdce8a516adae11a99d40da29c2b4 (diff) | |
| download | rockbox-26ec41b028acfee3533def925c9abd705b66864c.zip rockbox-26ec41b028acfee3533def925c9abd705b66864c.tar.gz rockbox-26ec41b028acfee3533def925c9abd705b66864c.tar.bz2 rockbox-26ec41b028acfee3533def925c9abd705b66864c.tar.xz | |
Move buffer.h to firmware/include.h to replace a useless malloc header.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30026 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/include')
| -rw-r--r-- | firmware/include/buffer.h | 46 | ||||
| -rw-r--r-- | firmware/include/malloc.h | 26 |
2 files changed, 46 insertions, 26 deletions
diff --git a/firmware/include/buffer.h b/firmware/include/buffer.h new file mode 100644 index 0000000..18f53f0 --- /dev/null +++ b/firmware/include/buffer.h @@ -0,0 +1,46 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Linus Nielsen Feltzing + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#ifndef BUFFER_H +#define BUFFER_H + +#include "config.h" +/* defined in linker script */ +#if (CONFIG_PLATFORM & PLATFORM_NATIVE) +#if defined(IPOD_VIDEO) +extern unsigned char *audiobufend_lds[]; +unsigned char *audiobufend; +#else +extern unsigned char audiobufend[]; +#endif +#else +extern unsigned char *audiobufend; +#endif + +extern unsigned char *audiobuf; + +void buffer_init(void) INIT_ATTR; +void *buffer_alloc(size_t size); + +#ifdef BUFFER_ALLOC_DEBUG +void buffer_alloc_check(char *name); +#endif + +#endif diff --git a/firmware/include/malloc.h b/firmware/include/malloc.h deleted file mode 100644 index 6396757..0000000 --- a/firmware/include/malloc.h +++ /dev/null @@ -1,26 +0,0 @@ -/* malloc.h -- header file for memory routines. */ - -#ifndef _INCLUDE_MALLOC_H_ -#define _INCLUDE_MALLOC_H_ - -#include <_ansi.h> - -#define __need_size_t -#include <stddef.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/* The routines. */ - -extern _PTR malloc _PARAMS ((size_t)); -extern _VOID free _PARAMS ((_PTR)); -extern _PTR realloc _PARAMS ((_PTR, size_t)); -extern _PTR calloc _PARAMS ((size_t, size_t)); - -#ifdef __cplusplus -} -#endif - -#endif /* _INCLUDE_MALLOC_H_ */ |