diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2015-01-02 22:15:31 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2015-01-08 16:45:32 +0100 |
commit | dc127f213c9b7e60f649bc236602e4f28285c53b (patch) | |
tree | 27c28295e37858755e2b151ca11348f73a791ea0 | |
parent | 1ab91550e6b7b4cd01350fea531447c1fa7d7250 (diff) | |
download | rockbox-dc127f213c9b7e60f649bc236602e4f28285c53b.tar.gz rockbox-dc127f213c9b7e60f649bc236602e4f28285c53b.zip |
Clarify usb_powered() and fix some code.
Either by mistake or because its meaning changed, usb_powered() doesn't mean
what the name suggest, so clarify its meaning by renaming it to usb_powered_only.
So use of usb_powered() are replaced by usb_inserted() when it makes more sense.
Change-Id: I112887e2d8560e84587bee5f55c826dde8c806d8
Reviewed-on: http://gerrit.rockbox.org/1097
Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 6 | ||||
-rw-r--r-- | apps/main.c | 3 | ||||
-rw-r--r-- | apps/plugin.c | 4 | ||||
-rw-r--r-- | apps/plugin.h | 9 | ||||
-rw-r--r-- | apps/plugins/battery_bench.c | 5 | ||||
-rw-r--r-- | firmware/export/usb.h | 3 | ||||
-rw-r--r-- | firmware/powermgmt.c | 4 | ||||
-rw-r--r-- | firmware/usb.c | 2 | ||||
-rw-r--r-- | lib/skin_parser/tag_table.c | 2 | ||||
-rw-r--r-- | lib/skin_parser/tag_table.h | 2 | ||||
-rw-r--r-- | uisimulator/common/stubs.c | 2 |
11 files changed, 20 insertions, 22 deletions
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index e58393e19c..934085c707 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c | |||
@@ -1149,12 +1149,10 @@ const char *get_token_value(struct gui_wps *gwps, | |||
1149 | } | 1149 | } |
1150 | } | 1150 | } |
1151 | #endif | 1151 | #endif |
1152 | #ifdef HAVE_USB_POWER | 1152 | case SKIN_TOKEN_USB_INSERTED: |
1153 | case SKIN_TOKEN_USB_POWERED: | 1153 | if (usb_inserted()) |
1154 | if (usb_powered()) | ||
1155 | return "u"; | 1154 | return "u"; |
1156 | return NULL; | 1155 | return NULL; |
1157 | #endif | ||
1158 | case SKIN_TOKEN_BATTERY_SLEEPTIME: | 1156 | case SKIN_TOKEN_BATTERY_SLEEPTIME: |
1159 | { | 1157 | { |
1160 | if (get_sleep_timer() == 0) | 1158 | if (get_sleep_timer() == 0) |
diff --git a/apps/main.c b/apps/main.c index 60164515fa..211f7f1b3c 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -586,7 +586,8 @@ static void init(void) | |||
586 | mounted = true; /* mounting done @ end of USB mode */ | 586 | mounted = true; /* mounting done @ end of USB mode */ |
587 | } | 587 | } |
588 | #ifdef HAVE_USB_POWER | 588 | #ifdef HAVE_USB_POWER |
589 | if (usb_powered()) /* avoid deadlock */ | 589 | /* if there is no host or user requested no USB, skip this */ |
590 | if (usb_powered_only()) | ||
590 | break; | 591 | break; |
591 | #endif | 592 | #endif |
592 | } | 593 | } |
diff --git a/apps/plugin.c b/apps/plugin.c index 8a6c577f69..c6b9744ed4 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -712,9 +712,7 @@ static const struct plugin_api rockbox_api = { | |||
712 | charging_state, | 712 | charging_state, |
713 | # endif | 713 | # endif |
714 | #endif | 714 | #endif |
715 | #ifdef HAVE_USB_POWER | 715 | usb_inserted, |
716 | usb_powered, | ||
717 | #endif | ||
718 | 716 | ||
719 | /* misc */ | 717 | /* misc */ |
720 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | 718 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
diff --git a/apps/plugin.h b/apps/plugin.h index e55dcf13cb..f781f60350 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -160,12 +160,12 @@ void* plugin_get_buffer(size_t *buffer_size); | |||
160 | #define PLUGIN_MAGIC 0x526F634B /* RocK */ | 160 | #define PLUGIN_MAGIC 0x526F634B /* RocK */ |
161 | 161 | ||
162 | /* increase this every time the api struct changes */ | 162 | /* increase this every time the api struct changes */ |
163 | #define PLUGIN_API_VERSION 232 | 163 | #define PLUGIN_API_VERSION 233 |
164 | 164 | ||
165 | /* update this to latest version if a change to the api struct breaks | 165 | /* update this to latest version if a change to the api struct breaks |
166 | backwards compatibility (and please take the opportunity to sort in any | 166 | backwards compatibility (and please take the opportunity to sort in any |
167 | new function which are "waiting" at the end of the function table) */ | 167 | new function which are "waiting" at the end of the function table) */ |
168 | #define PLUGIN_MIN_API_VERSION 232 | 168 | #define PLUGIN_MIN_API_VERSION 233 |
169 | 169 | ||
170 | /* plugin return codes */ | 170 | /* plugin return codes */ |
171 | /* internal returns start at 0x100 to make exit(1..255) work */ | 171 | /* internal returns start at 0x100 to make exit(1..255) work */ |
@@ -823,9 +823,8 @@ struct plugin_api { | |||
823 | bool (*charging_state)(void); | 823 | bool (*charging_state)(void); |
824 | # endif | 824 | # endif |
825 | #endif | 825 | #endif |
826 | #ifdef HAVE_USB_POWER | 826 | /* usb */ |
827 | bool (*usb_powered)(void); | 827 | bool (*usb_inserted)(void); |
828 | #endif | ||
829 | 828 | ||
830 | /* misc */ | 829 | /* misc */ |
831 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | 830 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index b0976d5e10..289b399e27 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -358,11 +358,12 @@ static unsigned int charge_state(void) | |||
358 | ret |= BIT_CHARGING; | 358 | ret |= BIT_CHARGING; |
359 | #endif | 359 | #endif |
360 | #endif | 360 | #endif |
361 | /* USB insertion means nothing if USB cannot power the device */ | ||
361 | #ifdef HAVE_USB_POWER | 362 | #ifdef HAVE_USB_POWER |
362 | if (rb->usb_powered()) | 363 | if (rb->usb_inserted()) |
363 | ret |= BIT_USB_POWER; | 364 | ret |= BIT_USB_POWER; |
364 | #endif | 365 | #endif |
365 | return ret; | 366 | return ret; |
366 | } | 367 | } |
367 | #endif | 368 | #endif |
368 | 369 | ||
diff --git a/firmware/export/usb.h b/firmware/export/usb.h index 62bcffe666..74c4826006 100644 --- a/firmware/export/usb.h +++ b/firmware/export/usb.h | |||
@@ -199,7 +199,8 @@ int usb_detect(void); | |||
199 | void usb_status_event(int current_status); | 199 | void usb_status_event(int current_status); |
200 | #endif | 200 | #endif |
201 | #ifdef HAVE_USB_POWER | 201 | #ifdef HAVE_USB_POWER |
202 | bool usb_powered(void); | 202 | /* returns whether the USB is in powered-only state */ |
203 | bool usb_powered_only(void); | ||
203 | #ifdef HAVE_USB_CHARGING_ENABLE | 204 | #ifdef HAVE_USB_CHARGING_ENABLE |
204 | enum { | 205 | enum { |
205 | USB_CHARGING_DISABLE, /* the USB code will never ask for more than 100mA */ | 206 | USB_CHARGING_DISABLE, /* the USB code will never ask for more than 100mA */ |
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index a4b260b315..61cf1b34c4 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
@@ -329,9 +329,9 @@ static int runcurrent(void) | |||
329 | if (usb_inserted() | 329 | if (usb_inserted() |
330 | #ifdef HAVE_USB_POWER | 330 | #ifdef HAVE_USB_POWER |
331 | #if (CURRENT_USB < CURRENT_NORMAL) | 331 | #if (CURRENT_USB < CURRENT_NORMAL) |
332 | || usb_powered() | 332 | || usb_powered_only() |
333 | #else | 333 | #else |
334 | && !usb_powered() | 334 | && !usb_powered_only() |
335 | #endif | 335 | #endif |
336 | #endif | 336 | #endif |
337 | ) { | 337 | ) { |
diff --git a/firmware/usb.c b/firmware/usb.c index fc89df709c..a736f31ca5 100644 --- a/firmware/usb.c +++ b/firmware/usb.c | |||
@@ -769,7 +769,7 @@ int usb_release_exclusive_storage(void) | |||
769 | } | 769 | } |
770 | 770 | ||
771 | #ifdef HAVE_USB_POWER | 771 | #ifdef HAVE_USB_POWER |
772 | bool usb_powered(void) | 772 | bool usb_powered_only(void) |
773 | { | 773 | { |
774 | return usb_state == USB_POWERED; | 774 | return usb_state == USB_POWERED; |
775 | } | 775 | } |
diff --git a/lib/skin_parser/tag_table.c b/lib/skin_parser/tag_table.c index 2cea048548..d2aded1b12 100644 --- a/lib/skin_parser/tag_table.c +++ b/lib/skin_parser/tag_table.c | |||
@@ -43,7 +43,7 @@ static const struct tag_info legal_tags[] = | |||
43 | { SKIN_TOKEN_BATTERY_SLEEPTIME, "bs", "", SKIN_REFRESH_DYNAMIC }, | 43 | { SKIN_TOKEN_BATTERY_SLEEPTIME, "bs", "", SKIN_REFRESH_DYNAMIC }, |
44 | { SKIN_TOKEN_BATTERY_CHARGING, "bc", "", SKIN_REFRESH_DYNAMIC }, | 44 | { SKIN_TOKEN_BATTERY_CHARGING, "bc", "", SKIN_REFRESH_DYNAMIC }, |
45 | { SKIN_TOKEN_BATTERY_CHARGER_CONNECTED, "bp", "", SKIN_REFRESH_DYNAMIC }, | 45 | { SKIN_TOKEN_BATTERY_CHARGER_CONNECTED, "bp", "", SKIN_REFRESH_DYNAMIC }, |
46 | { SKIN_TOKEN_USB_POWERED, "bu", "", SKIN_REFRESH_DYNAMIC }, | 46 | { SKIN_TOKEN_USB_INSERTED, "bu", "", SKIN_REFRESH_DYNAMIC }, |
47 | 47 | ||
48 | 48 | ||
49 | { SKIN_TOKEN_RTC_PRESENT, "cc", "", FEATURE_TAG }, | 49 | { SKIN_TOKEN_RTC_PRESENT, "cc", "", FEATURE_TAG }, |
diff --git a/lib/skin_parser/tag_table.h b/lib/skin_parser/tag_table.h index 94f82fd759..dc0c11f0ad 100644 --- a/lib/skin_parser/tag_table.h +++ b/lib/skin_parser/tag_table.h | |||
@@ -102,7 +102,7 @@ enum skin_token_type { | |||
102 | SKIN_TOKEN_BATTERY_CHARGER_CONNECTED, | 102 | SKIN_TOKEN_BATTERY_CHARGER_CONNECTED, |
103 | SKIN_TOKEN_BATTERY_CHARGING, | 103 | SKIN_TOKEN_BATTERY_CHARGING, |
104 | SKIN_TOKEN_BATTERY_SLEEPTIME, | 104 | SKIN_TOKEN_BATTERY_SLEEPTIME, |
105 | SKIN_TOKEN_USB_POWERED, | 105 | SKIN_TOKEN_USB_INSERTED, |
106 | 106 | ||
107 | /* Sound */ | 107 | /* Sound */ |
108 | SKIN_TOKEN_SOUND_PITCH, | 108 | SKIN_TOKEN_SOUND_PITCH, |
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c index 922b9e8da0..b540735904 100644 --- a/uisimulator/common/stubs.c +++ b/uisimulator/common/stubs.c | |||
@@ -313,7 +313,7 @@ bool is_new_player(void) | |||
313 | #endif | 313 | #endif |
314 | 314 | ||
315 | #ifdef HAVE_USB_POWER | 315 | #ifdef HAVE_USB_POWER |
316 | bool usb_powered(void) | 316 | bool usb_powered_only(void) |
317 | { | 317 | { |
318 | return false; | 318 | return false; |
319 | } | 319 | } |