From deed2fc6a669c16719d23f2829adaee71efd7709 Mon Sep 17 00:00:00 2001
From: Rafaël Carré <rafael.carre@gmail.com>
Date: Wed, 4 Jan 2012 06:34:29 +0000
Subject: PP: move DEBUG_CANCEL definition to .c

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31570 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/target/arm/pp/debug-pp.c     | 27 +++++++++++++++++++-
 firmware/target/arm/pp/debug-target.h | 46 -----------------------------------
 2 files changed, 26 insertions(+), 47 deletions(-)

(limited to 'firmware/target/arm/pp')

diff --git a/firmware/target/arm/pp/debug-pp.c b/firmware/target/arm/pp/debug-pp.c
index 5f252db417..f4ba61cd39 100644
--- a/firmware/target/arm/pp/debug-pp.c
+++ b/firmware/target/arm/pp/debug-pp.c
@@ -29,8 +29,33 @@
 #include "adc.h"
 #include "iap.h"
 #include "hwcompat.h"
-#include "debug-target.h"
 
+#if (CONFIG_KEYPAD == IPOD_1G2G_PAD) || \
+    (CONFIG_KEYPAD == IPOD_3G_PAD) || \
+    (CONFIG_KEYPAD == IPOD_4G_PAD)
+#   define DEBUG_CANCEL  BUTTON_MENU
+
+#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
+#   define DEBUG_CANCEL  BUTTON_REW
+
+#elif (CONFIG_KEYPAD == MROBE100_PAD)
+#   define DEBUG_CANCEL  BUTTON_MENU
+
+#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
+      (CONFIG_KEYPAD == SANSA_C200_PAD) || \
+      (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD)
+#   define DEBUG_CANCEL  BUTTON_LEFT
+
+#elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) || \
+      (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD)
+#   define DEBUG_CANCEL  BUTTON_POWER
+
+#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
+#   define DEBUG_CANCEL  BUTTON_PLAY
+
+#elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD)
+#   define DEBUG_CANCEL  BUTTON_CANCEL
+#endif
 static int perfcheck(void)
 {
     int result;
diff --git a/firmware/target/arm/pp/debug-target.h b/firmware/target/arm/pp/debug-target.h
index d6bf53d2aa..e69de29bb2 100644
--- a/firmware/target/arm/pp/debug-target.h
+++ b/firmware/target/arm/pp/debug-target.h
@@ -1,46 +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 == IPOD_1G2G_PAD) || \
-    (CONFIG_KEYPAD == IPOD_3G_PAD) || \
-    (CONFIG_KEYPAD == IPOD_4G_PAD)
-#   define DEBUG_CANCEL  BUTTON_MENU
-
-#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
-#   define DEBUG_CANCEL  BUTTON_REW
-
-#elif (CONFIG_KEYPAD == MROBE100_PAD)
-#   define DEBUG_CANCEL  BUTTON_MENU
-
-#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
-      (CONFIG_KEYPAD == SANSA_C200_PAD) || \
-      (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD)
-#   define DEBUG_CANCEL  BUTTON_LEFT
-
-#elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) || \
-      (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD)
-#   define DEBUG_CANCEL  BUTTON_POWER
-
-#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
-#   define DEBUG_CANCEL  BUTTON_PLAY
-
-#elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD)
-#   define DEBUG_CANCEL  BUTTON_CANCEL
-#endif
-- 
cgit v1.2.3