diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-01-29 20:49:43 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-01-29 20:49:43 +0000 |
commit | 36c71a60ca82f9777fbdd239f63f62ccf68cf3f5 (patch) | |
tree | 06518f1485a9899da1015445623256721435323e /firmware | |
parent | d4b99fdfe06bf5f30f4c3a68f08aedaaa6f432f9 (diff) | |
download | rockbox-36c71a60ca82f9777fbdd239f63f62ccf68cf3f5.tar.gz rockbox-36c71a60ca82f9777fbdd239f63f62ccf68cf3f5.zip |
Get checkwps working again
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19880 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/button.h | 4 | ||||
-rw-r--r-- | firmware/export/font.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/firmware/export/button.h b/firmware/export/button.h index 0b4c8fd2b0..ebfc1272cb 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h | |||
@@ -68,11 +68,11 @@ int button_apply_acceleration(const unsigned int data); | |||
68 | #define BUTTON_TOUCHSCREEN 0x08000000 | 68 | #define BUTTON_TOUCHSCREEN 0x08000000 |
69 | 69 | ||
70 | #ifdef HAVE_TOUCHSCREEN | 70 | #ifdef HAVE_TOUCHSCREEN |
71 | #if !defined(BUTTON_TOPLEFT) || !defined(BUTTON_TOPMIDDLE) \ | 71 | #if (!defined(BUTTON_TOPLEFT) || !defined(BUTTON_TOPMIDDLE) \ |
72 | || !defined(BUTTON_TOPRIGHT) || !defined(BUTTON_MIDLEFT) \ | 72 | || !defined(BUTTON_TOPRIGHT) || !defined(BUTTON_MIDLEFT) \ |
73 | || !defined(BUTTON_CENTER) || !defined(BUTTON_MIDRIGHT) \ | 73 | || !defined(BUTTON_CENTER) || !defined(BUTTON_MIDRIGHT) \ |
74 | || !defined(BUTTON_BOTTOMLEFT) || !defined(BUTTON_BOTTOMMIDDLE) \ | 74 | || !defined(BUTTON_BOTTOMLEFT) || !defined(BUTTON_BOTTOMMIDDLE) \ |
75 | || !defined(BUTTON_BOTTOMRIGHT) | 75 | || !defined(BUTTON_BOTTOMRIGHT)) && !defined(__PCTOOL__) |
76 | #error Touchscreen button mode BUTTON_* defines not set up correctly | 76 | #error Touchscreen button mode BUTTON_* defines not set up correctly |
77 | #endif | 77 | #endif |
78 | enum touchscreen_mode { | 78 | enum touchscreen_mode { |
diff --git a/firmware/export/font.h b/firmware/export/font.h index 75b012d722..d17fa18b8b 100644 --- a/firmware/export/font.h +++ b/firmware/export/font.h | |||
@@ -62,11 +62,13 @@ | |||
62 | * must be available at system startup. | 62 | * must be available at system startup. |
63 | * Fonts are specified in firmware/font.c. | 63 | * Fonts are specified in firmware/font.c. |
64 | */ | 64 | */ |
65 | #ifndef __PCTOOL__ | ||
65 | enum { | 66 | enum { |
66 | FONT_SYSFIXED, /* system fixed pitch font*/ | 67 | FONT_SYSFIXED, /* system fixed pitch font*/ |
67 | FONT_UI, /* system porportional font*/ | 68 | FONT_UI, /* system porportional font*/ |
68 | MAXFONTS | 69 | MAXFONTS |
69 | }; | 70 | }; |
71 | #endif | ||
70 | 72 | ||
71 | /* | 73 | /* |
72 | * .fnt loadable font file format definition | 74 | * .fnt loadable font file format definition |