diff options
-rw-r--r-- | apps/debug_menu.c | 5 | ||||
-rw-r--r-- | apps/lang/english.lang | 14 | ||||
-rw-r--r-- | apps/settings.h | 2 | ||||
-rw-r--r-- | apps/settings_list.c | 4 | ||||
-rw-r--r-- | firmware/export/config/gigabeats.h | 2 | ||||
-rw-r--r-- | firmware/export/usb.h | 13 | ||||
-rw-r--r-- | firmware/export/usb_core.h | 10 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c | 8 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c | 9 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h300/power-h300.c | 17 | ||||
-rw-r--r-- | firmware/usbstack/usb_core.c | 42 |
11 files changed, 87 insertions, 39 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 1288d9acac..f14b7cdcdf 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -1556,9 +1556,6 @@ static bool view_battery(void) | |||
1556 | lcd_puts(0, 7, power_message); | 1556 | lcd_puts(0, 7, power_message); |
1557 | lcd_putsf(0, 8, "USB Inserted: %s", | 1557 | lcd_putsf(0, 8, "USB Inserted: %s", |
1558 | usb_inserted() ? "yes" : "no"); | 1558 | usb_inserted() ? "yes" : "no"); |
1559 | #elif defined IRIVER_H300_SERIES | ||
1560 | lcd_putsf(0, 9, "USB Charging Enabled: %s", | ||
1561 | usb_charging_enabled() ? "yes" : "no"); | ||
1562 | #elif defined IPOD_NANO || defined IPOD_VIDEO | 1559 | #elif defined IPOD_NANO || defined IPOD_VIDEO |
1563 | int usb_pwr = (GPIOL_INPUT_VAL & 0x10)?true:false; | 1560 | int usb_pwr = (GPIOL_INPUT_VAL & 0x10)?true:false; |
1564 | int ext_pwr = (GPIOL_INPUT_VAL & 0x08)?false:true; | 1561 | int ext_pwr = (GPIOL_INPUT_VAL & 0x08)?false:true; |
@@ -1610,8 +1607,6 @@ static bool view_battery(void) | |||
1610 | (st & POWER_INPUT_MAIN_CHARGER) ? " Main" : "", | 1607 | (st & POWER_INPUT_MAIN_CHARGER) ? " Main" : "", |
1611 | (st & POWER_INPUT_USB_CHARGER) ? " USB" : ""); | 1608 | (st & POWER_INPUT_USB_CHARGER) ? " USB" : ""); |
1612 | 1609 | ||
1613 | lcd_putsf(0, line++, "IUSB Max: %d", usb_allowed_current()); | ||
1614 | |||
1615 | y = ARRAYLEN(chrgstate_strings) - 1; | 1610 | y = ARRAYLEN(chrgstate_strings) - 1; |
1616 | 1611 | ||
1617 | switch (charge_state) | 1612 | switch (charge_state) |
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 6cdef29edb..709abbdf75 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -13776,3 +13776,17 @@ | |||
13776 | *: "" | 13776 | *: "" |
13777 | </voice> | 13777 | </voice> |
13778 | </phrase> | 13778 | </phrase> |
13779 | <phrase> | ||
13780 | id: LANG_FORCE | ||
13781 | desc: alternative to yes/no for tristate settings | ||
13782 | user: core | ||
13783 | <source> | ||
13784 | *: "Force" | ||
13785 | </source> | ||
13786 | <dest> | ||
13787 | *: "Force" | ||
13788 | </dest> | ||
13789 | <voice> | ||
13790 | *: "Force" | ||
13791 | </voice> | ||
13792 | </phrase> | ||
diff --git a/apps/settings.h b/apps/settings.h index 5c28b4c0a6..3d0ef4c719 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -669,7 +669,7 @@ struct user_settings | |||
669 | bool spdif_enable; /* S/PDIF power on/off */ | 669 | bool spdif_enable; /* S/PDIF power on/off */ |
670 | #endif | 670 | #endif |
671 | #ifdef HAVE_USB_CHARGING_ENABLE | 671 | #ifdef HAVE_USB_CHARGING_ENABLE |
672 | bool usb_charging; | 672 | int usb_charging; |
673 | #endif | 673 | #endif |
674 | 674 | ||
675 | /* device settings */ | 675 | /* device settings */ |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 1e2b4ebb18..32da25ab89 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -1595,7 +1595,9 @@ const struct settings_list settings[] = { | |||
1595 | TEXT_SETTING(0,kbd_file,"kbd","-",ROCKBOX_DIR "/",".kbd"), | 1595 | TEXT_SETTING(0,kbd_file,"kbd","-",ROCKBOX_DIR "/",".kbd"), |
1596 | #endif | 1596 | #endif |
1597 | #ifdef HAVE_USB_CHARGING_ENABLE | 1597 | #ifdef HAVE_USB_CHARGING_ENABLE |
1598 | OFFON_SETTING(0,usb_charging,LANG_USB_CHARGING,false,"usb charging",NULL), | 1598 | CHOICE_SETTING(0, usb_charging, LANG_USB_CHARGING, 0, "usb charging", |
1599 | "off,on,force", NULL, 3, ID2P(LANG_SET_BOOL_NO), | ||
1600 | ID2P(LANG_SET_BOOL_YES), ID2P(LANG_FORCE)), | ||
1599 | #endif | 1601 | #endif |
1600 | OFFON_SETTING(F_BANFROMQS,cuesheet,LANG_CUESHEET_ENABLE,false,"cuesheet support", | 1602 | OFFON_SETTING(F_BANFROMQS,cuesheet,LANG_CUESHEET_ENABLE,false,"cuesheet support", |
1601 | NULL), | 1603 | NULL), |
diff --git a/firmware/export/config/gigabeats.h b/firmware/export/config/gigabeats.h index f096fb07d6..fcfa274314 100644 --- a/firmware/export/config/gigabeats.h +++ b/firmware/export/config/gigabeats.h | |||
@@ -173,6 +173,8 @@ | |||
173 | /* Charging implemented in a target-specific algorithm */ | 173 | /* Charging implemented in a target-specific algorithm */ |
174 | #define CONFIG_CHARGING CHARGING_TARGET | 174 | #define CONFIG_CHARGING CHARGING_TARGET |
175 | 175 | ||
176 | #define HAVE_USB_CHARGING_ENABLE | ||
177 | |||
176 | /* define this if the hardware can be powered off while charging */ | 178 | /* define this if the hardware can be powered off while charging */ |
177 | /* We don't charge while powered down so maybe implement a | 179 | /* We don't charge while powered down so maybe implement a |
178 | finish-charging-and-then-poweroff mode */ | 180 | finish-charging-and-then-poweroff mode */ |
diff --git a/firmware/export/usb.h b/firmware/export/usb.h index 48400b11dc..d544f5cab1 100644 --- a/firmware/export/usb.h +++ b/firmware/export/usb.h | |||
@@ -146,9 +146,16 @@ int usb_detect(void); /* return the raw hardware value - nothing/pc/charger */ | |||
146 | void usb_status_event(int current_status); | 146 | void usb_status_event(int current_status); |
147 | #ifdef HAVE_USB_POWER | 147 | #ifdef HAVE_USB_POWER |
148 | bool usb_powered(void); | 148 | bool usb_powered(void); |
149 | #ifdef CONFIG_CHARGING | 149 | #ifdef HAVE_USB_CHARGING_ENABLE |
150 | bool usb_charging_enable(bool on); | 150 | enum { |
151 | bool usb_charging_enabled(void); | 151 | USB_CHARGING_DISABLE, |
152 | USB_CHARGING_ENABLE, | ||
153 | USB_CHARGING_FORCE | ||
154 | }; | ||
155 | /* called by app, implemented by usb_core on targets with rockbox usb | ||
156 | * or target-specific code on others | ||
157 | */ | ||
158 | void usb_charging_enable(int state); | ||
152 | #endif | 159 | #endif |
153 | #endif | 160 | #endif |
154 | #ifdef HAVE_USBSTACK | 161 | #ifdef HAVE_USBSTACK |
diff --git a/firmware/export/usb_core.h b/firmware/export/usb_core.h index 5286dbcdfe..6405aa492d 100644 --- a/firmware/export/usb_core.h +++ b/firmware/export/usb_core.h | |||
@@ -59,8 +59,14 @@ void usb_core_release_endpoint(int dir); | |||
59 | void usb_core_hotswap_event(int volume,bool inserted); | 59 | void usb_core_hotswap_event(int volume,bool inserted); |
60 | #endif | 60 | #endif |
61 | 61 | ||
62 | #ifdef HAVE_USB_POWER | 62 | #ifdef HAVE_USB_CHARGING_ENABLE |
63 | unsigned short usb_allowed_current(void); | 63 | /* hardware which knows how to control usb current should use one |
64 | * of the following to find out from the usb stack how much is ok | ||
65 | */ | ||
66 | /* implemented by target, called by usb when value changes */ | ||
67 | void usb_charging_maxcurrent_change(int maxcurrent); | ||
68 | /* implemented by usb, called by target to get value */ | ||
69 | int usb_charging_maxcurrent(void); | ||
64 | #endif | 70 | #endif |
65 | 71 | ||
66 | #endif | 72 | #endif |
diff --git a/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c index d7fe87f168..4540be671a 100644 --- a/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c +++ b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c | |||
@@ -43,7 +43,7 @@ unsigned int power_input_status(void) | |||
43 | if (GPIO3_DR & (1 << 20)) | 43 | if (GPIO3_DR & (1 << 20)) |
44 | status |= POWER_INPUT_BATTERY; | 44 | status |= POWER_INPUT_BATTERY; |
45 | 45 | ||
46 | if (usb_allowed_current() < 500) | 46 | if (usb_charging_maxcurrent() < 500) |
47 | { | 47 | { |
48 | /* ACK that USB is connected but NOT chargeable */ | 48 | /* ACK that USB is connected but NOT chargeable */ |
49 | status &= ~(POWER_INPUT_USB_CHARGER & POWER_INPUT_CHARGER); | 49 | status &= ~(POWER_INPUT_USB_CHARGER & POWER_INPUT_CHARGER); |
@@ -52,6 +52,12 @@ unsigned int power_input_status(void) | |||
52 | return status; | 52 | return status; |
53 | } | 53 | } |
54 | 54 | ||
55 | void usb_charging_maxcurrent_change(int maxcurrent) | ||
56 | { | ||
57 | (void)maxcurrent; | ||
58 | /* Nothing to do */ | ||
59 | } | ||
60 | |||
55 | /* Detect changes in presence of the AC adaptor. */ | 61 | /* Detect changes in presence of the AC adaptor. */ |
56 | void charger_main_detect_event(void) | 62 | void charger_main_detect_event(void) |
57 | { | 63 | { |
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c index 5164f0fa1a..a75cb39729 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c +++ b/firmware/target/arm/s5l8700/ipodnano2g/power-nano2g.c | |||
@@ -54,15 +54,10 @@ void power_init(void) | |||
54 | #if CONFIG_CHARGING | 54 | #if CONFIG_CHARGING |
55 | 55 | ||
56 | #ifdef HAVE_USB_CHARGING_ENABLE | 56 | #ifdef HAVE_USB_CHARGING_ENABLE |
57 | bool usb_charging_enable(bool on) | 57 | void usb_charging_maxcurrent_change(int maxcurrent) |
58 | { | 58 | { |
59 | bool on = (maxcurrent >= 500); | ||
59 | PDAT11 = (PDAT11 & ~1) | (on ? 1 : 0); | 60 | PDAT11 = (PDAT11 & ~1) | (on ? 1 : 0); |
60 | return on; | ||
61 | } | ||
62 | |||
63 | bool usb_charging_enabled(void) | ||
64 | { | ||
65 | return PDAT11 & 1; | ||
66 | } | 61 | } |
67 | #endif | 62 | #endif |
68 | 63 | ||
diff --git a/firmware/target/coldfire/iriver/h300/power-h300.c b/firmware/target/coldfire/iriver/h300/power-h300.c index 400dc02526..202e1d68ed 100644 --- a/firmware/target/coldfire/iriver/h300/power-h300.c +++ b/firmware/target/coldfire/iriver/h300/power-h300.c | |||
@@ -71,16 +71,14 @@ unsigned int power_input_status(void) | |||
71 | } | 71 | } |
72 | 72 | ||
73 | #ifdef HAVE_USB_POWER | 73 | #ifdef HAVE_USB_POWER |
74 | bool usb_charging_enable(bool on) | 74 | void usb_charging_enable(int state) |
75 | { | 75 | { |
76 | bool rc = false; | 76 | bool on = (state != USB_CHARGING_DISABLE); |
77 | int irqlevel; | 77 | int irqlevel; |
78 | logf("usb_charging_enable(%s)\n", on ? "on" : "off" ); | 78 | logf("usb_charging_enable(%s)\n", on ? "on" : "off" ); |
79 | irqlevel = disable_irq_save(); | 79 | irqlevel = disable_irq_save(); |
80 | pcf50606_set_usb_charging(on); | 80 | pcf50606_set_usb_charging(on); |
81 | rc = on; | ||
82 | restore_irq(irqlevel); | 81 | restore_irq(irqlevel); |
83 | return rc; | ||
84 | } | 82 | } |
85 | #endif /* HAVE_USB_POWER */ | 83 | #endif /* HAVE_USB_POWER */ |
86 | 84 | ||
@@ -92,17 +90,6 @@ bool charging_state(void) | |||
92 | return (GPIO_READ & 0x00800000)?true:false; | 90 | return (GPIO_READ & 0x00800000)?true:false; |
93 | } | 91 | } |
94 | 92 | ||
95 | bool usb_charging_enabled(void) | ||
96 | { | ||
97 | bool rc = false; | ||
98 | /* TODO: read the state of the GPOOD2 register... | ||
99 | * (this also means to set the irq level here) */ | ||
100 | rc = pcf50606_usb_charging_enabled(); | ||
101 | |||
102 | logf("usb charging %s", rc ? "enabled" : "disabled" ); | ||
103 | return rc; | ||
104 | } | ||
105 | |||
106 | void ide_power_enable(bool on) | 93 | void ide_power_enable(bool on) |
107 | { | 94 | { |
108 | if(on) | 95 | if(on) |
diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c index a2e2b5f063..dfcce05064 100644 --- a/firmware/usbstack/usb_core.c +++ b/firmware/usbstack/usb_core.c | |||
@@ -166,6 +166,11 @@ static int usb_address = 0; | |||
166 | static bool initialized = false; | 166 | static bool initialized = false; |
167 | static enum { DEFAULT, ADDRESS, CONFIGURED } usb_state; | 167 | static enum { DEFAULT, ADDRESS, CONFIGURED } usb_state; |
168 | 168 | ||
169 | #ifdef HAVE_USB_CHARGING_ENABLE | ||
170 | static int usb_charging_mode = USB_CHARGING_DISABLE; | ||
171 | static int usb_charging_current_requested = 500; | ||
172 | #endif | ||
173 | |||
169 | static int usb_core_num_interfaces; | 174 | static int usb_core_num_interfaces; |
170 | 175 | ||
171 | typedef void (*completion_handler_t)(int ep, int dir, int status, int length); | 176 | typedef void (*completion_handler_t)(int ep, int dir, int status, int length); |
@@ -378,6 +383,9 @@ void usb_core_exit(void) | |||
378 | initialized = false; | 383 | initialized = false; |
379 | } | 384 | } |
380 | usb_state = DEFAULT; | 385 | usb_state = DEFAULT; |
386 | #ifdef HAVE_USB_CHARGING_ENABLE | ||
387 | usb_charging_maxcurrent_change(usb_charging_maxcurrent()); | ||
388 | #endif | ||
381 | logf("usb_core_exit() finished"); | 389 | logf("usb_core_exit() finished"); |
382 | } | 390 | } |
383 | 391 | ||
@@ -552,6 +560,16 @@ static void request_handler_device_get_descriptor(struct usb_ctrlrequest* req) | |||
552 | config_descriptor.bDescriptorType = | 560 | config_descriptor.bDescriptorType = |
553 | USB_DT_OTHER_SPEED_CONFIG; | 561 | USB_DT_OTHER_SPEED_CONFIG; |
554 | } | 562 | } |
563 | #ifdef HAVE_USB_CHARGING_ENABLE | ||
564 | if (usb_charging_mode == USB_CHARGING_DISABLE) { | ||
565 | config_descriptor.bMaxPower = (100+1)/2; | ||
566 | usb_charging_current_requested = 100; | ||
567 | } | ||
568 | else { | ||
569 | config_descriptor.bMaxPower = (500+1)/2; | ||
570 | usb_charging_current_requested = 500; | ||
571 | } | ||
572 | #endif | ||
555 | size = sizeof(struct usb_config_descriptor); | 573 | size = sizeof(struct usb_config_descriptor); |
556 | 574 | ||
557 | for(i = 0; i < USB_NUM_DRIVERS; i++) | 575 | for(i = 0; i < USB_NUM_DRIVERS; i++) |
@@ -628,8 +646,10 @@ static void request_handler_device(struct usb_ctrlrequest* req) | |||
628 | } | 646 | } |
629 | else | 647 | else |
630 | usb_state = ADDRESS; | 648 | usb_state = ADDRESS; |
631 | |||
632 | usb_drv_send(EP_CONTROL, NULL, 0); | 649 | usb_drv_send(EP_CONTROL, NULL, 0); |
650 | #ifdef HAVE_USB_CHARGING_ENABLE | ||
651 | usb_charging_maxcurrent_change(usb_charging_maxcurrent()); | ||
652 | #endif | ||
633 | break; | 653 | break; |
634 | } | 654 | } |
635 | case USB_REQ_SET_ADDRESS: { | 655 | case USB_REQ_SET_ADDRESS: { |
@@ -809,6 +829,9 @@ void usb_core_bus_reset(void) | |||
809 | { | 829 | { |
810 | usb_address = 0; | 830 | usb_address = 0; |
811 | usb_state = DEFAULT; | 831 | usb_state = DEFAULT; |
832 | #ifdef HAVE_USB_CHARGING_ENABLE | ||
833 | usb_charging_maxcurrent_change(usb_charging_maxcurrent()); | ||
834 | #endif | ||
812 | } | 835 | } |
813 | 836 | ||
814 | /* called by usb_drv_transfer_completed() */ | 837 | /* called by usb_drv_transfer_completed() */ |
@@ -850,9 +873,20 @@ void usb_core_control_request(struct usb_ctrlrequest* req) | |||
850 | usb_signal_transfer_completion(completion_event); | 873 | usb_signal_transfer_completion(completion_event); |
851 | } | 874 | } |
852 | 875 | ||
853 | #ifdef HAVE_USB_POWER | 876 | #ifdef HAVE_USB_CHARGING_ENABLE |
854 | unsigned short usb_allowed_current() | 877 | void usb_charging_enable(int state) |
878 | { | ||
879 | usb_charging_mode = state; | ||
880 | usb_charging_maxcurrent_change(usb_charging_maxcurrent()); | ||
881 | } | ||
882 | |||
883 | int usb_charging_maxcurrent() | ||
855 | { | 884 | { |
856 | return (usb_state == CONFIGURED) ? MAX(USB_MAX_CURRENT, 100) : 100; | 885 | if (!initialized |
886 | || usb_charging_mode == USB_CHARGING_DISABLE | ||
887 | || usb_state != CONFIGURED) | ||
888 | return 100; | ||
889 | /* usb_state == CONFIGURED, charging enabled/forced */ | ||
890 | return usb_charging_current_requested; | ||
857 | } | 891 | } |
858 | #endif | 892 | #endif |