diff options
author | Nils Wallménius <nils@rockbox.org> | 2007-05-13 16:59:48 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2007-05-13 16:59:48 +0000 |
commit | 96b8e1bb91203a7ee2d208be442ea230fdc226aa (patch) | |
tree | 81e4a725445b6d0250a73a9717d386ead7536137 /manual | |
parent | f04e85a92ab6f5a8584350faa72771b2acb92a40 (diff) | |
download | rockbox-96b8e1bb91203a7ee2d208be442ea230fdc226aa.tar.gz rockbox-96b8e1bb91203a7ee2d208be442ea230fdc226aa.zip |
Make ipod installation a little bit clearer. Introduce a subsection called 'Starting original firmware' for targets with dualboot. Improve uninstallation instructions as suggested by linuxstb. Closes FS#7079 and FS#7086
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13379 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'manual')
-rw-r--r-- | manual/getting_started/installation.tex | 84 | ||||
-rw-r--r-- | manual/getting_started/ipod_install.tex | 15 | ||||
-rw-r--r-- | manual/rockbox_interface/main.tex | 73 |
3 files changed, 83 insertions, 89 deletions
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex index 7bdcb3587b..c56a2d0d81 100644 --- a/manual/getting_started/installation.tex +++ b/manual/getting_started/installation.tex | |||
@@ -135,7 +135,7 @@ software. | |||
135 | most of the Rockbox code is contained in a | 135 | most of the Rockbox code is contained in a |
136 | ``build'' that resides on your \daps{} drive. This makes it easy to | 136 | ``build'' that resides on your \daps{} drive. This makes it easy to |
137 | update Rockbox. The build consists of a directory called | 137 | update Rockbox. The build consists of a directory called |
138 | \fname{.rockbox} containg all of Rockbox' files, which is located in the | 138 | \fname{.rockbox} containing all of Rockbox' files, which is located in the |
139 | root of your \daps{} drive. | 139 | root of your \daps{} drive. |
140 | 140 | ||
141 | \end{description} | 141 | \end{description} |
@@ -309,15 +309,14 @@ The new build will be installed over your current build. | |||
309 | connect the \dap{} to your computer, and delete the | 309 | connect the \dap{} to your computer, and delete the |
310 | \fname{\firmwarefilename} file. | 310 | \fname{\firmwarefilename} file. |
311 | } | 311 | } |
312 | \nopt{gigabeat,x5,archos} | ||
313 | { | ||
314 | \note{The Rockbox bootloader can start the original firmware on your \dap. | ||
315 | (See \reference{ref:Dualboot} for more information.)}} | ||
312 | 316 | ||
313 | \opt{SWCODEC}{ | 317 | \opt{h10,h10_5gb}{ |
314 | If you would like to go back to using the original \playerman{} software, | 318 | If you would like to go back to using the original \playerman{} software, |
315 | connect the \dap{} to your computer, and delete the | 319 | connect the \dap{} to your computer, and delete the |
316 | \fname{/.rockbox/\firmwarefilename} file. | ||
317 | } | ||
318 | |||
319 | \opt{h10,h10_5gb}{ | ||
320 | Next, delete the | ||
321 | \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}} file and rename | 320 | \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}} file and rename |
322 | \fname{OF.mi4} to \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}} | 321 | \fname{OF.mi4} to \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}} |
323 | in the \fname{System} directory on your \playertype{}. As in the installation, | 322 | in the \fname{System} directory on your \playertype{}. As in the installation, |
@@ -325,53 +324,50 @@ The new build will be installed over your current build. | |||
325 | } | 324 | } |
326 | 325 | ||
327 | \opt{e200}{ | 326 | \opt{e200}{ |
328 | You then need to follow the instructions to install the bootloader, but when | 327 | If you would like to go back to using the original \playerman{} software, |
329 | prompted by sansapatcher, enter 'u' for uninstall, instead of 'i' for install. | 328 | connect the \dap{} to your computer, and follow the instructions to install |
330 | As in the installation, it may be necessary to first put your device into UMS | 329 | the bootloader, but when prompted by sansapatcher, enter 'u' for uninstall, |
331 | mode. | 330 | instead of 'i' for install. As in the installation, it may be necessary to |
331 | first put your device into UMS mode. | ||
332 | } | 332 | } |
333 | 333 | ||
334 | \optv{ipod}{ | 334 | \optv{ipod}{ |
335 | You then need to follow the instructions to install the bootloader, but when | 335 | If you would like to go back to using the original \playerman{} software, |
336 | prompted by ipodpatcher, enter 'u' for uninstall, instead of 'i' for install. | 336 | connect the \dap{} to your computer, and follow the instructions to install |
337 | the bootloader, but when prompted by ipodpatcher, enter 'u' for uninstall, | ||
338 | instead of 'i' for install. | ||
337 | } | 339 | } |
338 | 340 | ||
339 | \opt{m5,x5}{ | 341 | \opt{m5,x5}{ |
340 | Download the original \playername{} firmware from the \playerman{} web site. | 342 | If you would like to go back to using the original \playerman{} software, |
341 | And copy it to the \fname{FIRMWARE} directory on your \playername{}. Turn off the | 343 | connect the \dap{} to your computer, download the original \playername{} |
342 | \dap{}, remove the USB cable and insert the charger. The original | 344 | firmware from the \playerman{} web site. And copy it to the \fname{FIRMWARE} |
343 | firmware will automatically be flashed. | 345 | directory on your \playername{}. Turn off the \dap{}, remove the USB cable |
346 | and insert the charger. The original firmware will automatically be flashed. | ||
344 | } | 347 | } |
345 | 348 | ||
346 | If you wish to clean up your disk, you may also wish to delete the | 349 | \opt{h1xx,h300}{ |
347 | \fname{.rockbox} folder and its contents. | ||
348 | \nopt{m5,x5}{Turn the \playerman{} off.} | ||
349 | |||
350 | \opt{h300}{Press and hold the \ButtonRec{} button.} | ||
351 | |||
352 | \nopt{m5,x5}{Turn the \dap{} back on and the original \playerman{} software | ||
353 | will load.} | ||
354 | |||
355 | \opt{h1xx}{ | ||
356 | \note{ | 350 | \note{ |
357 | There's no need to remove the installed boot loader. If you want to remove | 351 | If you want to remove the Rockbox bootloader, simply flash an unpatched |
358 | it, simply flash an unpatched \playerman{} firmware. Be aware that doing so | 352 | \playerman{} firmware. Be aware that doing so will also remove the boot |
359 | will also remove the boot loader USB mode. As that mode can come in quite | 353 | loader USB mode. As that mode can come in quite handy (especially when |
360 | handy (especially when having disk errors) it is recommended to keep the | 354 | having disk errors) it is recommended to keep the boot loader. It also |
361 | boot loader. It also gives you the possibility of trying Rockbox anytime | 355 | gives you the possibility of trying Rockbox anytime later by simply |
362 | later by simply installing the distribution files. | 356 | installing the distribution files. |
357 | \opt{h1xx}{ | ||
358 | The Rockbox bootlaoder will automatically start the original firmware if | ||
359 | the \fname{.rockbox} folder has been deleted. | ||
360 | }% | ||
361 | \opt{h300}{% | ||
362 | Although if you retain the Rockbox boot loader, you will need to hold the | ||
363 | \ButtonRec{} button each time you want to start the original firmware. | ||
364 | } | ||
363 | } | 365 | } |
364 | } | 366 | } |
365 | 367 | ||
366 | \opt{h300}{ | 368 | If you wish to clean up your disk, you may also wish to delete the |
367 | \note{ | 369 | \fname{.rockbox} folder and its contents. |
368 | There's no need to remove the installed boot loader, although if you | 370 | \nopt{m5,x5}{Turn the \playerman{} off. |
369 | retain the Rockbox boot loader, you will need to hold the \ButtonRec{} | 371 | Turn the \dap{} back on and the original \playerman{} software will load. |
370 | button each time you want to start the original firmware. If you want to | ||
371 | remove it simply flash an unpatched \playerman{} firmware. Be aware that | ||
372 | doing so will also remove the boot loader USB mode. As that mode can come in | ||
373 | quite handy (especially when having disk errors), you may wish to keep the | ||
374 | boot loader. It also gives you the possibility of trying Rockbox anytime | ||
375 | later by simply installing a new build. | ||
376 | } | ||
377 | } | 372 | } |
373 | |||
diff --git a/manual/getting_started/ipod_install.tex b/manual/getting_started/ipod_install.tex index d76f9f5683..0e672d7048 100644 --- a/manual/getting_started/ipod_install.tex +++ b/manual/getting_started/ipod_install.tex | |||
@@ -30,8 +30,9 @@ install the bootloader. After a short time you should see the message | |||
30 | ``[INFO] Bootloader installed successfully.'' Press ENTER again to exit | 30 | ``[INFO] Bootloader installed successfully.'' Press ENTER again to exit |
31 | ipodpatcher. | 31 | ipodpatcher. |
32 | 32 | ||
33 | \item Make sure you have a \fname{.rockbox} folder in the | 33 | \item Make sure that you have correctly extracted a build of Rockbox so that |
34 | root of your \daps{} drive and that you have also installed the fonts | 34 | you have a \fname{/.rockbox}, which contains all the files needed by Rockbox |
35 | in the root of your \daps{} drive and that you have also installed the fonts | ||
35 | package -- see \reference{sec:installing_firmware} for more information. | 36 | package -- see \reference{sec:installing_firmware} for more information. |
36 | 37 | ||
37 | \item Disconnect your \dap{} in the usual way. The bootloader is now installed. | 38 | \item Disconnect your \dap{} in the usual way. The bootloader is now installed. |
@@ -76,8 +77,9 @@ Wait for it to connect, and then eject and unplug it in the normal way. | |||
76 | prevent Rockbox immediately rebooting your \dap{} into disk mode when it | 77 | prevent Rockbox immediately rebooting your \dap{} into disk mode when it |
77 | detects that your \dap{} is attached to a computer. } | 78 | detects that your \dap{} is attached to a computer. } |
78 | 79 | ||
79 | \item Make sure you have a \fname{.rockbox} folder in the | 80 | \item Make sure that you have correctly extracted a build of Rockbox so that |
80 | root of your \daps{} drive and that you have also installed the fonts | 81 | you have a \fname{/.rockbox}, which contains all the files needed by Rockbox |
82 | in the root of your \daps{} drive and that you have also installed the fonts | ||
81 | package -- see \reference{sec:installing_firmware} for more information. | 83 | package -- see \reference{sec:installing_firmware} for more information. |
82 | 84 | ||
83 | \end{enumerate} | 85 | \end{enumerate} |
@@ -111,8 +113,9 @@ bootloader. Press i followed by ENTER, and ipodpatcher will now install the | |||
111 | bootloader. After a short time you should see the message ``[INFO] Bootloader | 113 | bootloader. After a short time you should see the message ``[INFO] Bootloader |
112 | installed successfully.'' Press ENTER again to exit ipodpatcher. | 114 | installed successfully.'' Press ENTER again to exit ipodpatcher. |
113 | 115 | ||
114 | \item Make sure you have a \fname{.rockbox} folder in the | 116 | \item Make sure that you have correctly extracted a build of Rockbox so that |
115 | root of your \daps{} drive and that you have also installed the fonts | 117 | you have a \fname{/.rockbox}, which contains all the files needed by Rockbox |
118 | in the root of your \daps{} drive and that you have also installed the fonts | ||
116 | package -- see \reference{sec:installing_firmware} for more information. | 119 | package -- see \reference{sec:installing_firmware} for more information. |
117 | 120 | ||
118 | \item Disconnect your \dap{} in the usual way. The bootloader is now installed. | 121 | \item Disconnect your \dap{} in the usual way. The bootloader is now installed. |
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex index 430cf4837b..85f9a96120 100644 --- a/manual/rockbox_interface/main.tex +++ b/manual/rockbox_interface/main.tex | |||
@@ -167,68 +167,63 @@ To turn on and off your Rockbox enabled \dap{} use the following keys: | |||
167 | 167 | ||
168 | \label{ref:Safeshutdown}On shutdown, Rockbox automatically saves its settings. | 168 | \label{ref:Safeshutdown}On shutdown, Rockbox automatically saves its settings. |
169 | 169 | ||
170 | \opt{PLAYER_PAD,RECORDER_PAD,ONDIO_PAD}{% | ||
171 | In the unlikely event of a software failure, a hardware power off can be | ||
172 | performed by holding down | ||
173 | \opt{PLAYER_PAD}{\ButtonStop}% | ||
174 | \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonOff} | ||
175 | until the \nopt{ondiosp,ondiofm}{\dap{} power light}% | ||
176 | \opt{ondiosp,ondiofm}{\daps{} display} goes off.% | ||
177 | } | ||
178 | |||
170 | \nopt{gigabeat,x5,archos} | 179 | \nopt{gigabeat,x5,archos} |
171 | { | 180 | { |
181 | \subsection{Starting the original firmware} | ||
182 | \label{ref:Dualboot} | ||
172 | \opt{ipod} | 183 | \opt{ipod} |
173 | { | 184 | { |
174 | Rockbox has a dual-boot feature. To boot into the original firmware, shut | 185 | Rockbox has a dual-boot feature. To boot into the original firmware, shut |
175 | down the device as described above. Turn on the ``hold'' switch | 186 | down the device as described above. Turn on the ``hold'' switch |
176 | immediately after turning the player on. Once Rockbox displays the | 187 | immediately after turning the player on. Once Rockbox displays the |
177 | message ``Loading original firmware ...'' you may turn the ``hold'' | 188 | message ``Loading original firmware ...'' you may turn the ``hold'' |
178 | switch off. Rockbox will boot into the original firmware. | 189 | switch off. Rockbox will boot into the original firmware. |
179 | 190 | ||
180 | \note{The described method of dual-booting works with Rockbox bootloader | 191 | \note{The described method of dual-booting works with Rockbox bootloader |
181 | version 2, which was released 16 December 2006. If you have the older | 192 | version 2, which was released 16 December 2006. If you have the older |
182 | bootloader, boot the original firmware by pressing \ButtonMenu{} | 193 | bootloader, boot the original firmware by pressing \ButtonMenu{} |
183 | immediately after turning on your Ipod. Do not release the | 194 | immediately after turning on your Ipod. Do not release the |
184 | \ButtonMenu{} button until you see the ``Loading original firmware...'' | 195 | \ButtonMenu{} button until you see the ``Loading original firmware...'' |
185 | message on the screen.} | 196 | message on the screen.} |
186 | 197 | ||
187 | Regardless of which method you use to boot to the original firmware, you can | 198 | Regardless of which method you use to boot to the original firmware, you can |
188 | return to Rockbox by pressing and holding \ButtonMenu{} and \ButtonSelect{} | 199 | return to Rockbox by pressing and holding \ButtonMenu{} and \ButtonSelect{} |
189 | simultaneously until the player reboots. | 200 | simultaneously until the player reboots. |
190 | } | 201 | } |
191 | 202 | ||
192 | \opt{h1xx} | 203 | \opt{h1xx,h300} |
193 | { | 204 | { |
194 | Rockbox has a dual-boot feature. To boot into the original firmware, | 205 | Rockbox has a dual-boot feature. To boot into the original firmware, |
195 | press and hold the \ButtonRec{} button, and then press the \ButtonOn{} | 206 | when the \dap{} is turned off, press and hold the \ButtonRec{} button, |
196 | button. | 207 | and then press the \ButtonOn{} button. |
197 | } | ||
198 | |||
199 | \opt{h300} | ||
200 | { | ||
201 | Rockbox has a dual-boot feature. To boot into the original firmware, | ||
202 | press and hold the \ButtonRec{} button, and then press and hold the | ||
203 | \ButtonOn{} button. | ||
204 | } | 208 | } |
205 | 209 | ||
206 | \opt{h10,h10_5gb} | 210 | \opt{h10,h10_5gb} |
207 | { | 211 | { |
208 | Rockbox has a dual-boot feature. To boot into the original firmware, | 212 | Rockbox has a dual-boot feature. To boot into the original firmware, |
209 | press and hold the \ButtonRew{} button while turning on the player. | 213 | press and hold the \ButtonRew{} button while turning on the player. |
210 | \note{The iriver firmware doesn't shut down properly when you turn it off, | 214 | \note{The iriver firmware doesn't shut down properly when you turn it off, |
211 | it only goes to sleep. To get back into Rockbox when exiting from the | 215 | it only goes to sleep. To get back into Rockbox when exiting from the |
212 | iriver firmware, you will need to reset the player by \opt{h10}{inserting a | 216 | iriver firmware, you will need to reset the player by \opt{h10}{inserting a |
213 | pin in the reset hole}\opt{h10_5gb}{taking out battery}.} | 217 | pin in the reset hole}\opt{h10_5gb}{taking out battery}.} |
214 | } | 218 | } |
215 | 219 | ||
216 | \opt{e200} | 220 | \opt{e200} |
217 | { | 221 | { |
218 | Rockbox has a dual-boot feature. To boot into the original firmware, | 222 | Rockbox has a dual-boot feature. To boot into the original firmware, |
219 | press and hold the \ButtonLeft{} button while turning on the player. | 223 | press and hold the \ButtonLeft{} button while turning on the player. |
220 | } | 224 | } |
221 | } | 225 | } |
222 | 226 | ||
223 | |||
224 | \opt{PLAYER_PAD,RECORDER_PAD,ONDIO_PAD}{% | ||
225 | In the unlikely event of a software failure, a hardware power off can be | ||
226 | performed by holding down | ||
227 | \opt{PLAYER_PAD}{\ButtonStop}% | ||
228 | \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonOff} | ||
229 | until the \nopt{ondiosp,ondiofm}{\dap{} power light}% | ||
230 | \opt{ondiosp,ondiofm}{\daps{} display} goes off.% | ||
231 | } | ||
232 | \subsection{The first contact} | 227 | \subsection{The first contact} |
233 | 228 | ||
234 | After you have first started the \dap{} you'll be presented by the | 229 | After you have first started the \dap{} you'll be presented by the |