3 files changed, 81 insertions, 19 deletions

diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index fa29ca9f13..12e9896923 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -46,12 +46,14 @@ the \setting{Show Files} setting to all.
 \begin{table}
     \begin{btnmap}{}{}
       \ActionStdPrev{}/\ActionStdNext{}
+      \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdPrev{}/\ActionRCStdNext{}}
          & Go to previous/next item in list. If you are on the first/last 
            entry, the cursor will wrap to the last/first entry.\\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD}
         {
           \ButtonOn+\ButtonUp{}/ \ButtonDown
+          \opt{IRIVER_RC_H100_PAD}{& \ButtonRCBitrate{}/ \ButtonRCSource}
           & Move one page up/down in the list.\\
         }
       \opt{IRIVER_H10_PAD}
@@ -60,28 +62,39 @@ the \setting{Show Files} setting to all.
           & Move one page up/down in the list.\\
         }
       %
-      \ActionTreeParentDirectory & Go to the parent directory.\\
+      \ActionTreeParentDirectory
+      \opt{IRIVER_RC_H100_PAD}{& \ActionRCTreeParentDirectory}
+      & Go to the parent directory.\\
       %
       \ActionTreeEnter
+      \opt{IRIVER_RC_H100_PAD}{& \ActionRCTreeEnter}
       & Executes the default action on the selected file or enters a
         directory.\\
       %
-      \ActionTreeWps & If there is an audio file playing, returns to the
+      \ActionTreeWps 
+      \opt{IRIVER_RC_H100_PAD}{& \ActionRCTreeWps}
+         & If there is an audio file playing, returns to the
          \setting{While Playing Screen} (WPS) without stopping playback.\\
       %
       \nopt{player,c200}%
         {%
-          \ActionTreeStop & Stops audio playback.\\%
+          \ActionTreeStop 
+          \opt{IRIVER_RC_H100_PAD}{& \ActionRCTreeStop}
+          & Stops audio playback.\\%
         }%
       %
       \ActionStdContext{}
+      \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdContext}
       & Enter the \setting{Context Menu}\\
       %
       \ActionStdMenu{}
+      \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdMenu}
       & Enter the \setting{Main Menu}\\
       %
       \opt{quickscreen}{
-        \ActionStdQuickScreen & Switches to the \setting{Quick Screen}
+        \ActionStdQuickScreen
+        \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdQuickScreen}
+        & Switches to the \setting{Quick Screen}
         (see \reference{ref:QuickScreen}) \\
       }
       \opt{RECORDER_PAD}{
@@ -186,18 +199,24 @@ can be easily changed by making a text file with the required layout.  More
   \begin{table}
     \begin{btnmap}{}{}
       \ActionKbdLeft~/ \ActionKbdRight~/ \ActionKbdUp~/ \ActionKbdDown
+      \opt{IRIVER_RC_H100_PAD}{
+      &  \ActionRCKbdLeft~/ \ActionRCKbdRight~/ \ActionRCKbdUp~/ \ActionRCKbdDown}
       & Move about the virtual keyboard (moves the solid cursor) \\
       %
       \ActionKbdPageFlip
+      \opt{IRIVER_RC_H100_PAD}{& \ActionRCKbdPageFlip}
       & Flip to the next page of characters (if there is more than one) \\
       %
-      \ActionKbdCursorLeft or \ActionKbdCursorRight
+      \ActionKbdCursorLeft{} / \ActionKbdCursorRight
+      \opt{IRIVER_RC_H100_PAD}{& \ActionRCKbdCursorLeft{} / \ActionRCKbdCursorRight}
       & Move the line cursor within the text line \\
       %
       \ActionKbdSelect
+      \opt{IRIVER_RC_H100_PAD}{& \ActionRCKbdSelect}
       & Inserts the selected keyboard letter at the current cursor position \\
       %
       \ActionKbdAbort
+      \opt{IRIVER_RC_H100_PAD}{& \ActionRCKbdAbort}
       & Exits the virtual keyboard without saving any changes \\
       %
       \opt{RECORDER_PAD}{
@@ -206,14 +225,19 @@ can be easily changed by making a text file with the required layout.  More
       }
       %
       \ActionKbdDone
+      \opt{IRIVER_RC_H100_PAD}{& \ActionRCKbdDone}
       & Exits the virtual keyboard and saves any changes \\
+      %
       \ActionKbdBackSpace
+      \opt{IRIVER_RC_H100_PAD}{& \ActionRCKbdBackSpace}
       & Deletes the character before the line cursor \\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,MROBE100_PAD}{
         \ActionKbdMorseInput
+         \opt{IRIVER_RC_H100_PAD}{& \ActionRCKbdMorseInput}
         & Enters Morse input mode \\
         \ActionKbdMorseSelect
+        \opt{IRIVER_RC_H100_PAD}{& \ActionRCKbdMorseSelect}
         & Tap to select a character in Morse input mode \\
       }
     \end{btnmap}
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 43851489a1..d28f3ceb2d 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -424,6 +424,7 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
   \begin{table}
     \begin{btnmap}{}{}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}%
+      \opt{IRIVER_RC_H100_PAD}{& \ButtonRCOn}%
       \opt{IPOD_4G_PAD}{\ButtonMenu{} / \ButtonSelect}%
       \opt{IPOD_3G_PAD}{\ButtonMenu{} / \ButtonPlay}%
       \opt{ONDIO_PAD}{\ButtonOff}\opt{RECORDER_PAD,PLAYER_PAD}%
@@ -432,6 +433,7 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
           {\ButtonPower}%
       & Start Rockbox\\
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonOff}%
+      \opt{IRIVER_RC_H100_PAD}{& Long \ButtonRCStop}%
       \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonPlay}%
       \opt{ONDIO_PAD,recorderv2fm}{Long \ButtonOff}%
       \opt{recorder}{Double tap \ButtonOff\ when playback is stopped}%
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 6780999a7d..43ee436534 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -57,24 +57,42 @@ your WPS (While Playing Screen).
 
 \begin{table}
   \begin{btnmap}{}{}
-      \ActionWpsVolUp{} / \ActionWpsVolDown & Volume up/down.\\
+      \ActionWpsVolUp{} / \ActionWpsVolDown
+      \opt{HAVE_REMOTE_KEYMAP}{& \ActionRCWpsVolUp{} / \ActionRCWpsVolDown}
+      & Volume up/down.\\
       %
-      \ActionWpsSkipPrev & Go to beginning of track, or if pressed while in the
+      \ActionWpsSkipPrev
+       \opt{HAVE_REMOTE_KEYMAP}{& \ActionRCWpsSkipPrev}
+      & Go to beginning of track, or if pressed while in the
         first seconds of a track, go to previous track.\\
       %
-      \ActionWpsSeekBack & Rewind in track.\\
+      \ActionWpsSeekBack
+      \opt{HAVE_REMOTE_KEYMAP}{& \ActionRCWpsSeekBack}
+      & Rewind in track.\\
       %
-      \ActionWpsSkipNext & Go to next track.\\
+      \ActionWpsSkipNext
+      \opt{HAVE_REMOTE_KEYMAP}{& \ActionRCWpsSkipNext}
+      & Go to next track.\\
       %
-      \ActionWpsSeekFwd & Fast forward in track.\\
+      \ActionWpsSeekFwd
+      \opt{HAVE_REMOTE_KEYMAP}{& \ActionRCWpsSeekFwd}
+      & Fast forward in track.\\
       %
-      \ActionWpsPlay & Toggle play/pause.\\
+      \ActionWpsPlay
+      \opt{HAVE_REMOTE_KEYMAP}{& \ActionRCWpsPlay}
+      & Toggle play/pause.\\
       %
-      \ActionWpsStop & Stop playback.\\
+      \ActionWpsStop 
+      \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsStop}
+      & Stop playback.\\
       %
-      \ActionWpsBrowse & Return to the \setting{File Browser}.\\
+      \ActionWpsBrowse
+      \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsBrowse}
+      & Return to the \setting{File Browser}.\\
       %
-      \ActionWpsContext & Enter \setting{WPS Context Menu}.\\
+      \ActionWpsContext
+      \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsContext}
+      & Enter \setting{WPS Context Menu}.\\
       %
       \opt{ONDIO_PAD}{\ActionWpsContext{} twice}%
       \nopt{ONDIO_PAD}{\ActionWpsMenu}%
@@ -82,7 +100,9 @@ your WPS (While Playing Screen).
       \opt{ONDIO_PAD}{ via the \setting{WPS Context Menu}}.\\%
       %
       \opt{quickscreen}{%
-        \ActionWpsQuickScreen & Switches to the \setting{Quick Screen}.
+        \ActionWpsQuickScreen
+        \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsQuickScreen}
+          & Switches to the \setting{Quick Screen}.
           (see \reference{ref:QuickScreen}) \\}%
       %
       % software hold targets (currently Archos only)
@@ -102,28 +122,38 @@ your WPS (While Playing Screen).
       }%
       \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,MROBE100_PAD%
           ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{%
-        \ActionWpsPitchScreen & Show \setting{Pitch Screen}
-        (see \reference{sec:pitchscreen}).\\}%
+        \ActionWpsPitchScreen
+        \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsPitchScreen}
+         & Show \setting{Pitch Screen}
+         (see \reference{sec:pitchscreen}).\\}%
       %
       \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD%
           ,MROBE100_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{%
-        \ActionWpsIdThreeScreen & Enter \setting{ID3 Viewer}.\\%
+        \ActionWpsIdThreeScreen 
+          \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsIdThreeScreen}
+          & Enter \setting{ID3 Viewer}.\\%
       }%
       \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD,MROBE100_PAD%
           ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{%
          \ActionWpsAbSetBNextDir{} or }%
          % not all targets have the above action defined but the one below works on all
       Short \ActionWpsSkipNext{} + Long \ActionWpsSkipNext
+      \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsAbSetBNextDir{} or
+        Short \ActionRCWpsSkipNext{} + Long \ActionRCWpsSkipNext}
       & Skip to the next directory.\\
       %
       \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD%
          ,MROBE100_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{%
          \ActionWpsAbSetAPrevDir{} or }%
       Short \ActionWpsSkipPrev{} + Long \ActionWpsSkipPrev
+      \opt{IRIVER_RC_H100_PAD}{& \ActionRCWpsAbSetAPrevDir{} or
+        Short \ActionRCWpsSkipNext{} + Long \ActionRCWpsSkipNext}
       & Skip to the previous directory.\\
       %
       \opt{SANSA_E200_PAD,SANSA_C200_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{
-        \ActionStdRec & Switches to the Recording screen \\
+        \ActionStdRec
+          \opt{IRIVER_RC_H100_PAD}{&} 
+          & Switches to the Recording screen \\
       }%
     \end{btnmap}
 \end{table}
@@ -288,23 +318,29 @@ Delete the currently playing file.
     \begin{table}
       \begin{btnmap}{}{}
         \ActionPsToggleMode
+        \opt{IRIVER_RC_H100_PAD}{& \ActionRCPsToggleMode}
         & Toggle pitch changing mode \\
         %
         \ActionPsIncSmall{} / \ActionPsDecSmall
+        \opt{IRIVER_RC_H100_PAD}{& \ActionRCPsIncSmall{} / \ActionRCPsDecSmall}
         & Increase / Decrease pitch by 0.1\% (in procentual mode) or a semitone
           (in semitone mode)\\
         %
         \ActionPsIncBig{} / \ActionPsDecBig
+        \opt{IRIVER_RC_H100_PAD}{& \ActionRCPsIncBig{} / \ActionRCPsDecBig}
         & Increase / Decrease pitch by 1\% (in procentual mode) or a semitone
           (in semitone mode)\\
         %
         \ActionPsNudgeLeft{} / \ActionPsNudgeRight
+        \opt{IRIVER_RC_H100_PAD}{& \ActionRCPsNudgeLeft{} / \ActionPsNudgeRight}
         & Temporarily change pitch by 2.0\% (beatmatch), or modify speed (in timestretch mode) \\
         %
         \ActionPsReset
+        \opt{IRIVER_RC_H100_PAD}{& \ActionRCPsReset}
         & Reset pitch and speed to 100\% \\
         %
         \ActionPsExit
+        \opt{IRIVER_RC_H100_PAD}{& \ActionRCPsExit}
         & Leave the Pitch Screen \\
         %
       \end{btnmap}