Implement the Sansa e200v2 manual. Please let me know about any errors/omissions.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22861 a1c6a512-1295-4272-9138-f99709370657

10 files changed, 121 insertions, 37 deletions

diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index d0fa073635..fb296e6fd8 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -17,7 +17,7 @@
                   \opt{ipodnano}{-72 to +6}%
                   \opt{ipodvideo}{-57 to +6}%
                   \opt{x5}{-73 to +6}
-                  \opt{e200}{-74 to +6}
+                  \opt{e200,e200v2}{-74 to +6}
                   \opt{ipodcolor}{-74 to +6}%
                                         & dB\\
     \nopt{x5}{%
@@ -25,13 +25,13 @@
                   \opt{masf}{-12 to +12}%
                   \opt{h100,h300}{0 to +24}%
                   \opt{ipod}{-6 to +9}%
-                  \opt{e200}{-24 to +24}%
+                  \opt{e200,e200v2}{-24 to +24}%
                                         & dB\\
       treble    & \opt{masd}{-15 to +15}%
                   \opt{masf}{-12 to +12}%
                   \opt{h100,h300}{0 to +6}%
                   \opt{ipod}{-6 to +9}%
-                  \opt{e200}{-24 to +24}%
+                  \opt{e200,e200v2}{-24 to +24}%
                                         & dB\\
     }%
     balance         & -100 to +100      & \%\\
diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index 9ea7e4713c..d06ab81bbd 100644
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -166,7 +166,7 @@
         \opt{recorder,recorderv2fm}{\ButtonOn+\ButtonRight/\ButtonLeft}
         \opt{ondio}{\ButtonMenu+\ButtonRight/\ButtonLeft}
         \opt{c200,e200,h100,h300,ipod1g2g,ipod3g,ipod4g,ipodcolor,ipodmini,ipodnano,
-        ipodvideo,x5,mrobe100,gigabeatf,gigabeats}
+        ipodvideo,x5,mrobe100,gigabeatf,gigabeats,e200v2}
         {Long \ButtonRight/\ButtonLeft}\opt{h10,h10_5gb}{Long \ButtonRew/\ButtonFF}.
         Setting this option to \setting{Yes}
         will keep the list entries at their fixed positions and allow them to be
diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index 27db3e86ce..67be4f2547 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -42,7 +42,7 @@
 }
 
   \section{Frequency}
-   \nopt{sansa}{
+   \nopt{sansa,sansaAMS}{
     Choose the recording frequency (sample rate).
     \opt{masf}{48kHz, 44.1kHz, 32kHz, 24kHz, 22.05kHz, 16kHz}
     \opt{h100,h300}{44.1kHz, 22.05kHz and 11.025kHz}
@@ -62,7 +62,7 @@
       {\note{You cannot change the sample rate for digital recordings.}
     }
    } % nopt e200  
-   \opt{e200}{ 
+   \opt{e200,e200v2}{ 
        Recordings can only be made at a 22.05kHz frequency (sample rate)
          on this \dap. 
     } % opt e200
@@ -71,7 +71,7 @@
   Choose the source of the recording. The options are: 
   \opt{recorder,recorderv2fm,h100}{\setting{SPDIF (digital)}, }%
   \nopt{ipodnano,ipodvideo}{\setting{Mic}}%
-  \nopt{sansa}{, and {\setting{Line In}}}. %
+  \nopt{sansa}{\nopt{sansaAMS}{, and {\setting{Line In}}}}. %
   \opt{radio}{For recording from the radio see \reference{ref:FMradio}.}
 
 \section{Channels}
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 3c70f4a313..ec1dd052a0 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -8,7 +8,7 @@
     screen it was when the \dap{} was shut off.
 
 \nopt{sansa}%will probably be there on Sansas one day -  exclude it the simple way without specific option
-{
+{\nopt{sansaAMS}{
   \subsection{Battery}
   Options relating to the \opt{archos}{batteries}\nopt{archos}{battery}
   in the \dap.
@@ -56,7 +56,7 @@
       }
 
      \end{description}
-}
+}}
 \opt{dircache,HAVE_DISK_STORAGE}{
 \subsection{Disk}
     Options relating to the hard disk.
@@ -161,7 +161,7 @@ this option \setting{On}. If it is not required, then turning this setting
 } 
 
 \opt{HAVE_BUTTON_LIGHTS}{
-  \opt{e200}{
+  \opt{e200,e200v2}{
   \subsection{Wheel Light Timeout}
     This setting controls the amount of time the wheel lights shine after a
     button press or wheel turn. If set to \setting{Off}, the LEDs will not
@@ -169,7 +169,7 @@ this option \setting{On}. If it is not required, then turning this setting
     never shut off. If set to a time (1 to 120 seconds), the wheel will stay
     lit for that amount of time after a button press or wheel turn.
   }
-  \nopt{e200}{
+  \nopt{e200,e200v2}{
   \subsection{Button Light Timeout}
     This setting controls the amount of time the button lights shine after a
     button press. If set to \setting{Off}, the LEDs will not light when a
diff --git a/manual/configure_rockbox/theme_settings.tex b/manual/configure_rockbox/theme_settings.tex
index b87c0f8583..5db6013a39 100644
--- a/manual/configure_rockbox/theme_settings.tex
+++ b/manual/configure_rockbox/theme_settings.tex
@@ -34,6 +34,7 @@ customize the visual apperance of Rockbox.
   \opt{ipodmini}{\url{http://themes.rockbox.org/index.php?target=ipodmini}}%
   \opt{ipodnano}{\url{http://themes.rockbox.org/index.php?target=ipodnano}}%
   \opt{e200}{\url{http://themes.rockbox.org/index.php?target=e200}}%
+  \opt{e200v2}{\url{http://themes.rockbox.org/index.php?target=e200v2}}%
   \opt{c200}{\url{http://themes.rockbox.org/index.php?target=c200}}%
   \opt{gigabeatf}{\url{http://themes.rockbox.org/index.php?target=gigabeatf}}%
   \opt{gigabeats}{\url{http://themes.rockbox.org/index.php?target=gigabeats}}%
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 582937f9ed..2fee2594c0 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -11,7 +11,7 @@ before beginning there are a few things it is important to know.
 follow the instructions at 
 \url{http://www.rockbox.org/twiki/bin/view/Main/SansaE200RInstallation}.}}
 
-\opt{ipodnano,ipodvideo,e200,c200}{
+\opt{ipodnano,ipodvideo,e200,c200,e200v2}{
 \begin{description}  
 \item[Supported hardware versions.] 
     \opt{ipodnano}{
@@ -28,7 +28,7 @@ follow the instructions at
     For information on identifying which Ipod you own, see this page on Apple's 
     website: \url{http://www.info.apple.com/kbnum/n61688}.
   }
-  \opt{e200,c200}{
+  \opt{c200}{
     The \playertype{} is available in multiple versions, not
     all of which run Rockbox.  Rockbox doesn't run on the
     newer v2 models. They can be identified
@@ -36,6 +36,13 @@ follow the instructions at
     Settings $\rightarrow$ Info. The v1
     firmware is named 01.xx.xx, while the v2 firmware begins with 03.
   }
+  \opt{e200,e200v2}{
+    The \playertype{} is available in multiple versions, and you need to make
+    sure which you have by checking the Sandisk firmware version number under 
+    Settings $\rightarrow$ Info. The v1 firmware is named 01.xx.xx, while the
+    v2 firmware begins with 03. Make sure that you are following the
+    instructions from the correct manual.
+}  
 \end{description}
 }
 
@@ -46,6 +53,14 @@ follow the instructions at
 \end{description}
 }
 
+\opt{sansaAMS}{
+\begin{description}  
+  \item[DRM capability.] It is possible that installation of the bootloader
+  may lead to you \emph{permanently} losing the ability to playback files
+  with DRM.
+\end{description}
+}
+
 \nopt{gigabeats}{
 \begin{description}  
 
@@ -83,11 +98,12 @@ follow the instructions at
     is intended to be used for USB OTG connections only (digital cameras, memory
     sticks, etc.).
   }    
-  \opt{sansa}{The following steps require you to change the setting in
+  \opt{sansa,e200v2}{
+    \note{The following steps require you to change the setting in
     \setting{Settings $\rightarrow$ USB Mode} to \setting{MSC} from within the
-    original firmware.
+    original firmware.}
 
-    \warn{Never extract files to your \dap{} while it is in recovery mode.}
+    \nopt{e200v2}{\warn{Never extract files to your \dap{} while it is in recovery mode.}}
   }
   \opt{h10,h10_5gb}{
     The installation requires you to use UMS mode and so
@@ -338,8 +354,9 @@ data partiton.}}
 60GB/80GB models.  You must ensure you download the correct version for your 
 \dap{}.}}
 
-\item Connect your \dap{} to the computer via USB
-  \opt{ipod3g,ipod4g,ipodmini,ipodcolor}{ or Firewire} as described in
+\item Connect your \dap{} to the computer via USB 
+  \opt{sansa,sansaAMS,h10,h10_5gb}{ in MSC mode }
+  \opt{ipod3g,ipod4g,ipodmini,ipodcolor}{ or Firewire }as described in
   the manual that came with your \dap{}.
 
 \item Take the \fname{.zip} file that you downloaded and use
@@ -376,6 +393,7 @@ structure that Rockbox needs.\\}
   \opt{h10,h10_5gb}{\input{getting_started/h10_install.tex}}
   \opt{gigabeatf}{\input{getting_started/gigabeat_install.tex}}
   \opt{sansa}{\input{getting_started/sansa_install.tex}}
+  \opt{sansaAMS}{\input{getting_started/sansaAMS_install.tex}}
   \opt{mrobe100}{\input{getting_started/mrobe100_install.tex}}
 }}
 
@@ -593,6 +611,10 @@ completely follow the manual uninstallation instructions below.}}
     }
 }
 
+    \opt{sansaAMS}{
+      Copy an unmodified original firmware to your player and update it.
+}
+
 \nopt{gigabeats}{
   If you wish to clean up your disk, you may also wish to delete the
   \fname{.rockbox} directory and its contents.
diff --git a/manual/getting_started/sansaAMS_install.tex b/manual/getting_started/sansaAMS_install.tex
index 9f2e25c64b..c46c4d6166 100644
--- a/manual/getting_started/sansaAMS_install.tex
+++ b/manual/getting_started/sansaAMS_install.tex
@@ -1,35 +1,71 @@
 % $Id: %
 
-In order to make your \playertype{} load and execute the Rockbox
-firmware you have just installed, you will need to install the
-Rockbox bootloader. Unless bugs are found in the bootloader code, or
-significant new features are added, you will only have to perform this
-step once.
+In order to install the bootloader, you will need to download the following
+files:
 
-These steps use the mkamsboot tool. Source code is available in the
-Rockbox SVN repository
-(\url{http://svn.rockbox.org/viewvc.cgi/trunk/rbutil/mkamsboot/}).
+\begin{itemize}
+  \item An original firmware (OF) from 
+    \opt{e200v2}{
+      \url{http://forums.sandisk.com/sansa/board/message?board.id=e200&thread.id=13548}}
+    \opt{fuse}{
+      \url{http://forums.sandisk.com/sansa/board/message?board.id=sansafuse&thread.id=23276}}
+
+  \item The bootloader: 
+    \opt{e200v2}{\download{bootloader/sandisk-sansa/e200v2/bootloader-e200v2.sansa}}
+    \opt{fuze}{\download{bootloader/sandisk-sansa/fuze/bootloader-fuze.sansa}}
+
+  \item The version of mkamsboot for your operating system from
+    \download{bootloader/sandisk-sansa/mkamsboot/}
+\end{itemize}
 
 \subsection{Bootloader installation from Windows}
 
 \begin{enumerate}
 
-% Will add when I have required install instructions %
+\item Create a folder called ``rbinstall'' on your desktop, and then extract
+  the OF, the bootloader and mkamsboot into it.
 
-\end{enumerate}
+\item Open a new command prompt, and navigate to the ``rbinstall'' folder.
 
-\subsection{Bootloader installation from Mac OS X}
+\item Run mkamsboot.exe, passing the name of the OF and bootloader files that
+  you downloaded, in addition to a name for the output file.
 
-\begin{enumerate}
+  \begin{code} 
+    \opt{fuze}{mkamsboot.exe fuzea.bin bootloader-fuze.bin patched.bin}
+    \opt{e200v2}{mkamsboot.exe e200pe.bin bootloader-e200v2.bin patched.bin}
+  \end{code}
+ 
+  If mkamsboot.exe does not report success, then retry or abort.
 
-% Same as above %
+\item Copy the output file (``patched.bin'' in the example given above) to the
+  root of the device and rename it to the same name as the OF file you downloaded earlier 
+  \opt{fuze}{(``fuzea.bin''} \opt{e200v2}{(``e200pe.bin''} above).
 
+\item Safely eject the device, unplug USB and wait for the firmware update to finish.
 \end{enumerate}
 
-\subsection{Bootloader installation from Linux}
+\subsection{Bootloader installation from Mac OS X and Linux}
 
 \begin{enumerate}
 
-% Lather rinse repeat %
+\item Create a folder called ``rbinstall'' in your home directory, and then
+  extract the OF, the bootloader and mkamsboot into it.
+
+\item Open a new terminal, and navigate to the ``rbinstall'' folder.
 
-\end{enumerate}
\ No newline at end of file
+\item Run mkamsboot, passing the name of the OF and bootloader files that
+  you downloaded, in addition to a name for the output file.
+
+  \begin{code} 
+    \opt{fuze}{./mkamsboot fuzea.bin bootloader-fuze.bin patched.bin}
+    \opt{e200v2}{./mkamsboot e200pe.bin bootloader-e200v2.bin patched.bin}
+  \end{code}
+ 
+  If mkamsboot does not report success, then retry or abort.
+
+\item Copy the output file (``patched.bin'' in the example given above) to the
+  root of the device and rename it to the same name as the OF file you downloaded earlier 
+  \opt{fuze}{(``fuzea.bin''} \opt{e200v2}{(``e200pe.bin''} above).
+
+\item Safely eject the device, unplug USB and wait for the firmware update to finish.
+\end{enumerate}
diff --git a/manual/platform/e200v2.tex b/manual/platform/e200v2.tex
new file mode 100644
index 0000000000..c9bdae0dcc
--- /dev/null
+++ b/manual/platform/e200v2.tex
@@ -0,0 +1,25 @@
+% $Id$ %
+\def\UseOption{e200v2}
+\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK}
+\edef\UseOption{\UseOption,SANSA_E200_PAD}
+\edef\UseOption{\UseOption,HAVE_BACKLIGHT}
+\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
+\edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
+\edef\UseOption{\UseOption,sansaAMS}
+
+\newcommand{\playerman}{Sansa}
+\newcommand{\playertype}{e200v2 Series}
+\newcommand{\playerlongtype}{\playertype}
+\newcommand{\genericimg}{176x220x16}
+\newcommand{\specimg}{e200}
+%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.sansa}}
+\newcommand{\firmwareextension}{\fname{sansa}}
+\newcommand{\screenshotsize}{4cm}
+\newcommand{\disk}{flash storage}
+
+% link external keymap file
+\input{platform/keymap-e200.tex}
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index c273f719fd..e51247efe9 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -100,7 +100,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
         Chose whether the original aspect ratio should be kept when scaling
         the picture to the screen%
         % targets with bigger displays than the original gameboy
-        \opt{gigabeat,h300,ipodcolor,ipodvideo,e200}{
+        \opt{gigabeat,h300,ipodcolor,ipodvideo,e200,e200v2}{
             or whether it should be displayed unscaled%
         }.
         \item[Screen Rotate.]
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index f8768c3ceb..102e138d42 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -539,8 +539,8 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
   \opt{sansaAMS}
     {
     The player will boot into the original firmware if it is powered
-    by a USB connection. That feature might go away in the future if
-    Rockbox can handle USB transfers.
+    by a USB connection. This feature may be removed in the future when
+    Rockbox is able to handle USB transfers natively.
     }
 
   \opt{mrobe100}