Rename h100 manual name "h1xx" to "h100" to be in line with other players.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19361 a1c6a512-1295-4272-9138-f99709370657
diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex
index 6247fe3..a567e82 100644
--- a/manual/advanced_topics/main.tex
+++ b/manual/advanced_topics/main.tex
@@ -116,7 +116,7 @@
the last number giving the colour depth in bits) when
designing your own WPS, or if you use a WPS designed for another target.
\opt{HAVE_REMOTE_LCD}{The resolution of the remote is
- \opt{h1xx,h300}{128x64x1}\opt{x5}{128x96x2} pixels.}}
+ \opt{h100,h300}{128x64x1}\opt{x5}{128x96x2} pixels.}}
\subsubsection{Conditional Tags}
@@ -411,7 +411,7 @@
You just ``play'' a file with the extension %
\opt{recorder,recorderv2fm,ondio}{\fname{.ajz}.} %
\opt{player}{\fname{.mod}.} %
-\opt{h1xx,h300}{\fname{.iriver}.} %
+\opt{h100,h300}{\fname{.iriver}.} %
\opt{ipod}{\fname{.ipod}.} %
\opt{iaudio}{\fname{.iaudio}.} %
\opt{sansa,h10,h10_5gb}{\fname{.mi4}.} %
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 9ccccee..81d7401 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -12,7 +12,7 @@
\midrule\localendhead % endhead breaks with htlatex
volume & \opt{player}{-78 to +18}%
\opt{recorder,recorderv2fm,ondiosp,ondiofm}{-100 -to +12}%
- \opt{h1xx,h300}{-84 to 0}%
+ \opt{h100,h300}{-84 to 0}%
\opt{ipodnano}{-72 to +6}%
\opt{ipodvideo}{-57 to +6}%
\opt{x5}{-73 to +6}
@@ -21,12 +21,12 @@
& dB\\
\nopt{x5}{%
bass & \opt{MASCODEC}{-15 to +15}%
- \opt{h1xx,h300}{0 to +24}%
+ \opt{h100,h300}{0 to +24}%
\opt{ipod}{-6 to +9}%
\opt{e200}{-24 to +24}%
& dB\\
treble & \opt{MASCODEC}{-15 to +15}%
- \opt{h1xx,h300}{0 to +6}%
+ \opt{h100,h300}{0 to +6}%
\opt{ipod}{-6 to +9}%
\opt{e200}{-24 to +24}%
& dB\\
@@ -286,7 +286,7 @@
& on, off & N/A\\
remote iconset & /path/filename.bmp & N/A\\
remote viewers iconset & /path/filename.bmp & N/A\\
- \opt{h1xx,h300}{
+ \opt{h100,h300}{
remote reduce ticking
& on, off & N/A\\
}%
diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex
index c00eaef..839a565 100644
--- a/manual/appendix/file_formats.tex
+++ b/manual/appendix/file_formats.tex
@@ -25,7 +25,7 @@
\includegraphics[width=0.37cm]{appendix/images/icon-rolo.png}
& Rockbox firmware &
\opt{player}{\fname{.mod}}\opt{recorder,recorderv2fm,ondiofm,ondiosp}{\fname{.ajz}}%
- \opt{h1xx,h300}{\fname{.iriver}}\opt{ipod}{\fname{.ipod}}\opt{iaudio}{\fname{.iaudio}}%
+ \opt{h100,h300}{\fname{.iriver}}\opt{ipod}{\fname{.ipod}}\opt{iaudio}{\fname{.iaudio}}%
\opt{h10,h10_5gb,sansa}{\fname{.mi4}}\opt{gigabeat}{\fname{.gigabeat}}
& ROLO will load the new firmware \\
\includegraphics[width=0.37cm]{appendix/images/icon-wps.png}
@@ -83,13 +83,13 @@
Apple Lossless & \fname{.m4a, .mp4} & \\
Wavpack & \fname{.wv} & \\
Shorten & \fname{.shn} & Seeking not supported.\\
- \opt{h1xx,h300,x5,m5,m3}{
+ \opt{h100,h300,x5,m5,m3}{
Monkey's Audio & \fname{.ape, .mac} & -c1000 and -c2000 files decode fast enough to be useful. \\
}
\opt{gigabeat}{
Monkey's Audio & \fname{.ape, .mac} & -c1000 to -c3000 files decode fast enough to be useful. \\
}
- \nopt{h1xx,h300,x5,m5,m3,gigabeat}{%
+ \nopt{h100,h300,x5,m5,m3,gigabeat}{%
Monkey's Audio & \fname{.ape, .mac} & Only -c1000 files decode fast enough to be useful. \\
}
\\
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex
index df43984..2c505f9 100644
--- a/manual/appendix/wps_tags.tex
+++ b/manual/appendix/wps_tags.tex
@@ -133,7 +133,7 @@
\end{tagmap}
\end{table}
}
-\opt{h1xx,h300}{
+\opt{h100,h300}{
\section{Hold Switches}
\begin{table}
\begin{tagmap}{}{}
diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index b00dbb4..048d9b7 100644
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -70,12 +70,12 @@
}
} % \opt{HAVE_BACKLIGHT}
- \opt{archos,h1xx,ipodmini,ipod3g,ipod4g,x5}{
+ \opt{archos,h100,ipodmini,ipod3g,ipod4g,x5}{
\item[Contrast:]
Changes the contrast of your LCD display.
\warn{Setting the contrast too dark or too light can make it hard to
find this menu option again!}
- } % \opt{archos,h1xx,ipodmini,ipod4g,x5}
+ } % \opt{archos,h100,ipodmini,ipod4g,x5}
\opt{lcd_invert}{
\item[LCD Mode:]
@@ -124,7 +124,7 @@
Displays the screen so that the top of the display is nearest
the buttons. This is sometimes useful when carrying the \dap\ in a
pocket for easy access to the headphone socket.
- \opt{h1xx,h300}{
+ \opt{h100,h300}{
\item[Reduce Ticking:]
Enable this option if you can hear a ticking sound in your headphones
when using your remote.
@@ -165,7 +165,7 @@
Screens can be manually scrolled horizontally by pressing
\opt{recorder,recorderv2fm}{\ButtonOn+\ButtonRight/\ButtonLeft}
\opt{ondio}{\ButtonMenu+\ButtonRight/\ButtonLeft}
- \opt{c200,e200,h1xx,h300,ipod1g2g,ipod3g,ipod4g,ipodcolor,ipodmini,ipodnano,
+ \opt{c200,e200,h100,h300,ipod1g2g,ipod3g,ipod4g,ipodcolor,ipodmini,ipodnano,
ipodvideo,x5,mrobe100,gigabeatf,gigabeats}
{Long \ButtonRight/\ButtonLeft}\opt{h10,h10_5gb}{Long \ButtonRew/\ButtonFF}.
Setting this option to \setting{Yes}
diff --git a/manual/configure_rockbox/recording_settings.tex b/manual/configure_rockbox/recording_settings.tex
index 15e0b1f..a0a3743 100644
--- a/manual/configure_rockbox/recording_settings.tex
+++ b/manual/configure_rockbox/recording_settings.tex
@@ -47,7 +47,7 @@
\nopt{sansa}{
Choose the recording frequency (sample rate).
\opt{MASCODEC}{48kHz, 44.1kHz, 32kHz, 24kHz, 22.05kHz, 16kHz}
- \opt{h1xx,h300}{44.1kHz, 22.05kHz and 11.025kHz}
+ \opt{h100,h300}{44.1kHz, 22.05kHz and 11.025kHz}
\opt{x5}{88.2kHz, 44.1kHz, 22.05kHz and 11.025kHz}
are available. Higher sample rates use up more disk space, but give better
sound quality.
@@ -60,7 +60,7 @@
MPEG v1 for 48, 44.1 and 32\\
MPEG v2 for 24, 22.05 and 16\\
}
- \opt{recorder,recorderv2fm,h1xx}
+ \opt{recorder,recorderv2fm,h100}
{\note{You cannot change the sample rate for digital recordings.}
}
} % nopt e200
@@ -71,7 +71,7 @@
\section{Source}
Choose the source of the recording. The options are:
- \opt{recorder,recorderv2fm,h1xx}{\setting{SPDIF (digital)}, }%
+ \opt{recorder,recorderv2fm,h100}{\setting{SPDIF (digital)}, }%
\nopt{ipodnano,ipodvideo}{\setting{Mic}}%
\nopt{sansa}{, and {\setting{Line In}}}. %
\opt{radio}{For recording from the radio see \reference{ref:FMradio}.}
@@ -230,7 +230,7 @@
More information can be found at \wikilink{VolumeTriggeredRecording}.
-\opt{h1xx,h300}{%
+\opt{h100,h300}{%
\section{Automatic Gain Control}
The \setting{Automatic Gain Control} has five different presets for
automatically controlling the gain while recording.
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index c0116e4..60fc127 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -19,7 +19,7 @@
The volume can be adjusted from a
\opt{player}{minimum of -78 dB to a maximum of +18 dB.}%
\opt{recorder,recorderv2fm,ondio}{minimum of -100 dB to a maximum of +12 dB.}%
- \opt{h1xx,h300}{minimum of -84 dB to a maximum of 0 dB.}%
+ \opt{h100,h300}{minimum of -84 dB to a maximum of 0 dB.}%
\opt{x5,m5,ipod3g,ipod4g,gigabeatf,mrobe100}{minimum of -73 dB to a maximum of +6 dB.}%
\opt{ipodnano}{minimum of -72 dB to a maximum of +6 dB.}%
\opt{ipodvideo}{minimum of -57 dB to a maximum of +6 dB.}%
@@ -28,12 +28,12 @@
\section{Bass}
This setting emphasises
- \nopt{h1xx,h300}{or suppresses}
+ \nopt{h100,h300}{or suppresses}
the lower (bass) frequencies in the sound. A value of 0 dB means that bass
sounds are unaltered (flat response).
\opt{masd}{The minimum setting is -15 dB and the maximum is 15 dB.}%
\opt{masf}{The minimum setting is -12 dB and the maximum is 12 dB.}%
- \opt{h1xx,h300}{The minimum setting is 0 dB and the maximum is 24 dB.}%
+ \opt{h100,h300}{The minimum setting is 0 dB and the maximum is 24 dB.}%
\opt{ipodnano,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}%
\opt{ipodvideo}{The minimum setting is -12 dB and the maximum is 12 dB.}%
\opt{x5,sansa,h10,h10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.}
@@ -48,12 +48,12 @@
\section{Treble}
This setting emphasises
- \nopt{h1xx,h300}{or suppresses}
+ \nopt{h100,h300}{or suppresses}
the higher (treble) frequencies in the sound. A value of 0 dB means that
treble sounds are unaltered (flat response).
\opt{masd}{The minimum setting is -15 dB and the maximum is 15 dB.}%
\opt{masf}{The minimum setting is -12 dB and the maximum is 12 dB.}%
- \opt{h1xx,h300}{The minimum setting is 0 dB and the maximum is 6 dB.}%
+ \opt{h100,h300}{The minimum setting is 0 dB and the maximum is 6 dB.}%
\opt{ipodnano,ipodcolor}{The minimum setting is -6 dB and the maximum is 9 dB.}%
\opt{ipodvideo}{The minimum setting is -12 dB and the maximum is 12 dB.}%
\opt{x5,sansa,h10,h10_5gb}{The minimum setting is -24 dB and the maximum is 24 dB.}
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index b5183ed..8c7d93f 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -18,7 +18,7 @@
\opt{player,recorder}{1500mAh}%
\opt{recorderv2fm}{2200mAh}%
\opt{ondiosp,ondiofm}{1000mAh}%
- \opt{h1xx,h300}{1300mAh}%
+ \opt{h100,h300}{1300mAh}%
\opt{ipodmini}{400mAh (1G) or 630mAh (2G)}%
\opt{ipodcolor}{700mAh}%
\opt{ipodnano}{300mAh}%
diff --git a/manual/configure_rockbox/theme_settings.tex b/manual/configure_rockbox/theme_settings.tex
index e36e1ee..0273fe0 100644
--- a/manual/configure_rockbox/theme_settings.tex
+++ b/manual/configure_rockbox/theme_settings.tex
@@ -15,7 +15,7 @@
There are a number of themes that ship with Rockbox. If none of
these suit your needs, many more can be downloaded from
\opt{RECORDER_PAD}{\wikilink{WpsArchos}}%
- \opt{h1xx}{\wikilink{WpsIriverH100}}%
+ \opt{h100}{\wikilink{WpsIriverH100}}%
\opt{h300,ipodcolor}{\wikilink{WpsIriverH300}}%
\opt{ipodvideo}{\wikilink{WpsIpod5g}}%
\opt{ipodnano}{\wikilink{WpsIpodNano}}%
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 982201b..40c4aba 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -319,7 +319,7 @@
\opt{swcodec}{
\subsubsection{Installing the bootloader}
- \opt{h1xx,h300}{\input{getting_started/iriver_install.tex}}
+ \opt{h100,h300}{\input{getting_started/iriver_install.tex}}
\opt{ipod}{\input{getting_started/ipod_install.tex}}
\opt{m5,x5}{\input{getting_started/iaudio_install.tex}}
\opt{h10,h10_5gb}{\input{getting_started/h10_install.tex}}
@@ -387,7 +387,7 @@
installed Rockbox manually you can still use Rockbox Utility for uninstallation
but will not be able to do this selectively.
-\opt{h1xx,h300}{\note{Rockbox Utility cannot uninstall the bootloader due to
+\opt{h100,h300}{\note{Rockbox Utility cannot uninstall the bootloader due to
the fact that it requires a flashing procedure. To uninstall the bootloader
completely follow the manual uninstallation instructions below.}}
@@ -439,7 +439,7 @@
and insert the charger. The original firmware will automatically be flashed.
}
-\opt{h1xx,h300}{
+\opt{h100,h300}{
\note{
If you want to remove the Rockbox bootloader, simply flash an unpatched
\playerman{} firmware. Be aware that doing so will also remove the bootloader
@@ -447,7 +447,7 @@
having disk errors) it is recommended to keep the bootloader. It also
gives you the possibility of trying Rockbox anytime later by simply
installing the distribution files.
- \opt{h1xx}{
+ \opt{h100}{
The Rockbox bootloader will automatically start the original firmware if
the \fname{.rockbox} directory has been deleted.
}%
diff --git a/manual/platform/h1xx.tex b/manual/platform/h100.tex
similarity index 86%
rename from manual/platform/h1xx.tex
rename to manual/platform/h100.tex
index 85d3ba8..bbb659d 100644
--- a/manual/platform/h1xx.tex
+++ b/manual/platform/h100.tex
@@ -1,5 +1,5 @@
% $Id$ %
-\def\UseOption{h1xx}
+\def\UseOption{h100}
\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH}
\edef\UseOption{\UseOption,IRIVER_H100_PAD}
\edef\UseOption{\UseOption,HAVE_REMOTE_LCD}
@@ -9,10 +9,10 @@
\edef\UseOption{\UseOption,iriver}
\newcommand{\playerman}{Iriver}
-\newcommand{\playertype}{H1xx}
+\newcommand{\playertype}{H100}
\newcommand{\playerlongtype}{iHP100, iHP115, iHP120, iHP140, H120 and H140}
\newcommand{\genericimg}{160x128x2}
-\newcommand{\specimg}{h1xx}
+\newcommand{\specimg}{h100}
%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 ...
@@ -22,5 +22,5 @@
\newcommand{\disk}{hard disk}
% link external keymap file
-\input{platform/keymap-h1xx_h300.tex}
+\input{platform/keymap-h100_h300.tex}
diff --git a/manual/platform/h300.tex b/manual/platform/h300.tex
index fb576de..fce8823 100644
--- a/manual/platform/h300.tex
+++ b/manual/platform/h300.tex
@@ -22,5 +22,5 @@
\newcommand{\disk}{hard disk}
% link external keymap file
-\input{platform/keymap-h1xx_h300.tex}
+\input{platform/keymap-h100_h300.tex}
diff --git a/manual/platform/keymap-h1xx_h300.tex b/manual/platform/keymap-h100_h300.tex
similarity index 100%
rename from manual/platform/keymap-h1xx_h300.tex
rename to manual/platform/keymap-h100_h300.tex
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index e03892a..e8aadb0 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -16,7 +16,7 @@
\section{Games}
\opt{lcd_bitmap}
{See also the Chip{}-8 emulator in \reference{ref:Chip8emulator}
- \opt{recorder,recorderv2fm,h1xx,m5,lcd_color}
+ \opt{recorder,recorderv2fm,h100,m5,lcd_color}
{and Rockboy in \reference{ref:Rockboy}}.}
\opt{lcd_bitmap}{\input{plugins/blackjack.tex}}
@@ -45,7 +45,7 @@
\opt{player}{\input{plugins/nim.tex}}
-\opt{h1xx,m5,lcd_color}{\nopt{c200}{\input{plugins/pacbox.tex}}}
+\opt{h100,m5,lcd_color}{\nopt{c200}{\input{plugins/pacbox.tex}}}
\opt{lcd_bitmap}{\input{plugins/pegbox.tex}}
@@ -128,7 +128,7 @@
\opt{recorder,recorderv2fm,ondio}{\input{plugins/rockbox_flash.tex}}
-\opt{recorder,recorderv2fm,h1xx,m5,lcd_color}{\input{plugins/rockboy.tex}}
+\opt{recorder,recorderv2fm,h100,m5,lcd_color}{\input{plugins/rockboy.tex}}
{\input{plugins/search.tex}}
diff --git a/manual/plugins/mandelbrot.tex b/manual/plugins/mandelbrot.tex
index f474c37..18daea2 100644
--- a/manual/plugins/mandelbrot.tex
+++ b/manual/plugins/mandelbrot.tex
@@ -1,7 +1,7 @@
\subsection{Mandelbrot}
\screenshot{plugins/images/ss-mandelbrot}{Mandelbrot}{img:mandelbrot}
This demonstration draws fractal images from the Mandelbrot set
-\opt{archos,h1xx}{using the greyscale engine}.
+\opt{archos,h100}{using the greyscale engine}.
\begin{table}
\begin{btnmap}{}{}
Direction keys
diff --git a/manual/plugins/sliding.tex b/manual/plugins/sliding.tex
index d586853..9e4ecf4 100644
--- a/manual/plugins/sliding.tex
+++ b/manual/plugins/sliding.tex
@@ -8,7 +8,7 @@
\begin{table}
\begin{btnmap}{}{}
- \opt{RECORDER_PAD,ONDIO_PAD,h1xx,h300,x5,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
+ \opt{RECORDER_PAD,ONDIO_PAD,h100,h300,x5,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}
{\ButtonLeft, \ButtonRight, \ButtonUp\ and \ButtonDown}
\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft{} / \ButtonRight{} / \ButtonMenu{} / \ButtonPlay}
\opt{IRIVER_H10_PAD}{\ButtonLeft{} / \ButtonRight{} / \ButtonScrollUp{} / \ButtonScrollDown}
@@ -16,7 +16,7 @@
%
\opt{RECORDER_PAD}{\ButtonFOne}
\opt{ONDIO_PAD}{Long \ButtonMenu}
- \opt{h1xx,h300,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
+ \opt{h100,h300,GIGABEAT_PAD,MROBE100_PAD}{\ButtonSelect}
\opt{x5,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
\opt{IRIVER_H10_PAD}{\ButtonRew}
@@ -24,7 +24,7 @@
%
\opt{RECORDER_PAD}{\ButtonFTwo}
\opt{ONDIO_PAD}{\ButtonMenu}
- \opt{h1xx,h300}{\ButtonOn}
+ \opt{h100,h300}{\ButtonOn}
\opt{x5,IRIVER_H10_PAD}{\ButtonPlay}
\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
\opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect}
diff --git a/manual/rockbox_interface/images/h1xx-front.pdf b/manual/rockbox_interface/images/h100-front.pdf
similarity index 100%
rename from manual/rockbox_interface/images/h1xx-front.pdf
rename to manual/rockbox_interface/images/h100-front.pdf
Binary files differ
diff --git a/manual/rockbox_interface/images/h1xx-front.png b/manual/rockbox_interface/images/h100-front.png
similarity index 100%
rename from manual/rockbox_interface/images/h1xx-front.png
rename to manual/rockbox_interface/images/h100-front.png
Binary files differ
diff --git a/manual/rockbox_interface/images/h1xx-front.svg b/manual/rockbox_interface/images/h100-front.svg
similarity index 100%
rename from manual/rockbox_interface/images/h1xx-front.svg
rename to manual/rockbox_interface/images/h100-front.svg
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 93fea71..a0ad76c 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -22,7 +22,7 @@
\wikilink{BlindFAQ}.
%
- \opt{h1xx}{
+ \opt{h100}{
If you put the \dap{} on a table with the joystick pointing
towards you, and the curved sides at the top, you will find the following
if you start from the top-right corner and follow the side of the \dap{} in a
@@ -455,7 +455,7 @@
simultaneously until the player hard resets.
}
- \opt{h1xx,h300}
+ \opt{h100,h300}
{
Rockbox has a dual-boot feature. To boot into the original firmware,
when the \dap{} is turned off, press and hold the \ButtonRec{} button,
diff --git a/tools/configure b/tools/configure
index 7f02f97..e382a42 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2116,7 +2116,7 @@
manualdev="recorderv2fm"
;;
h1??)
- manualdev="h1xx"
+ manualdev="h100"
;;
ipodmini2g)
manualdev="ipodmini"