3 files changed, 32 insertions, 26 deletions

diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index 1c8e6ed5d2..1a97aaab31 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -66,7 +66,7 @@ the \setting{Show Files} setting to all.
          & If there is an audio file playing, return to the
          \setting{While Playing Screen} (WPS) without stopping playback.\\
       %
-      \nopt{player,SANSA_C200_PAD}%
+      \nopt{player,SANSA_C200_PAD,erosqnative}%
         {%
           \ActionTreeStop 
           \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeStop}
@@ -81,11 +81,13 @@ the \setting{Show Files} setting to all.
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdMenu}
       & Enter the \setting{Main Menu}.\\
       %
-      \opt{quickscreen}{
-        \ActionStdQuickScreen
-        \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdQuickScreen}
-        & Switch to the \setting{Quick Screen}
-        (see \reference{ref:QuickScreen}). \\
+      \nopt{erosqnative}{
+        \opt{quickscreen}{
+          \ActionStdQuickScreen
+          \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdQuickScreen}
+          & Switch to the \setting{Quick Screen}
+          (see \reference{ref:QuickScreen}). \\
+        }
       }
       %
       \opt{SANSA_E200_PAD}{
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index ccc6e25ae6..20aa8c833e 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -518,7 +518,7 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
       \opt{IPOD_3G_PAD}{\ButtonMenu{} / \ButtonPlay}%
       \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,ONDA_VX777_PAD%
           ,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,sansaAMS,PBELL_VIBE500_PAD%
-          ,SANSA_FUZEPLUS_PAD,XDUOO_X3_PAD%
+          ,SANSA_FUZEPLUS_PAD,XDUOO_X3_PAD,AIGO_EROSQ_PAD%
           }{\ButtonPower}%
       \opt{COWON_D2_PAD} {\ButtonPower{}, then \ButtonHold}%
       \opt{ONDA_VX777_PAD} {\ButtonPower{}}%
@@ -538,7 +538,7 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
       \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonPlay}%
       \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
           ,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,sansaAMS,COWON_D2_PAD%
-          ,PBELL_VIBE500_PAD,ONDA_VX777_PAD,SANSA_FUZEPLUS_PAD,XDUOO_X3_PAD%
+          ,PBELL_VIBE500_PAD,ONDA_VX777_PAD,SANSA_FUZEPLUS_PAD,XDUOO_X3_PAD,AIGO_EROSQ_PAD%
           }{Long \ButtonPower}%
       \opt{AGPTEK_ROCKER_PAD}{Long \ButtonPower{}}%
           &
@@ -721,15 +721,17 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
     and then press the \ButtonPower{} button.
     }
 
-  \opt{fiiom3k,shanlingq1}
+  \opt{fiiom3k,shanlingq1,erosqnative}
     {
     Rockbox has a dual-boot feature. To boot into the original firmware,
     hold \ActionBootOFPlayer{} when powering on the \dap{}.
 
-    You can trigger a normal \playerman{} firmware update by holding
-    \ActionBootOFRecovery{} when powering on the \dap{}.
-    \warn{Updating the original firmware will \textbf{erase} the Rockbox
+    \nopt{erosqnative}{
+      You can trigger a normal \playerman{} firmware update by holding
+      \ActionBootOFRecovery{} when powering on the \dap{}.
+      \warn{Updating the original firmware will \textbf{erase} the Rockbox
       bootloader.}
+    }
 
     \subsection{Entering the recovery menu}
     You can access the Rockbox bootloader's ``recovery menu'' by holding
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 16ea9407dd..7623f89146 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -81,7 +81,7 @@ your WPS (While Playing Screen).
       % software hold targets
       \nopt{hold_button}{%
           \opt{SANSA_CLIP_PAD}{\ButtonHome+\ButtonSelect}
-          \opt{SANSA_FUZEPLUS_PAD}{\ButtonPower}
+          \opt{SANSA_FUZEPLUS_PAD,AIGO_EROSQ_PAD}{\ButtonPower}
           & Key lock (software hold switch) on/off.\\
       }%
       % We explicitly list all the appropriate targets here and do no condition
@@ -112,21 +112,23 @@ your WPS (While Playing Screen).
       \opt{ab_repeat_buttons}{%
          \ActionWpsAbSetBNextDir{} or }%
          % not all targets have the above action defined but the one below works on all
-      Short \ActionWpsSkipNext{} + Long \ActionWpsSkipNext
-      \opt{HAVEREMOTEKEYMAP}{
-        &
+      \nopt{erosqnative}{
+        Short \ActionWpsSkipNext{} + Long \ActionWpsSkipNext
+        \opt{HAVEREMOTEKEYMAP}{
+          &
           \opt{IRIVER_RC_H100_PAD}{\ActionRCWpsAbSetBNextDir{} or}
-        Short \ActionRCWpsSkipNext{} + Long \ActionRCWpsSkipNext}
-      & Skip to the next directory.\\
-      %
-      \opt{ab_repeat_buttons}{%
-         \ActionWpsAbSetAPrevDir{} or }%
-      Short \ActionWpsSkipPrev{} + Long \ActionWpsSkipPrev
-      \opt{HAVEREMOTEKEYMAP}{
-        &
+          Short \ActionRCWpsSkipNext{} + Long \ActionRCWpsSkipNext}
+        & Skip to the next directory.\\
+        %
+        \opt{ab_repeat_buttons}{%
+           \ActionWpsAbSetAPrevDir{} or }%
+        Short \ActionWpsSkipPrev{} + Long \ActionWpsSkipPrev
+        \opt{HAVEREMOTEKEYMAP}{
+          &
           \opt{IRIVER_RC_H100_PAD}{\ActionRCWpsAbSetAPrevDir{} or}
-        Short \ActionRCWpsSkipPrev{} + Long \ActionRCWpsSkipPrev}
-      & Skip to the previous directory.\\
+          Short \ActionRCWpsSkipPrev{} + Long \ActionRCWpsSkipPrev}
+        & Skip to the previous directory.\\
+      }
       %
       \opt{SANSA_E200_PAD,SANSA_C200_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{
         \ActionStdRec