From 87409a2619957e8756fa5ba47f9f67baec7ead82 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Thu, 12 Aug 2010 13:55:01 +0000 Subject: Move memset6() declaration to string-extra.h, kills a warning compiling for android since it ships a memory.h. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27789 a1c6a512-1295-4272-9138-f99709370657 --- firmware/common/memset16.c | 3 +-- firmware/drivers/lcd-16bit-vert.c | 3 +-- firmware/drivers/lcd-16bit.c | 3 +-- firmware/drivers/lcd-2bit-vi.c | 3 +-- firmware/include/memory.h | 29 ---------------------- firmware/include/memset16.h | 28 +++++++++++++++++++++ firmware/include/string-extra.h | 1 + .../arm/tms320dm320/creative-zvm/lcd-creativezvm.c | 2 +- .../target/arm/tms320dm320/mrobe-500/lcd-mr500.c | 2 +- firmware/target/hosted/sdl/kernel-sdl.c | 2 +- 10 files changed, 36 insertions(+), 40 deletions(-) delete mode 100644 firmware/include/memory.h create mode 100644 firmware/include/memset16.h (limited to 'firmware') diff --git a/firmware/common/memset16.c b/firmware/common/memset16.c index c90e2d7340..7e31df0cdd 100644 --- a/firmware/common/memset16.c +++ b/firmware/common/memset16.c @@ -19,8 +19,7 @@ * ****************************************************************************/ -#include -#include "memory.h" +#include "string-extra.h" /* memset16() */ #define LBLOCKSIZE (sizeof(long)/2) #define UNALIGNED(X) ((long)X & (sizeof(long) - 1)) diff --git a/firmware/drivers/lcd-16bit-vert.c b/firmware/drivers/lcd-16bit-vert.c index 2b4faef4a1..a2f47d3544 100644 --- a/firmware/drivers/lcd-16bit-vert.c +++ b/firmware/drivers/lcd-16bit-vert.c @@ -27,9 +27,8 @@ #include "lcd.h" #include "kernel.h" #include "thread.h" -#include #include -#include "memory.h" +#include "string-extra.h" /* mem*() */ #include "file.h" #include "debug.h" #include "system.h" diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c index f8b4272f7c..be4f21f412 100644 --- a/firmware/drivers/lcd-16bit.c +++ b/firmware/drivers/lcd-16bit.c @@ -26,9 +26,8 @@ #include "lcd.h" #include "kernel.h" #include "thread.h" -#include #include -#include "memory.h" +#include "string-extra.h" /* mem*() */ #include "file.h" #include "debug.h" #include "system.h" diff --git a/firmware/drivers/lcd-2bit-vi.c b/firmware/drivers/lcd-2bit-vi.c index 5dd94a15a0..697d1a7783 100644 --- a/firmware/drivers/lcd-2bit-vi.c +++ b/firmware/drivers/lcd-2bit-vi.c @@ -26,9 +26,8 @@ #include "lcd.h" #include "kernel.h" #include "thread.h" -#include #include -#include "memory.h" +#include "string-extra.h" /* mem*() */ #include "file.h" #include "debug.h" #include "system.h" diff --git a/firmware/include/memory.h b/firmware/include/memory.h deleted file mode 100644 index 105d0280b2..0000000000 --- a/firmware/include/memory.h +++ /dev/null @@ -1,29 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 by Jens Arnold - * - * 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 _MEMORY_H_ -#define _MEMORY_H_ - -#include "inttypes.h" - -void memset16(void *dst, int val, size_t len); - -#endif /* _MEMORY_H_ */ diff --git a/firmware/include/memset16.h b/firmware/include/memset16.h new file mode 100644 index 0000000000..1569644db5 --- /dev/null +++ b/firmware/include/memset16.h @@ -0,0 +1,28 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Jens Arnold + * + * 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 __MEMSET16_H__ +#define __MEMSET16_H__ + +#include /* size_t */ +extern void memset16(void *dst, int val, size_t len); + +#endif /* __MEMSET16_H__ */ diff --git a/firmware/include/string-extra.h b/firmware/include/string-extra.h index 16dd2fdccf..bae250d7c9 100644 --- a/firmware/include/string-extra.h +++ b/firmware/include/string-extra.h @@ -26,3 +26,4 @@ #include "strcasecmp.h" #include "strcasestr.h" #include "strtok_r.h" +#include "memset16.h" diff --git a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c index b11c9f0fd5..c92920337b 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c @@ -25,7 +25,7 @@ #include "kernel.h" #include "lcd.h" #include "system.h" -#include "memory.h" +#include "string-extra.h" /* memset16() */ #include "cpu.h" #include "spi.h" #include "spi-target.h" diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c index 3d65bcc092..838efa4cd3 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c @@ -27,7 +27,7 @@ #include "cpu.h" #include "string.h" #include "kernel.h" -#include "memory.h" +#include "string-extra.h" /* memset16() */ #include "mmu-arm.h" #include "system-target.h" #include "lcd.h" diff --git a/firmware/target/hosted/sdl/kernel-sdl.c b/firmware/target/hosted/sdl/kernel-sdl.c index d796921e35..c4d4ee220e 100644 --- a/firmware/target/hosted/sdl/kernel-sdl.c +++ b/firmware/target/hosted/sdl/kernel-sdl.c @@ -23,7 +23,7 @@ #include #include #include -#include "memory.h" +#include #include "system-sdl.h" #include "thread-sdl.h" #include "kernel.h" -- cgit v1.2.3