diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2012-01-04 06:34:29 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2012-01-04 06:34:29 +0000 |
commit | deed2fc6a669c16719d23f2829adaee71efd7709 (patch) | |
tree | c302bcad97f1d14fd5c21b533c3d37075e4f7946 /firmware/target/arm/pp | |
parent | 3af54d7175f8b729be7ef575467d975d81509a69 (diff) | |
download | rockbox-deed2fc6a669c16719d23f2829adaee71efd7709.tar.gz rockbox-deed2fc6a669c16719d23f2829adaee71efd7709.zip |
PP: move DEBUG_CANCEL definition to .c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31570 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/pp')
-rw-r--r-- | firmware/target/arm/pp/debug-pp.c | 27 | ||||
-rw-r--r-- | firmware/target/arm/pp/debug-target.h | 46 |
2 files changed, 26 insertions, 47 deletions
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 @@ | |||
29 | #include "adc.h" | 29 | #include "adc.h" |
30 | #include "iap.h" | 30 | #include "iap.h" |
31 | #include "hwcompat.h" | 31 | #include "hwcompat.h" |
32 | #include "debug-target.h" | ||
33 | 32 | ||
33 | #if (CONFIG_KEYPAD == IPOD_1G2G_PAD) || \ | ||
34 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | ||
35 | (CONFIG_KEYPAD == IPOD_4G_PAD) | ||
36 | # define DEBUG_CANCEL BUTTON_MENU | ||
37 | |||
38 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | ||
39 | # define DEBUG_CANCEL BUTTON_REW | ||
40 | |||
41 | #elif (CONFIG_KEYPAD == MROBE100_PAD) | ||
42 | # define DEBUG_CANCEL BUTTON_MENU | ||
43 | |||
44 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | ||
45 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | ||
46 | (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) | ||
47 | # define DEBUG_CANCEL BUTTON_LEFT | ||
48 | |||
49 | #elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) || \ | ||
50 | (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) | ||
51 | # define DEBUG_CANCEL BUTTON_POWER | ||
52 | |||
53 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
54 | # define DEBUG_CANCEL BUTTON_PLAY | ||
55 | |||
56 | #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) | ||
57 | # define DEBUG_CANCEL BUTTON_CANCEL | ||
58 | #endif | ||
34 | static int perfcheck(void) | 59 | static int perfcheck(void) |
35 | { | 60 | { |
36 | int result; | 61 | 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 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2010 by Marcin Bukat | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | #if (CONFIG_KEYPAD == IPOD_1G2G_PAD) || \ | ||
22 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | ||
23 | (CONFIG_KEYPAD == IPOD_4G_PAD) | ||
24 | # define DEBUG_CANCEL BUTTON_MENU | ||
25 | |||
26 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | ||
27 | # define DEBUG_CANCEL BUTTON_REW | ||
28 | |||
29 | #elif (CONFIG_KEYPAD == MROBE100_PAD) | ||
30 | # define DEBUG_CANCEL BUTTON_MENU | ||
31 | |||
32 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | ||
33 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | ||
34 | (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) | ||
35 | # define DEBUG_CANCEL BUTTON_LEFT | ||
36 | |||
37 | #elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) || \ | ||
38 | (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) | ||
39 | # define DEBUG_CANCEL BUTTON_POWER | ||
40 | |||
41 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
42 | # define DEBUG_CANCEL BUTTON_PLAY | ||
43 | |||
44 | #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) | ||
45 | # define DEBUG_CANCEL BUTTON_CANCEL | ||
46 | #endif | ||