From d3ae11d75a951b84b2383935318a12b25b64018e Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Fri, 20 Jan 2012 19:21:20 +0100 Subject: android/ypr0: Merge lc-*.c to generic lc-unix.c. Change-Id: Ica76dec903486c32fda8355acdc58f0315c4d384 --- firmware/SOURCES | 7 +++-- firmware/target/hosted/android/lc-android.c | 40 --------------------------- firmware/target/hosted/lc-unix.c | 43 +++++++++++++++++++++++++++++ firmware/target/hosted/ypr0/lc-ypr0.c | 40 --------------------------- 4 files changed, 47 insertions(+), 83 deletions(-) delete mode 100644 firmware/target/hosted/android/lc-android.c create mode 100644 firmware/target/hosted/lc-unix.c delete mode 100644 firmware/target/hosted/ypr0/lc-ypr0.c diff --git a/firmware/SOURCES b/firmware/SOURCES index b2ddc246ec..f13eba618f 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -19,7 +19,8 @@ target/hosted/cpuinfo-linux.c target/hosted/rtc.c #endif -#if (CONFIG_PLATFORM & PLATFORM_ANDROID) == 0 +#if (CONFIG_PLATFORM & PLATFORM_ANDROID) == 0 && \ + (defined(DEBUG) || defined(SIMULATOR)) /* sim should define DEBUG instead */ target/hosted/debug-hosted.c #endif @@ -79,10 +80,10 @@ target/hosted/rtc.c #endif target/hosted/kernel-unix.c target/hosted/filesystem-unix.c +target/hosted/lc-unix.c target/hosted/ypr0/button-ypr0.c target/hosted/ypr0/lcd-ypr0.c target/hosted/ypr0/system-ypr0.c -target/hosted/ypr0/lc-ypr0.c thread.c #ifdef HAVE_BACKLIGHT target/hosted/ypr0/backlight-ypr0.c @@ -1694,8 +1695,8 @@ target/arm/rk27xx/hm801/power-hm801.c #if (CONFIG_PLATFORM & PLATFORM_ANDROID) target/hosted/kernel-unix.c target/hosted/filesystem-unix.c +target/hosted/lc-unix.c target/hosted/android/lcd-android.c -target/hosted/android/lc-android.c target/hosted/android/button-android.c #ifdef DEBUG target/hosted/android/debug-android.c diff --git a/firmware/target/hosted/android/lc-android.c b/firmware/target/hosted/android/lc-android.c deleted file mode 100644 index 434e901a56..0000000000 --- a/firmware/target/hosted/android/lc-android.c +++ /dev/null @@ -1,40 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2010 by Thomas Martitz - * - * 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. - * - ****************************************************************************/ - -#include /* size_t */ -#include "load_code.h" - -/* the load_code wrappers simply wrap, nothing to do */ -void *lc_open(const char *filename, unsigned char *buf, size_t buf_size) -{ - return _lc_open(filename, buf, buf_size); -} - -void *lc_get_header(void *handle) -{ - return _lc_get_header(handle); -} - -void lc_close(void *handle) -{ - _lc_close(handle); -} - diff --git a/firmware/target/hosted/lc-unix.c b/firmware/target/hosted/lc-unix.c new file mode 100644 index 0000000000..8a265de066 --- /dev/null +++ b/firmware/target/hosted/lc-unix.c @@ -0,0 +1,43 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2010 by Thomas Martitz + * + * 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. + * + ****************************************************************************/ + +#include /* size_t */ +#include "load_code.h" + +/* unix specific because WIN32 wants UCS instead of UTF-8, so filenames + * need to be converted */ + +/* plain wrappers , nothing to do */ +void *lc_open(const char *filename, unsigned char *buf, size_t buf_size) +{ + return _lc_open(filename, buf, buf_size); +} + +void *lc_get_header(void *handle) +{ + return _lc_get_header(handle); +} + +void lc_close(void *handle) +{ + _lc_close(handle); +} + diff --git a/firmware/target/hosted/ypr0/lc-ypr0.c b/firmware/target/hosted/ypr0/lc-ypr0.c deleted file mode 100644 index 434e901a56..0000000000 --- a/firmware/target/hosted/ypr0/lc-ypr0.c +++ /dev/null @@ -1,40 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2010 by Thomas Martitz - * - * 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. - * - ****************************************************************************/ - -#include /* size_t */ -#include "load_code.h" - -/* the load_code wrappers simply wrap, nothing to do */ -void *lc_open(const char *filename, unsigned char *buf, size_t buf_size) -{ - return _lc_open(filename, buf, buf_size); -} - -void *lc_get_header(void *handle) -{ - return _lc_get_header(handle); -} - -void lc_close(void *handle) -{ - _lc_close(handle); -} - -- cgit v1.2.3