usb: remove "Ask" USB Mode (FS#13317)

USB ask mode is basically a footgun: it can't work on native targets
and doesn't work reliably on hosted ones, and it continually produces
a slow trickle of problems. FS#13317 gives a rundown of the issues.
Removing the setting seems like the best solution for now, since a fix
would be pretty involved.

This partially reverts 60f581e8f5. The USB Mode setting is left in
place so the option can be added back later in a non-buggy way.

Change-Id: Ie01b28dd2ed95a31b509a7834d85bac8eb866098

2 files changed, 14 insertions, 11 deletions

diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 5a95df27b1..52750f7486 100755
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -870,8 +870,14 @@ therefore result in better runtime.
 \opt{usb_power}{
   \subsection{USB Mode}
     This controls what happens with the \dap{}'s USB port is connected.
-    \setting{Charge Only} and \setting{Mass Storage} will automatically enter
-    that mode, and \setting{Ask} will prompt the user each time.
+    \setting{Mass Storage} allows you to transfer files, while
+    \setting{Charge Only} will only charge the battery (and allow you to keep
+    using the player). You can choose the opposite behavior by holding down any
+    button while plugging in the USB cable.
+    \nopt{fuzeplus}{
+    \note{Be aware that holding a button may still perform its normal function,
+    so it is recommended to use a button without harmful side effects, such as
+    \ActionStdUsbCharge{}.}
 }
 \opt{multidrive_usb}{
   \subsection{USB Hide Internal Drive}
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 20aa8c833e..82192829fd 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -848,16 +848,13 @@ properly.}
 
   \opt{usb_power}{
     \section{USB Charging}
-    Whenever your \dap{} is connected to USB, it will automatically charge.
-    However, depending on the \config{usb\_mode} setting, the \dap{} may also
-    enter mass storage mode or prompt the user for what action to take.
-    When the \dap{} is configured to enter mass storage mode or automatically
-    charge, you may trigger the opposite behavior by holding down any button
-    while plugging it in.  Your \dap{} must already be in Rockbox for this to
-    function.
+    Your \dap{} will automatically charge when connected to USB. By default
+    Rockbox will connect in mass storage mode to transfer files, but you can
+    prevent this by holding down any button while plugging in the USB cable,
+    or by changing the \setting{USB Mode} setting to \setting{Charge Only}.
     \nopt{fuzeplus}{
-    \note{Be aware that this button may still perform its normal function, so
-    it is recommended to use a button without harmful side effects, such as
+    \note{Be aware that holding a button may still perform its normal function,
+    so it is recommended to use a button without harmful side effects, such as
     \ActionStdUsbCharge{}.}
     }
   }