summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Guay <marcguay@rockbox.org>2008-07-06 21:32:59 +0000
committerMarc Guay <marcguay@rockbox.org>2008-07-06 21:32:59 +0000
commitf6cde72ce9e0f01cacc2d579716a8cf13da27133 (patch)
treed1e4cb601dc39f631dec813c404cd5ed69f7394b
parentf626357cc3ed710e57cd036ee81d2ac9e1830111 (diff)
downloadrockbox-f6cde72ce9e0f01cacc2d579716a8cf13da27133.zip
rockbox-f6cde72ce9e0f01cacc2d579716a8cf13da27133.tar.gz
rockbox-f6cde72ce9e0f01cacc2d579716a8cf13da27133.tar.bz2
rockbox-f6cde72ce9e0f01cacc2d579716a8cf13da27133.tar.xz
Fix a few dead references in the manual and add an 's' where one was missing.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17972 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--bootloader/telechips.c4
-rw-r--r--firmware/target/arm/tcc77x/c100/lcd-S6B33B2.c2
-rw-r--r--firmware/target/arm/tcc77x/c100/power-c100.c19
-rw-r--r--manual/main_menu/main.tex6
-rw-r--r--manual/plugins/sort.tex2
5 files changed, 21 insertions, 12 deletions
diff --git a/bootloader/telechips.c b/bootloader/telechips.c
index 9f912eb..47e508b 100644
--- a/bootloader/telechips.c
+++ b/bootloader/telechips.c
@@ -70,12 +70,12 @@ void show_debug_screen(void)
line = 1;
button = button_get(false);
- /* Power-off if POWER button has been held for a long time
+ /* Power-off if POWER button has been held for a time
This loop is currently running at about 100 iterations/second
*/
if (button & POWEROFF_BUTTON) {
power_count++;
- if (power_count > 200)
+ if (power_count > 100)
do_power_off = true;
} else {
power_count = 0;
diff --git a/firmware/target/arm/tcc77x/c100/lcd-S6B33B2.c b/firmware/target/arm/tcc77x/c100/lcd-S6B33B2.c
index 7201aee..c6ec9ee 100644
--- a/firmware/target/arm/tcc77x/c100/lcd-S6B33B2.c
+++ b/firmware/target/arm/tcc77x/c100/lcd-S6B33B2.c
@@ -213,8 +213,6 @@ void lcd_set_flip(bool yesno)
/*** update functions ***/
-/*** update functions ***/
-
void lcd_yuv_set_options(unsigned options)
{
lcd_yuv_options = options;
diff --git a/firmware/target/arm/tcc77x/c100/power-c100.c b/firmware/target/arm/tcc77x/c100/power-c100.c
index 82eb8dc..c2e69ff 100644
--- a/firmware/target/arm/tcc77x/c100/power-c100.c
+++ b/firmware/target/arm/tcc77x/c100/power-c100.c
@@ -42,6 +42,21 @@ bool ide_powered(void)
void power_off(void)
{
+
+ //sleep(HZ/1000); /* 10ms */
+ //lcd_send_command(0x02);
+
+ //sleep(HZ/1000); /* 10ms */
+ //lcd_send_command(0x00);
+
+ //sleep(HZ/1000); /* 10ms */
+ sleep(HZ/1000); /* 10ms */
+
+ // From MAIN.c
+ GPIOB &= ~(0x04);
+ //GPIOD &= ~(0x80|0x40);
+
+
}
#else /* SIMULATOR */
@@ -56,10 +71,6 @@ void charger_enable(bool on)
(void)on;
}
-void power_off(void)
-{
-}
-
void ide_power_enable(bool on)
{
(void)on;
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index a964028..560d894 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -147,12 +147,12 @@ from where you currently are.
\item[Save Current Playlist:]
Saves the current dynamic playlist, excluding queued tracks, to the
-specified file. If no path is provided then playlist is saved to current
-directory (see \reference{ref:Playlistsubmenu}).
+specified file. If no path is provided then playlist is saved to the current
+directory.
\item[Playlist Catalog:]
The \setting{Playlist Catalog} provides a simple interface to maintain
- several playlist (see \reference{label:WorkingWithPlaylists}).
+ several playlists (see \reference{ref:working_with_playlists}).
\end{description}
\section{Plugins}
diff --git a/manual/plugins/sort.tex b/manual/plugins/sort.tex
index 0f8e741..fe23060 100644
--- a/manual/plugins/sort.tex
+++ b/manual/plugins/sort.tex
@@ -1,6 +1,6 @@
\subsection{Sort}
This plugin takes a file and sorts it in ascending alphabetical order. Case is
ignored. This is useful for ordering playlists generated by the
-\setting{Create Playlist} menu option (see \reference{ref:Playlistsubmenu}).
+\setting{Create Playlist} menu option (see \reference{ref:playlistoptions}).