summaryrefslogtreecommitdiffstats
path: root/firmware/target/coldfire
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2012-01-04 06:33:54 +0000
committerRafaël Carré <rafael.carre@gmail.com>2012-01-04 06:33:54 +0000
commite8f5c5439e2da2f4ded35a3187e9191aea8bc003 (patch)
treeeb9c7fe86b69dcb775ffe99fdea91866addcd18d /firmware/target/coldfire
parenta22e161e0fed5f714f9a40145b6850d26f997816 (diff)
downloadrockbox-e8f5c5439e2da2f4ded35a3187e9191aea8bc003.tar.gz
rockbox-e8f5c5439e2da2f4ded35a3187e9191aea8bc003.zip
coldfire: move debug-target.h content in .c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31563 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/coldfire')
-rw-r--r--firmware/target/coldfire/debug-coldfire.c15
-rw-r--r--firmware/target/coldfire/debug-target.h34
2 files changed, 14 insertions, 35 deletions
diff --git a/firmware/target/coldfire/debug-coldfire.c b/firmware/target/coldfire/debug-coldfire.c
index b021cd19c0..7da2f0df49 100644
--- a/firmware/target/coldfire/debug-coldfire.c
+++ b/firmware/target/coldfire/debug-coldfire.c
@@ -27,12 +27,25 @@
#include "button.h"
#include "powermgmt.h"
#include "adc.h"
-#include "debug-target.h"
#include "lcd-remote.h"
#ifdef IAUDIO_X5
#include "ds2411.h"
#endif
+#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
+ (CONFIG_KEYPAD == IRIVER_H300_PAD)
+# define DEBUG_CANCEL BUTTON_OFF
+
+#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
+# define DEBUG_CANCEL BUTTON_REC
+
+#elif (CONFIG_KEYPAD == IAUDIO_M3_PAD)
+# define DEBUG_CANCEL BUTTON_RC_REC
+
+#elif (CONFIG_KEYPAD == MPIO_HD200_PAD) || \
+ (CONFIG_KEYPAD == MPIO_HD300_PAD)
+# define DEBUG_CANCEL BUTTON_REC
+#endif
/* Tool function to read the flash manufacturer and type, if available.
Only chips which could be reprogrammed in system will return values.
(The mode switch addresses vary between flash manufacturers, hence addr1/2) */
diff --git a/firmware/target/coldfire/debug-target.h b/firmware/target/coldfire/debug-target.h
index 8717532425..e69de29bb2 100644
--- a/firmware/target/coldfire/debug-target.h
+++ b/firmware/target/coldfire/debug-target.h
@@ -1,34 +0,0 @@
-/***************************************************************************
- * __________ __ ___.
- * Open \______ \ ____ ____ | | _\_ |__ _______ ___
- * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
- * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
- * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
- * \/ \/ \/ \/ \/
- * $Id$
- *
- * Copyright (C) 2010 by Marcin Bukat
- *
- * 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.
- *
- ****************************************************************************/
-#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
- (CONFIG_KEYPAD == IRIVER_H300_PAD)
-# define DEBUG_CANCEL BUTTON_OFF
-
-#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
-# define DEBUG_CANCEL BUTTON_REC
-
-#elif (CONFIG_KEYPAD == IAUDIO_M3_PAD)
-# define DEBUG_CANCEL BUTTON_RC_REC
-
-#elif (CONFIG_KEYPAD == MPIO_HD200_PAD) || \
- (CONFIG_KEYPAD == MPIO_HD300_PAD)
-# define DEBUG_CANCEL BUTTON_REC
-#endif