4 files changed, 63 insertions, 1 deletions

diff --git a/firmware/export/config-gigabeat-s.h b/firmware/export/config-gigabeat-s.h
index 8ddca5ca6d..f0e9e92a04 100644
--- a/firmware/export/config-gigabeat-s.h
+++ b/firmware/export/config-gigabeat-s.h
@@ -134,6 +134,11 @@
 
 /* define this if the unit can be powered or charged via USB */
 //#define HAVE_USB_POWER /* Disable for now */
+//#define HAVE_USB_CHARGING_ENABLE
+
+/* define this if the unit has a battery switch or battery can be removed
+ * when running */
+#define HAVE_BATTERY_SWITCH
 
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
diff --git a/firmware/export/config-gigabeat.h b/firmware/export/config-gigabeat.h
index 0c5462400b..313bdadcdd 100644
--- a/firmware/export/config-gigabeat.h
+++ b/firmware/export/config-gigabeat.h
@@ -114,6 +114,10 @@
 /* define this if the unit can be powered or charged via USB */
 #define HAVE_USB_POWER
 
+/* define this if the unit has a battery switch or battery can be removed
+ * when running */
+#define HAVE_BATTERY_SWITCH
+
 #ifndef SIMULATOR
 
 /* The LCD on a Gigabeat is 240x320 - it is portrait */
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h
index 680ca91245..fa0046ac03 100644
--- a/firmware/export/config-h300.h
+++ b/firmware/export/config-h300.h
@@ -112,6 +112,10 @@
 /* define this if the unit can be powered or charged via USB */
 #define HAVE_USB_POWER
 
+/* define this if the unit can have USB charging disabled by user -
+ * if USB/MAIN power is discernable and hardware doesn't compel charging */
+#define HAVE_USB_CHARGING_ENABLE
+
 #ifndef SIMULATOR
 
 /* define this if the backlight thread is used for fade, not for sim, needs
diff --git a/firmware/export/power.h b/firmware/export/power.h
index f74e6fe0c2..747887921d 100644
--- a/firmware/export/power.h
+++ b/firmware/export/power.h
@@ -27,8 +27,57 @@ void charger_enable(bool on);
 #endif
 
 #if CONFIG_CHARGING
-bool charger_inserted(void);
+enum power_input_flags {
+    /* No external power source? Default. */
+    POWER_INPUT_NONE = 0x00,
+ 
+    /* Main power source is available (AC?), the default other than
+     * battery if for instance USB and others cannot be distinguished or
+     * USB is the only possibility. */
+    POWER_INPUT_MAIN = 0x01,
+
+    /* USB power source is available (and is discernable from MAIN). */
+    POWER_INPUT_USB  = 0x02,
+
+    /* Something is plugged. */
+    POWER_INPUT = 0x0f,
+
+    /* POWER_INPUT_*_CHARGER of course implies presence of the respective
+     * power source. */
+
+    /* Battery not included in CHARGER (it can't charge itself) */
+
+    /* Charging is possible on main. */
+    POWER_INPUT_MAIN_CHARGER = 0x10 | POWER_INPUT_MAIN,
+
+    /* Charging is possible on USB. */
+    POWER_INPUT_USB_CHARGER = 0x20 | POWER_INPUT_USB,
+
+    /* Charging is possible from something. */
+    POWER_INPUT_CHARGER = 0xf0,
+
+#ifdef HAVE_BATTERY_SWITCH
+    /* Battery is powering device or is available to power device. It
+     * could also be used if the battery is hot-swappable to indicate if
+     * it is present ("switch" as verb vs. noun). */
+    POWER_INPUT_BATTERY = 0x100,
 #endif
+};
+
+/* Returns detailed power input status information from device. */
+unsigned int power_input_status(void);
+
+/* Shortcuts */
+/* Returns true if any power source that is connected is capable of
+ * charging the batteries.
+ * > (power_input_status() & POWER_INPUT_CHARGER) != 0 */
+bool charger_inserted(void);
+
+/* Returns true if any power input is connected - charging-capable
+ * or not.
+ * > (power_input_status() & POWER_INPUT) != 0 */
+bool power_input_present(void);
+#endif /* CONFIG_CHARGING */
 
 void power_off(void);
 void ide_power_enable(bool on);