summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-06-23 02:18:29 +0000
committerJens Arnold <amiconn@rockbox.org>2005-06-23 02:18:29 +0000
commit97a804938996d5bbc122128eb78a074491c4ad61 (patch)
tree8e5b58c663edc49bcbffd40c8237f259ca36309c /firmware
parent6e0436f65cd461bb2b21c9a0178dfa6978213d27 (diff)
downloadrockbox-97a804938996d5bbc122128eb78a074491c4ad61.tar.gz
rockbox-97a804938996d5bbc122128eb78a074491c4ad61.zip
New feature for units that can be powered or charged from USB (Recorder fm/v2, Ondios): USB power mode, based on patch #1110332 by Pieter Bos. This way you can save battery power or even charge the battery (fm/v2) while using your unit near a PC. Hold MODE (Ondio) or F1 (fm/v2) while plugging USB to enter that mode. A tiny USB plug icon will be displayed is the status bar (overridden by the regular power plug icon in case of fm/v2 when the charger is connected).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6836 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/config-fmrecorder.h3
-rw-r--r--firmware/export/config-ondiofm.h3
-rw-r--r--firmware/export/config-ondiosp.h3
-rw-r--r--firmware/export/config-recorderv2.h3
-rw-r--r--firmware/export/usb.h3
-rw-r--r--firmware/powermgmt.c7
-rw-r--r--firmware/usb.c79
7 files changed, 70 insertions, 31 deletions
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h
index 914ef60f79..a3f2597d5d 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@@ -76,6 +76,9 @@
/* Define this for LCD backlight available */
#define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */
+/* define this if the unit can be powered or charged via USB */
+#define HAVE_USB_POWER
+
#define CONFIG_LCD LCD_SSD1815
#define BOOTFILE_EXT ".ajz"
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h
index b052832bbc..9436b86f1e 100644
--- a/firmware/export/config-ondiofm.h
+++ b/firmware/export/config-ondiofm.h
@@ -90,6 +90,9 @@
#define CONFIG_LCD LCD_SSD1815
+/* define this if the unit can be powered or charged via USB */
+#define HAVE_USB_POWER
+
#define BOOTFILE_EXT ".ajz"
#define BOOTFILE "ajbrec" BOOTFILE_EXT
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h
index 6c800b3a53..fd79d19cb7 100644
--- a/firmware/export/config-ondiosp.h
+++ b/firmware/export/config-ondiosp.h
@@ -78,6 +78,9 @@
#define CONFIG_LCD LCD_SSD1815
+/* define this if the unit can be powered or charged via USB */
+#define HAVE_USB_POWER
+
#define BOOTFILE_EXT ".ajz"
#define BOOTFILE "ajbrec" BOOTFILE_EXT
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h
index 450222dd38..c75f0e6f12 100644
--- a/firmware/export/config-recorderv2.h
+++ b/firmware/export/config-recorderv2.h
@@ -76,6 +76,9 @@
/* Define this for LCD backlight available */
#define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */
+/* define this if the unit can be powered or charged via USB */
+#define HAVE_USB_POWER
+
#define CONFIG_LCD LCD_SSD1815
#define BOOTFILE_EXT ".ajz"
diff --git a/firmware/export/usb.h b/firmware/export/usb.h
index fc96c67166..e8602e7358 100644
--- a/firmware/export/usb.h
+++ b/firmware/export/usb.h
@@ -28,5 +28,8 @@ void usb_wait_for_disconnect(struct event_queue *q);
int usb_wait_for_disconnect_w_tmo(struct event_queue *q, int ticks);
bool usb_inserted(void); /* return the official value, what's been reported to the threads */
bool usb_detect(void); /* return the raw hardware value */
+#ifdef HAVE_USB_POWER
+bool usb_powered(void);
+#endif
#endif
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index bb2e6755cb..3eab4131d1 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -437,7 +437,12 @@ static int runcurrent(void)
current = CURRENT_NORMAL;
#endif /* MEM == 8 */
- if(usb_inserted()) {
+ if(usb_inserted()
+#ifdef HAVE_USB_POWER
+ || usb_powered()
+#endif
+ )
+ {
current = CURRENT_USB;
}
diff --git a/firmware/usb.c b/firmware/usb.c
index a514f8f0b4..866ca5319c 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -47,18 +47,21 @@ void screen_dump(void); /* Nasty again. Defined in apps/ too */
#if !defined(SIMULATOR) && !defined(USB_NONE)
-/* Messages from usb_tick */
+/* Messages from usb_tick and thread states */
#define USB_INSERTED 1
#define USB_EXTRACTED 2
#ifdef HAVE_MMC
#define USB_REENABLE 3
#endif
+#ifdef HAVE_USB_POWER
+#define USB_POWERED 4
-/* Thread states */
-#define EXTRACTING 1
-#define EXTRACTED 2
-#define INSERTED 3
-#define INSERTING 4
+#if CONFIG_KEYPAD == RECORDER_PAD
+#define USBPOWER_BUTTON BUTTON_F1
+#elif CONFIG_KEYPAD == ONDIO_PAD
+#define USBPOWER_BUTTON BUTTON_MENU
+#endif
+#endif /* HAVE_USB_POWER */
/* The ADC tick reads one channel per tick, and we want to check 3 successive
readings on the USB voltage channel. This doesn't apply to the Player, but
@@ -221,8 +224,15 @@ static void usb_thread(void)
screen_dump();
}
else
+#endif
+#ifdef HAVE_USB_POWER
+ if(button_status() == USBPOWER_BUTTON)
{
+ usb_state = USB_POWERED;
+ }
+ else
#endif
+ {
/* Tell all threads that they have to back off the ATA.
We subtract one for our own thread. */
num_acks_to_expect =
@@ -230,11 +240,9 @@ static void usb_thread(void)
waiting_for_ack = true;
DEBUGF("USB inserted. Waiting for ack from %d threads...\n",
num_acks_to_expect);
-#ifdef HAVE_LCD_BITMAP
}
-#endif
break;
-
+
case SYS_USB_CONNECTED_ACK:
if(waiting_for_ack)
{
@@ -259,33 +267,37 @@ static void usb_thread(void)
case USB_EXTRACTED:
#ifdef HAVE_LCD_BITMAP
- if(!do_screendump_instead_of_usb)
- {
+ if(do_screendump_instead_of_usb)
+ break;
#endif
- if(usb_state == USB_INSERTED)
- {
- /* Only disable the USB mode if we really have enabled it
- some threads might not have acknowledged the
- insertion */
- usb_slave_mode(false);
- }
-
+#ifdef HAVE_USB_POWER
+ if(usb_state == USB_POWERED)
+ {
usb_state = USB_EXTRACTED;
-
- /* Tell all threads that we are back in business */
- num_acks_to_expect =
- queue_broadcast(SYS_USB_DISCONNECTED, NULL) - 1;
- waiting_for_ack = true;
- DEBUGF("USB extracted. Waiting for ack from %d threads...\n",
- num_acks_to_expect);
-#ifdef HAVE_LCD_CHARCELLS
- lcd_icon(ICON_USB, false);
+ break;
+ }
#endif
-#ifdef HAVE_LCD_BITMAP
+ if(usb_state == USB_INSERTED)
+ {
+ /* Only disable the USB mode if we really have enabled it
+ some threads might not have acknowledged the
+ insertion */
+ usb_slave_mode(false);
}
+
+ usb_state = USB_EXTRACTED;
+
+ /* Tell all threads that we are back in business */
+ num_acks_to_expect =
+ queue_broadcast(SYS_USB_DISCONNECTED, NULL) - 1;
+ waiting_for_ack = true;
+ DEBUGF("USB extracted. Waiting for ack from %d threads...\n",
+ num_acks_to_expect);
+#ifdef HAVE_LCD_CHARCELLS
+ lcd_icon(ICON_USB, false);
#endif
break;
-
+
case SYS_USB_DISCONNECTED_ACK:
if(waiting_for_ack)
{
@@ -475,6 +487,13 @@ bool usb_inserted(void)
return usb_state == USB_INSERTED;
}
+#ifdef HAVE_USB_POWER
+bool usb_powered(void)
+{
+ return usb_state == USB_POWERED;
+}
+#endif
+
#else
#ifdef USB_NONE