diff options
| author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-06-24 22:13:37 +0000 |
|---|---|---|
| committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2009-06-24 22:13:37 +0000 |
| commit | e59c4ffc829bff64440258325b9e9618a198082c (patch) | |
| tree | 370a9d0eb0cfc117919ae66767b98396290bd74e | |
| parent | af980d8bcbfa37f3391f068f851f68b390769f71 (diff) | |
| download | rockbox-e59c4ffc829bff64440258325b9e9618a198082c.tar.gz rockbox-e59c4ffc829bff64440258325b9e9618a198082c.zip | |
Fix some forgotten OR's in some button-target.h files
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21501 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/target/arm/as3525/sansa-fuze/button-target.h | 2 | ||||
| -rw-r--r-- | firmware/target/arm/tms320dm320/mrobe-500/button-target.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/firmware/target/arm/as3525/sansa-fuze/button-target.h b/firmware/target/arm/as3525/sansa-fuze/button-target.h index 8527604379..6dcd37460a 100644 --- a/firmware/target/arm/as3525/sansa-fuze/button-target.h +++ b/firmware/target/arm/as3525/sansa-fuze/button-target.h | |||
| @@ -51,7 +51,7 @@ unsigned short button_read_dbop(void); | |||
| 51 | 51 | ||
| 52 | #define BUTTON_MAIN (BUTTON_HOME|BUTTON_DOWN|BUTTON_RIGHT|BUTTON_LEFT \ | 52 | #define BUTTON_MAIN (BUTTON_HOME|BUTTON_DOWN|BUTTON_RIGHT|BUTTON_LEFT \ |
| 53 | |BUTTON_SELECT|BUTTON_UP|BUTTON_POWER \ | 53 | |BUTTON_SELECT|BUTTON_UP|BUTTON_POWER \ |
| 54 | |BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD| \ | 54 | |BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD \ |
| 55 | |BUTTON_HOLD) | 55 | |BUTTON_HOLD) |
| 56 | 56 | ||
| 57 | /* No Remote control */ | 57 | /* No Remote control */ |
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/button-target.h b/firmware/target/arm/tms320dm320/mrobe-500/button-target.h index b3a2960e01..cd746dbb5b 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/button-target.h +++ b/firmware/target/arm/tms320dm320/mrobe-500/button-target.h | |||
| @@ -79,8 +79,8 @@ void use_calibration(bool enable); | |||
| 79 | #define POWEROFF_COUNT 10 | 79 | #define POWEROFF_COUNT 10 |
| 80 | 80 | ||
| 81 | #define BUTTON_MAIN (BUTTON_POWER| \ | 81 | #define BUTTON_MAIN (BUTTON_POWER| \ |
| 82 | BUTTON_TOPLEFT|BUTTON_TOPMIDDLE|BUTTON_TOPRIGHT \ | 82 | BUTTON_TOPLEFT|BUTTON_TOPMIDDLE|BUTTON_TOPRIGHT| \ |
| 83 | BUTTON_MIDLEFT|BUTTON_CENTER|BUTTON_MIDRIGHT \ | 83 | BUTTON_MIDLEFT|BUTTON_CENTER|BUTTON_MIDRIGHT| \ |
| 84 | BUTTON_BOTTOMLEFT|BUTTON_BOTTOMMIDDLE|BUTTON_BOTTOMRIGHT) | 84 | BUTTON_BOTTOMLEFT|BUTTON_BOTTOMMIDDLE|BUTTON_BOTTOMRIGHT) |
| 85 | 85 | ||
| 86 | #define BUTTON_REMOTE (BUTTON_RC_HEART|BUTTON_RC_MODE| \ | 86 | #define BUTTON_REMOTE (BUTTON_RC_HEART|BUTTON_RC_MODE| \ |