Manual: Add Eros Q Native

Here is the PDF this patchset produces: https://www.dropbox.com/s/v1uz8p2fsgsz1ng/rockbox-erosqnative-923dabb5cd-220409.pdf?dl=0

Change-Id: I27554cb65a6498a6ccb714d4f93f25264b516e99

11 files changed, 286 insertions, 107 deletions

diff --git a/manual/configure_rockbox/bookmarking.tex b/manual/configure_rockbox/bookmarking.tex
index a429b63d21..c1d0f3b8bf 100644
--- a/manual/configure_rockbox/bookmarking.tex
+++ b/manual/configure_rockbox/bookmarking.tex
@@ -13,18 +13,19 @@
   extension. To load a bookmark, select the bookmark file and then select
   the bookmark to load. There are other ways to load a bookmarks mentioned
   below.
-  
+
   \note{Bookmarking only works when tracks are launched from the file browser,
         and does not work for tracks launched via the
-        database. In addition, they do not work with dynamic
-        playlists.}
+        database. In addition, they do not work with dynamic (i.e. modified but not saved)
+        playlists. If making a bookmark is not available, saving the playlist
+        is sufficient to allow a bookmark to be made.}
 
   \begin{description}
 
   \item [Bookmark on Stop.]
     This option controls whether Rockbox creates a bookmark when playback is
     stopped manually.
-    \begin{description}    
+    \begin{description}
       \item[No.]
             Do not create bookmarks.
       \item[Yes.]
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index c618f33603..951eded31c 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -10,7 +10,7 @@ change to customise your listening experience.
   where 0~dB is a reference that indicates the maximum volume that the \dap{}
   can produce without possible distortion (clipping). All values lower than
   this reference will be negative and yield a progressively softer volume.
-  \nopt{iriverh100,iriverh300,ondavx777}{%
+  \nopt{iriverh100,iriverh300,ondavx777,erosqnative}{%
       Values higher than 0~dB are available and can be used to raise the
       volume more than would otherwise be possible. These volume levels will
       ordinarily lead to distorted sound, but might work nicely for music that has
@@ -28,11 +28,27 @@ change to customise your listening experience.
   \opt{gigabeatf,vibe500}{minimum of -74~dB to a maximum of +6~dB.}%
   \opt{fuzeplus}{minimum of -100~dB to a maximum of +6~dB.}
   \opt{samsungyh}{minimum of -128~dB to a maximum of 0~dB.}
+  \opt{erosqnative}{minimum of -74~dB (mute) to a maximum of -2~dB.}
   \opt{ipodvideo}{\\Remark: Lowering the volume below -57~dB will also affect the line-out
   and the recording gain.}
   \opt{cowond2}{\\Remark: Lowering the volume below -57~dB will also affect the line-out.}
+  \opt{erosqnative}{\note{When the Line Out is used without anything connected to the
+      Headphone port, the volume is fixed. The value is user-configurable; see \setting{Volume Limit}, \reference{ref:volume_limit}.
+      If the Headphone port is connected, the volume once again uses the normal \setting{Volume} setting,
+      regardless of whether the Line Out is in use.}}
 
 \nopt{gigabeats}{
+\section{\label{ref:volume_limit}Volume Limit}
+  This setting adjusts the maximum volume of your music. The setting is by
+  default set to the maximum volume the \dap{} supports. To set a volume
+  limit, select a volume from the list and the maximum volume will be limited to
+  the selected value all over the system.
+  \opt{xduoox3}{This setting also applies to the Line Out of the \dap{}, as at full scale the \dap{} overdrives the signal.}
+  \opt{erosqnative}{On the \playertype{}, when using the Line Out without anything connected to the Headphone port,
+      the volume is fixed to the \setting{Volume Limit} value.
+      \note{On the \playertype{}, the Line Out level at -2~dB is approximately +7~dBV, -4~dB is approximately +4~dBu,
+      and -18~dB is approximately -10~dBV.}}
+
 \section{Bass}
   This setting emphasises
   \nopt{iriverh100,iriverh300}{or suppresses}
@@ -45,13 +61,6 @@ change to customise your listening experience.
   \opt{iaudiom3,iaudiom5,iaudiox5,sansa,sansaAMS,iriverh10,iriverh10_5gb,vibe500,fuzeplus%
       ,samsungyh}{The minimum setting is -24~dB and the maximum is 24~dB.}
 
-\section{\label{ref:volume_limit}Volume Limit}
-  This setting adjusts the maximum volume of your music. The setting is by
-  default set to the maximum volume which equals to no limit. To set a volume
-  limit, select a volume from the list and the maximum volume will be limited to
-  the selected value all over the system.
-  \opt{xduoox3}{This setting also applies to the Line Out of the \dap{}, as at full scale the \dap{} overdrives the signal.}
-
 \opt{ipodvideo}{
 \section{Bass Cutoff}
   This setting controls the frequency below which the bass adjustment applies.
@@ -353,7 +362,7 @@ change to customise your listening experience.
           ,GIGABEAT_S_PAD,SANSA_C200_PAD,IAUDIO_M3_PAD,MROBE100_PAD%
           ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
           ,SAMSUNG_YH820_PAD}{\ButtonRight}
-      \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
+      \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,IPOD_4G_PAD,IPOD_3G_PAD,AIGO_EROSQ_PAD}{\ButtonScrollFwd}
       \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
       \opt{PBELL_VIBE500_PAD}{\ButtonUp}
       \opt{MPIO_HD200_PAD,XDUOO_X3_PAD}{\ButtonVolUp}
@@ -371,7 +380,7 @@ change to customise your listening experience.
           ,GIGABEAT_S_PAD,SANSA_C200_PAD,IAUDIO_M3_PAD,MROBE100_PAD%
           ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD%
           ,SAMSUNG_YH820_PAD}{\ButtonLeft}
-      \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
+      \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,IPOD_4G_PAD,IPOD_3G_PAD,AIGO_EROSQ_PAD}{\ButtonScrollBack}
       \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
       \opt{PBELL_VIBE500_PAD}{\ButtonDown}
       \opt{MPIO_HD200_PAD,XDUOO_X3_PAD}{\ButtonVolDown}
@@ -388,7 +397,7 @@ change to customise your listening experience.
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
           ,SANSA_FUZE_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IAUDIO_M3_PAD,MROBE100_PAD%
-          ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonUp}
+          ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD,AIGO_EROSQ_PAD}{\ButtonUp}
       \opt{IRIVER_H10_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRew}
       \opt{touchscreen}{\ActionStdPrev}
           &
@@ -404,7 +413,7 @@ change to customise your listening experience.
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,PBELL_VIBE500_PAD}{\ButtonRight}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
           ,SANSA_FUZE_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IAUDIO_M3_PAD,MROBE100_PAD%
-          ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonDown}
+          ,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD,AIGO_EROSQ_PAD}{\ButtonDown}
       \opt{IRIVER_H10_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonFF}
       \opt{touchscreen}{\ActionStdNext}
           &
@@ -419,7 +428,7 @@ change to customise your listening experience.
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IAUDIO_X5_PAD%
           ,SANSA_C200_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD,SANSA_E200_PAD%
-          ,SANSA_FUZE_PAD,MROBE100_PAD,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD}{\ButtonSelect}
+          ,SANSA_FUZE_PAD,MROBE100_PAD,SANSA_CLIP_PAD,SANSA_FUZEPLUS_PAD,AIGO_EROSQ_PAD}{\ButtonSelect}
       \opt{MPIO_HD200_PAD}{\ButtonFunc}
       \opt{MPIO_HD300_PAD}{\ButtonEnter}
       \opt{PBELL_VIBE500_PAD}{\ButtonOK}
@@ -444,7 +453,7 @@ change to customise your listening experience.
       \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,IRIVER_H10_PAD}{\ButtonLeft}
       \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD,MROBE100_PAD,SANSA_CLIP_PAD}{\ButtonPower}
       \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
-      \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
+      \opt{SANSA_FUZEPLUS_PAD,AIGO_EROSQ_PAD}{\ButtonBack}
       \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
       \opt{touchscreen}{\TouchTopLeft
           \opt{COWON_D2_PAD}{/ \ButtonPower}}
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 99ccde0265..5a95df27b1 100755
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -7,48 +7,51 @@
   Options relating to the battery
   in the \dap.
   \begin{description}
-    \item [Battery Capacity.] This setting can be used to tell Rockbox what
-      capacity (in mAh) the battery being used has. The default is
-      \opt{vibe500}{1000~mAh}%
-      \opt{iriverh100,iriverh300}{1300~mAh}%
-      \opt{mpiohd200}{850~mAh}%
-      \opt{ipodmini}{400~mAh (1G) or 630~mAh (2G)}%
-      \opt{ipodcolor}{700~mAh}%
-      \opt{ipodnano}{300~mAh}%
-      \opt{ipodvideo}{400~mAh (30~GB) or 600~mAh (60~GB and 80~GB)}%
-      \opt{ipod4g}{630~mAh}%
-      \opt{ipod3g}{630~mAh}%
-      \opt{ipod1g2g}{1200~mAh}%
-      \opt{iaudiom3,iaudiom5,iaudiox5}{950~mAh}%
-      \opt{gigabeatf}{2000~mAh}%
-      \opt{gigabeats}{700~mAh}%
-      \opt{cowond2}{1600~mAh}%
-      \opt{mrobe100}{720~mAh}%
-      \opt{samsungyh920,samsungyh925}{900~mAh}%
-      \opt{samsungyh820}{650~mAh}%
-      \opt{xduoox3}{2000~mAh}%
-      , which is the capacity value for the standard battery shipped with the \dap.
-        Rockbox uses this value for runtime estimation, not battery percentage
-        calculation. Changing this setting has no effect whatsoever on
-        actual battery life. This setting only affects the accuracy of the
-        runtime estimation as shown on screen.
-      \opt{iaudiom3,iaudiom5,iaudiox5}{Rockbox does not automatically distinguish
-        between the ``L'' models and the ``simple'' models which determine the
-        default value. If your \dap{} is an
-            \opt{iaudiom3}{M3L}%
-            \opt{iaudiom5}{M5L}%
-            \opt{iaudiox5}{X5L}
-        set the value to 2250~mAh for more accuracy in the runtime estimation.}
-      \opt{ipod,sansa}{This value is fairly meaningless in the \playerman{}
-        family at present, and work is on-going into finding a better way to
-        determine battery life.}
-
-      \opt{battery_types}{
-      \item [Battery Type.] This setting tells Rockbox which type of battery
-        is currently used in the \dap{}.
-       \nopt{xduoox3}{The two supported battery types are ``Alkaline'' or ``NiMH''.}
-       \opt{xduoox3}{Older \playerman{} \playertype{} units shipped with a 1500mAh battery, while newer units ships with a 2000mAh battery.  If you are not sure which type you have, older units have a button marked ``ESC''.}
-        }
+    \nopt{erosqnative}
+    {
+      \item [Battery Capacity.] This setting can be used to tell Rockbox what
+        capacity (in mAh) the battery being used has. The default is
+        \opt{vibe500}{1000~mAh}%
+        \opt{iriverh100,iriverh300}{1300~mAh}%
+        \opt{mpiohd200}{850~mAh}%
+        \opt{ipodmini}{400~mAh (1G) or 630~mAh (2G)}%
+        \opt{ipodcolor}{700~mAh}%
+        \opt{ipodnano}{300~mAh}%
+        \opt{ipodvideo}{400~mAh (30~GB) or 600~mAh (60~GB and 80~GB)}%
+        \opt{ipod4g}{630~mAh}%
+        \opt{ipod3g}{630~mAh}%
+        \opt{ipod1g2g}{1200~mAh}%
+        \opt{iaudiom3,iaudiom5,iaudiox5}{950~mAh}%
+        \opt{gigabeatf}{2000~mAh}%
+        \opt{gigabeats}{700~mAh}%
+        \opt{cowond2}{1600~mAh}%
+        \opt{mrobe100}{720~mAh}%
+        \opt{samsungyh920,samsungyh925}{900~mAh}%
+        \opt{samsungyh820}{650~mAh}%
+        \opt{xduoox3}{2000~mAh}%
+        , which is the capacity value for the standard battery shipped with the \dap.
+          Rockbox uses this value for runtime estimation, not battery percentage
+          calculation. Changing this setting has no effect whatsoever on
+          actual battery life. This setting only affects the accuracy of the
+          runtime estimation as shown on screen.
+        \opt{iaudiom3,iaudiom5,iaudiox5}{Rockbox does not automatically distinguish
+          between the ``L'' models and the ``simple'' models which determine the
+          default value. If your \dap{} is an
+              \opt{iaudiom3}{M3L}%
+              \opt{iaudiom5}{M5L}%
+              \opt{iaudiox5}{X5L}
+          set the value to 2250~mAh for more accuracy in the runtime estimation.}
+        \opt{ipod,sansa}{This value is fairly meaningless in the \playerman{}
+          family at present, and work is on-going into finding a better way to
+          determine battery life.}
+
+        \opt{battery_types}{
+        \item [Battery Type.] This setting tells Rockbox which type of battery
+          is currently used in the \dap{}.
+         \nopt{xduoox3}{The two supported battery types are ``Alkaline'' or ``NiMH''.}
+         \opt{xduoox3}{Older \playerman{} \playertype{} units shipped with a 1500mAh battery, while newer units ships with a 2000mAh battery.  If you are not sure which type you have, older units have a button marked ``ESC''.}
+          }
+    }
 
       \opt{usb_charging_enable}{
       \item [Charge During USB Connection.] This option lets you control whether
@@ -119,13 +122,16 @@ This sub menu relates to limits in the Rockbox operating system.
     Entries in File Browser} or \setting{Max Playlist Size} to take effect
     while \setting{Glyphs To Cache} will affect the next font load.}
 % TODO: this needs to be rewritten in another style, it lets you mix sound from another source into the music
-  \subsection{Line In} This option activates the line-in port on \dap, which is
-    off by default. This is useful for such applications as:
-    \begin{itemize}
-    \item Game boy $\rightarrow$ \dap $\rightarrow$ human
-    \item laptop $\rightarrow$ \dap $\rightarrow$ human
-    \item LAN party computer $\rightarrow$ \dap $\rightarrow$ human
-    \end{itemize}
+  \nopt{erosqnative}
+  {
+    \subsection{Line In} This option activates the line-in port on \dap, which is
+      off by default. This is useful for such applications as:
+      \begin{itemize}
+      \item Game boy $\rightarrow$ \dap $\rightarrow$ human
+      \item laptop $\rightarrow$ \dap $\rightarrow$ human
+      \item LAN party computer $\rightarrow$ \dap $\rightarrow$ human
+      \end{itemize}
+  }
 \opt{quickscreen}{
   \subsection{Use Shortcuts Menu Instead of Quick Screen} This option
   activates the shortcuts menu instead of opening the quick screen when enabled.
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 3903e37e1f..661964dd8a 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -111,7 +111,7 @@ follow the instructions at
 \end{description}
 }
 
-\opt{fiiom3k,shanlingq1,agptekrocker,xduoox3ii,xduoox20,aigoerosq}{
+\opt{fiiom3k,shanlingq1,agptekrocker,xduoox3ii,xduoox20,aigoerosq,erosqnative}{
 Although Rockbox is considered fully functional on the \playername{}, there are
 a few limitations compared to the original firmware which you should be aware
 of before installing.
@@ -120,7 +120,7 @@ of before installing.
     filesystems such as exFAT or NTFS are not supported.
   \item[USB DAC.] This feature is not supported by Rockbox, but you can
     dual-boot the original firmware if you want to use it.
-  \opt{shanlingq1,agptekrocker,xduoox3ii,xduoox20,aigoerosq}{\item[Wireless.] There is no support for Bluetooth\opt{shanlingq1}{ or WiFi}.
+  \opt{shanlingq1,agptekrocker,xduoox3ii,xduoox20,aigoerosq,erosqnative}{\item[Wireless.] There is no support for Bluetooth\opt{shanlingq1}{ or WiFi}.
     You can dual-boot the original firmware to use wireless functionality.}
   \item[Hotswapping SD cards.] Rockbox runs from the SD card, not the internal
     flash memory. Hotswapping is technically possible, but you need to install
@@ -266,7 +266,7 @@ people. Rockbox Utility is a graphical application that does almost everything
 for you. However, should you encounter a problem, then the manual way is
 still available to you.\\
 
-\opt{gigabeats,fiiom3k,shanlingq1}{
+\opt{gigabeats,fiiom3k,shanlingq1,erosqnative}{
   \note{The automated install is not yet available for the
   \playerlongtype{}. For now you can use the manual method to install Rockbox.
   Please still read the section on the automatic install as it explains
@@ -342,7 +342,7 @@ housekeeping tool \caps{Rockbox Utility}. It allows you to:
 Prebuilt binaries for Windows, Linux and Mac OS X are
 available at the \wikilink{RockboxUtility} wiki page.\\
 
-\opt{gigabeats,ondavx777,fiiom3k,shanlingq1}{
+\opt{gigabeats,ondavx777,fiiom3k,shanlingq1,erosqnative}{
 \note{Rockbox Utility does not currently support the \playertype{} and you will
 therefore need to follow the manual install instructions below.\\}}
 
@@ -545,7 +545,7 @@ by Rockbox, in the main directory of your \daps{} drive.
         \opt{samsungyh}{\input{getting_started/samsungyh_install.tex}}
         \opt{xduoox3}{\input{getting_started/xduoox3_install.tex}}
         \opt{xduoox3ii,xduoox20,agptekrocker,aigoerosq}{\input{getting_started/hibyos_install.tex}}
-        \opt{fiiom3k,shanlingq1}{\input{getting_started/jztool_install.tex}}
+        \opt{fiiom3k,shanlingq1,erosqnative}{\input{getting_started/jztool_install.tex}}
     }
 }
 
@@ -641,7 +641,7 @@ by Rockbox, in the main directory of your \daps{} drive.
 }
 \opt{e200}{Your e200 will automatically reboot and Rockbox should load.}
 
-\opt{fiiom3k,shanlingq1}{
+\opt{fiiom3k,shanlingq1,erosqnative}{
   Safely eject / unmount your \dap{}.
 }
 
@@ -807,16 +807,17 @@ completely follow the manual uninstallation instructions below.}}
     \playerman{} firmware.
 }
 
-\opt{fiiom3k,shanlingq1}{
+\opt{fiiom3k,shanlingq1,erosqnative}{
     If you want to remove the Rockbox bootloader, copy an original firmware
-    update to your microSD card and run the \playerman{} update by holding
-    \ActionBootOFRecovery{} while powering on the \dap{}.
+    update to your microSD card and run the \playerman{} update by 
+    \opt{erosqnative}{running it from the Original Firmware's System Settings menu.}
+    \nopt{erosqnative}{holding \ActionBootOFRecovery{} while powering on the \dap{}.}
 
     Alternatively, if you took a backup of the original \playerman{} bootloader
     you can copy the backup file, \bootbackupfilename{}, to your SD card and
     select \emph{Restore bootloader} from the recovery menu. The recovery menu
     can be accessed by holding \ActionBootRecoveryMenu{} when powering on. If
-    your \dap won't boot, use \fname{jztool} to load the bootloader over USB
+    your \dap{} won't boot, use \fname{jztool} to load the bootloader over USB
     and enter the recovery menu -- see \reference{ref:jztool_load_bootloader}.
 }
 
diff --git a/manual/getting_started/jztool_install.tex b/manual/getting_started/jztool_install.tex
index c492b6987e..ee01170f30 100644
--- a/manual/getting_started/jztool_install.tex
+++ b/manual/getting_started/jztool_install.tex
@@ -27,6 +27,8 @@ install it again if you want to keep using Rockbox.
         black. The \playerman{} splash screen will not be displayed.}
       \opt{shanlingq1}{the LCD will remain black and the \playerman{} splash
         screen will not be displayed.}
+      \opt{erosqnative}{the blue LED will light up, the LCD will remain black,
+        and the \playerman{} splash screen will not be displayed.}
   \end{enumerate}
 \item Windows users need to follow \reference{ref:install_usb_driver} now
   to make the \playertype{} accessible to \fname{jztool} before continuing.
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index bdb422e10a..f6f70b1084 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -238,9 +238,15 @@ utilities. A detailed description of the different plugins is to be found in
 \opt{quickscreen}
 {
 \section{\label{ref:QuickScreen}Quick Screen}
-  Although the \setting{Quick Screen} is accessible from nearly everywhere,
-  not just the \setting{Main Menu}, it is worth mentioning here.  It allows
-  rapid access to your four favourite settings.  The default settings are
+  \nopt{erosqnative}{
+    Although the \setting{Quick Screen} is accessible from nearly everywhere,
+    not just the \setting{Main Menu}, it is worth mentioning here.
+  }
+  \opt{erosqnative}{
+    On the \playertype{}, The \setting{Quick Screen} is only
+    available from the \setting{While Playing Screen} by default.
+  }
+  It allows rapid access to your four favourite settings.  The default settings are
   \setting{Shuffle} (\reference{ref:PlaybackSettings}),
   \setting{Repeat} (\reference{ref:PlaybackSettings}) and the
   \setting{Show Files} (\reference{ref:ShowFiles}) options, but almost all
@@ -249,7 +255,9 @@ utilities. A detailed description of the different plugins is to be found in
   \ActionStdContext.  In the menu which appears you will be given options
   to place the setting on the \setting{Quick Screen}.
   
-  Press \ActionStdQuickScreen{} to access it and \ActionQuickScreenExit{} to exit.
+  Press
+  \nopt{erosqnative}{\ActionStdQuickScreen{}}
+  \opt{erosqnative}{\ActionWpsQuickScreen{}} to access it and \ActionQuickScreenExit{} to exit.
   The direction buttons will modify the individual setting values as indicated 
   by the arrow icons. Please note that the settings at opposite sides of the
    screen cycle through the available options in opposite directions.
diff --git a/manual/platform/erosqnative.tex b/manual/platform/erosqnative.tex
new file mode 100644
index 0000000000..c7ce0f3c8b
--- /dev/null
+++ b/manual/platform/erosqnative.tex
@@ -0,0 +1,28 @@
+% $Id$ %
+\def\UseOption{erosqnative}
+\edef\UseOption{\UseOption,AIGO_EROSQ_PAD}
+\edef\UseOption{\UseOption,HAVE_BACKLIGHT}
+\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
+\edef\UseOption{\UseOption,erosqnative}
+
+\newcommand{\playerman}{Aigo}
+\newcommand{\playertype}{Eros Q}
+\newcommand{\playerlongtype}{\playertype}
+\newcommand{\dapdisplaywidth}{320}
+\newcommand{\dapdisplayheight}{240}
+\newcommand{\dapdisplaydepth}{16}
+\newcommand{\specimg}{aigoerosq}
+%Used to name the player, e.g. ...to the \dap
+\newcommand{\dap}{player}
+%For use when referring to the player. E.g. the \daps\ capacity ...
+\newcommand{\daps}{player's}
+\newcommand{\firmwarefilename}{\fname{rockbox.erosq}}
+\newcommand{\bootfilename}{\fname{bootloader.erosq}}
+\newcommand{\firmwareextension}{\fname{erosq}}
+\newcommand{\bootbackupfilename}{\fname{erosqnative-boot.bin}}
+\newcommand{\jztoolsubcommand}{erosq}
+\newcommand{\screenshotsize}{8cm}
+\newcommand{\disk}{SD card}
+
+% link external keymap file
+\input{platform/keymap-erosqnative.tex}
diff --git a/manual/platform/keymap-erosqnative.tex b/manual/platform/keymap-erosqnative.tex
new file mode 100644
index 0000000000..a05f654769
--- /dev/null
+++ b/manual/platform/keymap-erosqnative.tex
@@ -0,0 +1,118 @@
+% $Id$
+
+\newcommand{\ButtonPower}{\btnfnt{Power}}
+\newcommand{\ButtonPlay}{\btnfnt{Play}}
+\newcommand{\ButtonVolUp}{\btnfnt{Volume Up}}
+\newcommand{\ButtonVolDown}{\btnfnt{Volume Down}}
+\newcommand{\ButtonUp}{\btnfnt{Prev}}
+\newcommand{\ButtonDown}{\btnfnt{Next}}
+\newcommand{\ButtonPrev}{\btnfnt{Prev}}
+\newcommand{\ButtonNext}{\btnfnt{Next}}
+\newcommand{\ButtonSelect}{\btnfnt{Play}}
+\newcommand{\ButtonBack}{\btnfnt{Back}}
+\newcommand{\ButtonMenu}{\btnfnt{Menu}}
+\newcommand{\ButtonScrollFwd}{\btnfnt{Scroll Forward}}
+\newcommand{\ButtonScrollBack}{\btnfnt{Scroll Backward}}
+\newcommand{\ButtonLeft}{\btnfnt{Scroll Backward}}
+\newcommand{\ButtonRight}{\btnfnt{Scroll Forward}}
+
+%Button actions, standard context
+\newcommand{\ActionStdPrev}{\ButtonUp{} or \ButtonScrollBack}
+\newcommand{\ActionStdPrevRepeat}{Long \ButtonUp}
+\newcommand{\ActionStdNext}{\ButtonDown{} or \ButtonScrollFwd}
+\newcommand{\ActionStdNextRepeat}{Long \ButtonDown}
+\newcommand{\ActionStdHotkey}{Long \ButtonPlay}
+\newcommand{\ActionStdOk}{\ButtonPlay}
+\newcommand{\ActionStdCancel}{\ButtonBack}
+\newcommand{\ActionStdContext}{Long \ButtonMenu}
+\newcommand{\ActionStdMenu}{\ButtonMenu}
+\newcommand{\ActionStdKeylock}{\ButtonPower}
+
+%Button actions, wps context
+\newcommand{\ActionWpsBrowse}{\ButtonBack}
+\newcommand{\ActionWpsPlay}{\ButtonPlay}
+\newcommand{\ActionWpsSeekBack}{Long \ButtonPrev}
+\newcommand{\ActionWpsSeekFwd}{Long \ButtonNext}
+\newcommand{\ActionWpsSkipNext}{\ButtonNext}
+\newcommand{\ActionWpsSkipPrev}{\ButtonPrev}
+\newcommand{\ActionWpsQuickScreen}{Long \ButtonPlay}
+\newcommand{\ActionWpsHotkey}{\ButtonScrollBack{} or \ButtonScrollFwd}
+\newcommand{\ActionWpsVolDown}{\ButtonVolDown}
+\newcommand{\ActionWpsVolUp}{\ButtonVolUp}
+\newcommand{\ActionWpsContext}{Long \ButtonMenu}
+\newcommand{\ActionWpsMenu}{\ButtonMenu}
+\newcommand{\ActionWpsStop}{Long \ButtonPower}
+
+%Button actions, settings context
+\newcommand{\ActionSettingsInc}{\ButtonScrollFwd}
+\newcommand{\ActionSettingsIncBigStep}{\ButtonVolUp}
+\newcommand{\ActionSettingsDec}{\ButtonScrollBack}
+\newcommand{\ActionSettingsDecBigStep}{\ButtonVolDown}
+
+%Button actions, list context
+\newcommand{\ActionTreeWps}{Long \ButtonBack}
+\newcommand{\ActionListVolUp}{\ButtonVolUp}
+\newcommand{\ActionListVolDown}{\ButtonVolDown}
+
+%Button actions, tree context
+\newcommand{\ActionTreeHotkey}{Long \ButtonPlay}
+\newcommand{\ActionTreeMenu}{\ButtonMenu}
+\newcommand{\ActionTreeParentDirectory}{\ButtonBack}
+\newcommand{\ActionTreeEnter}{\ButtonSelect}
+
+%Button actions, yesno context
+\newcommand{\ActionYesNoAccept}{\ButtonPlay}
+
+%Button actions, quickscreen context
+\newcommand{\ActionQuickScreenTop}{\ButtonUp}
+\newcommand{\ActionQuickScreenRight}{\ButtonScrollFwd}
+\newcommand{\ActionQuickScreenLeft}{\ButtonScrollBack}
+\newcommand{\ActionQuickScreenDown}{\ButtonDown}
+\newcommand{\ActionQuickScreenExit}{\ButtonBack}
+
+%Button actions, Pitchscreen context
+\newcommand{\ActionPsIncSmall}{\ButtonScrollFwd}
+\newcommand{\ActionPsIncBig}{\ButtonVolUp}
+\newcommand{\ActionPsDecSmall}{\ButtonScrollBack}
+\newcommand{\ActionPsDecBig}{\ButtonVolDown}
+\newcommand{\ActionPsNudgeLeft}{\ButtonPrev}
+\newcommand{\ActionPsNudgeRight}{\ButtonNext}
+\newcommand{\ActionPsToggleMode}{\ButtonPlay}
+\newcommand{\ActionPsReset}{Long \ButtonPlay}
+\newcommand{\ActionPsExit}{\ButtonBack}
+\newcommand{\ActionPsSlower}{Long \ButtonPrev}
+\newcommand{\ActionPsFaster}{Long \ButtonNext}
+
+%Button Actions, keyboard context
+\newcommand{\ActionKbdLeft}{\ButtonScrollBack}
+\newcommand{\ActionKbdRight}{\ButtonScrollFwd}
+\newcommand{\ActionKbdCursorLeft}{\ButtonVolUp}
+\newcommand{\ActionKbdCursorRight}{\ButtonVolDown}
+\newcommand{\ActionKbdUp}{\ButtonUp}
+\newcommand{\ActionKbdDown}{\ButtonDown}
+\newcommand{\ActionKbdPageFlip}{\ButtonMenu}
+\newcommand{\ActionKbdBackspace}{\ButtonBack}
+\newcommand{\ActionKbdSelect}{\ButtonPlay}
+\newcommand{\ActionKbdDone}{Long \ButtonPlay}
+\newcommand{\ActionKbdAbort}{\ButtonPower}
+
+%Button Actions, bookmark context
+\newcommand{\ActionBmDelete}{Long \ButtonPlay}
+
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonUp}
+\newcommand{\PluginDown}{\ButtonDown}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginSelect}{\ButtonSelect}
+\newcommand{\PluginSelectRepeat}{Long \ButtonSelect}
+\newcommand{\PluginCancel}{\ButtonBack}
+\newcommand{\PluginExit}{\ButtonPower}
+\newcommand{\PluginScrollFwd}{\ButtonScrollFwd}
+\newcommand{\PluginScrollBack}{\ButtonScrollBack}
+
+\newcommand{\ActionStdUsbCharge}{\ButtonBack}
+
+\newcommand{\ActionIngenicUSBBoot}{\ButtonMenu}
+\newcommand{\ActionBootRecoveryMenu}{\ButtonVolUp}
+\newcommand{\ActionBootOFPlayer}{\ButtonPlay}
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