summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Guay <marcguay@rockbox.org>2008-06-30 02:42:05 +0000
committerMarc Guay <marcguay@rockbox.org>2008-06-30 02:42:05 +0000
commitd40d17829f6a3d7b097400fca975a64c7fca09ca (patch)
tree36b1a9c8b097e9ce24329629ee0ee864546bc89b
parent84dbc76522c181a65d354acd9aa9d83d861f1ff5 (diff)
downloadrockbox-d40d17829f6a3d7b097400fca975a64c7fca09ca.tar.gz
rockbox-d40d17829f6a3d7b097400fca975a64c7fca09ca.zip
Fix up and finish what I started with r17886.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17888 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/keymaps/keymap-ondio.c2
-rw-r--r--manual/platform/c200.tex1
-rw-r--r--manual/platform/m5.tex2
-rw-r--r--manual/platform/mrobe100.tex1
-rw-r--r--manual/platform/x5.tex2
5 files changed, 5 insertions, 3 deletions
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c
index 6d2bdeffcd..f6459a285c 100644
--- a/apps/keymaps/keymap-ondio.c
+++ b/apps/keymaps/keymap-ondio.c
@@ -133,7 +133,7 @@ static const struct button_mapping button_context_pitchscreen[] = {
133 { ACTION_PS_EXIT, BUTTON_OFF, BUTTON_NONE }, 133 { ACTION_PS_EXIT, BUTTON_OFF, BUTTON_NONE },
134 134
135 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 135 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
136}; /* button_context_quickscreen */ 136}; /* button_context_pitchscreen */
137 137
138static const struct button_mapping button_context_recscreen[] = { 138static const struct button_mapping button_context_recscreen[] = {
139 { ACTION_REC_PAUSE, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, 139 { ACTION_REC_PAUSE, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
diff --git a/manual/platform/c200.tex b/manual/platform/c200.tex
index 8f45263c6e..e459754664 100644
--- a/manual/platform/c200.tex
+++ b/manual/platform/c200.tex
@@ -39,6 +39,7 @@
39\newcommand{\ActionStdCancel}{\ButtonLeft} 39\newcommand{\ActionStdCancel}{\ButtonLeft}
40\newcommand{\ActionStdContext}{Long \ButtonSelect} 40\newcommand{\ActionStdContext}{Long \ButtonSelect}
41\newcommand{\ActionStdQuickScreen}{Long \ButtonDown} 41\newcommand{\ActionStdQuickScreen}{Long \ButtonDown}
42\newcommand{\ActionQuickScreenExit}{\ButtonPower}
42\newcommand{\ActionStdMenu}{\ButtonPower} 43\newcommand{\ActionStdMenu}{\ButtonPower}
43\newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight} 44\newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}
44\newcommand{\ActionStdRec}{Long \ButtonRec} 45\newcommand{\ActionStdRec}{Long \ButtonRec}
diff --git a/manual/platform/m5.tex b/manual/platform/m5.tex
index 66b104f0e8..c940cf8100 100644
--- a/manual/platform/m5.tex
+++ b/manual/platform/m5.tex
@@ -39,7 +39,7 @@
39\newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonPower} 39\newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonPower}
40\newcommand{\ActionStdContext}{Long \ButtonSelect} 40\newcommand{\ActionStdContext}{Long \ButtonSelect}
41\newcommand{\ActionStdQuickScreen}{Long \ButtonRec} 41\newcommand{\ActionStdQuickScreen}{Long \ButtonRec}
42\newcommand{\ActionQuickScreenExit}{\ButtonMenu} 42\newcommand{\ActionQuickScreenExit}{\ButtonRec}
43\newcommand{\ActionStdMenu}{\ButtonRec} 43\newcommand{\ActionStdMenu}{\ButtonRec}
44\newcommand{\ActionStdOk}{\ButtonSelect, \ButtonRight{} or \ButtonPlay} 44\newcommand{\ActionStdOk}{\ButtonSelect, \ButtonRight{} or \ButtonPlay}
45 45
diff --git a/manual/platform/mrobe100.tex b/manual/platform/mrobe100.tex
index dba538f106..825d2cbfd4 100644
--- a/manual/platform/mrobe100.tex
+++ b/manual/platform/mrobe100.tex
@@ -41,6 +41,7 @@
41\newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonDisplay{} or \ButtonPower} 41\newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonDisplay{} or \ButtonPower}
42\newcommand{\ActionStdContext}{Long \ButtonSelect} 42\newcommand{\ActionStdContext}{Long \ButtonSelect}
43\newcommand{\ActionStdQuickScreen}{Long \ButtonMenu} 43\newcommand{\ActionStdQuickScreen}{Long \ButtonMenu}
44\newcommand{\ActionQuickScreenExit}{\ButtonMenu}
44\newcommand{\ActionStdMenu}{\ButtonMenu} 45\newcommand{\ActionStdMenu}{\ButtonMenu}
45\newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight} 46\newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight}
46\newcommand{\ActionStdUsbCharge}{\ButtonRight} 47\newcommand{\ActionStdUsbCharge}{\ButtonRight}
diff --git a/manual/platform/x5.tex b/manual/platform/x5.tex
index e537c88b0e..264efbac9b 100644
--- a/manual/platform/x5.tex
+++ b/manual/platform/x5.tex
@@ -39,7 +39,7 @@
39\newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonPower} 39\newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonPower}
40\newcommand{\ActionStdContext}{Long \ButtonSelect} 40\newcommand{\ActionStdContext}{Long \ButtonSelect}
41\newcommand{\ActionStdQuickScreen}{Long \ButtonRec} 41\newcommand{\ActionStdQuickScreen}{Long \ButtonRec}
42+\newcommand{\ActionQuickScreenExit}{\ButtonRec} 42\newcommand{\ActionQuickScreenExit}{\ButtonRec}
43\newcommand{\ActionStdMenu}{\ButtonRec} 43\newcommand{\ActionStdMenu}{\ButtonRec}
44\newcommand{\ActionStdOk}{\ButtonSelect, \ButtonRight{} or \ButtonPlay} 44\newcommand{\ActionStdOk}{\ButtonSelect, \ButtonRight{} or \ButtonPlay}
45 45