diff options
author | Boris Gjenero <dreamlayers@rockbox.org> | 2011-12-06 00:58:01 +0000 |
---|---|---|
committer | Boris Gjenero <dreamlayers@rockbox.org> | 2011-12-06 00:58:01 +0000 |
commit | 694502a96576afb22af4de21dfb85002e8ab44fc (patch) | |
tree | 53a7de699c6adadb23a6b1a36f21b76fd6bd7461 /apps/gui/usb_screen.c | |
parent | fb6b28d11cd4332caba4f03996e334d4e9a5aed4 (diff) | |
download | rockbox-694502a96576afb22af4de21dfb85002e8ab44fc.tar.gz rockbox-694502a96576afb22af4de21dfb85002e8ab44fc.zip |
Fix FS#12423 : Rockbox access to /.rockbox/fonts after usb_enable(true). This fixes entry into USB mode on the Archos Recorder V2 and possibly also other targets using a USB to IDE bridge chip. Fred Bauer found this removes the need for a workaround in glyph_cache_save(). I'm including his patch which removes the workaround.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31155 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/usb_screen.c')
-rw-r--r-- | apps/gui/usb_screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c index 32c0773ed6..31e0829eb7 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c | |||
@@ -251,8 +251,6 @@ void gui_usb_screen_run(bool early_usb) | |||
251 | touchscreen_set_mode(TOUCHSCREEN_BUTTON); | 251 | touchscreen_set_mode(TOUCHSCREEN_BUTTON); |
252 | #endif | 252 | #endif |
253 | 253 | ||
254 | usb_acknowledge(SYS_USB_CONNECTED_ACK); | ||
255 | |||
256 | #ifdef USB_ENABLE_HID | 254 | #ifdef USB_ENABLE_HID |
257 | usb_hid = global_settings.usb_hid; | 255 | usb_hid = global_settings.usb_hid; |
258 | usb_keypad_mode = global_settings.usb_keypad_mode; | 256 | usb_keypad_mode = global_settings.usb_keypad_mode; |
@@ -284,6 +282,8 @@ void gui_usb_screen_run(bool early_usb) | |||
284 | #endif | 282 | #endif |
285 | } | 283 | } |
286 | 284 | ||
285 | usb_acknowledge(SYS_USB_CONNECTED_ACK); | ||
286 | |||
287 | while (1) | 287 | while (1) |
288 | { | 288 | { |
289 | usb_screens_draw(usb_screen_vps_ar); | 289 | usb_screens_draw(usb_screen_vps_ar); |