Rockbox

This is the bug/patch tracker for Rockbox. Click here for more information.

Quick links: Bugs · Patches · Rockbox frontpage

Tasklist

FS#7691 - Improved PP (ipod) USB detection

Attached to Project: Rockbox
Opened by Dave Chapman (linuxstb) - Saturday, 01 September 2007, 20:00 GMT+2
Last edited by Dave Chapman (linuxstb) - Tuesday, 04 September 2007, 10:03 GMT+2
Task Type Patches
Category Operating System/Drivers
Status Closed
Assigned To No-one
Player Type PortalPlayer-based
Severity Low
Priority Normal
Reported Version Daily build (which?)
Due in Version Undecided
Due Date Undecided
Percent Complete 100%
Private No

Details

This patch (hopefully) improves the USB detection on PortalPlayer targets, fixing the following bugs:

1) MENU needed to be held for a long time (10 seconds or more) in order to prevent Rockbox rebooting into disk mode.

2) Windows would display an "unknown usb device" message


It also changes the target-tree function usb_detect() on all targets from bool to int, returning USB_INSERTED or USB_EXTRACTED instead of true or false.

This change was made to enable the PP usb_detect() function to check for USB_POWER and return that as a third value.

The PP usb_detect() function also checks for USB_POWER_BUTTON being held, and will not call dr_controller_run if MENU is held.

I've tested this patch on an iPod Color and a Gigabeat F, but would like it to be tested more widely (especially on different PP targets connecting to different host operating systems) before committing.
   usbv4.diff (14.7 KiB) 
 apps/main.c                                            |    2 
 firmware/export/usb.h                                  |   37 ++++++-
 firmware/target/arm/usb-fw-pp502x.c                    |   88 ++++++++++++-----
 firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c |    4 
 firmware/target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c   |    8 +
 firmware/target/arm/s3c2440/gigabeat-fx/usb-target.h   |    1 
 firmware/target/arm/usb-fw-pp5002.c                    |    6 -
 firmware/target/coldfire/iriver/h100/usb-h100.c        |    5 
 firmware/target/coldfire/iriver/h300/usb-h300.c        |    5 
 firmware/target/coldfire/iaudio/usb-iaudio.c           |    5 
 firmware/target/sh/archos/recorder/usb-recorder.c      |    5 
 firmware/target/sh/archos/ondio/usb-ondio.c            |    5 
 firmware/target/sh/archos/fm_v2/usb-fm_v2.c            |    5 
 firmware/target/sh/archos/player/usb-player.c          |    5 
 firmware/usb.c                                         |   51 +--------
 15 files changed, 146 insertions(+), 86 deletions(-)

This task depends upon

View Dependency Graph

This task blocks these from closing
 FS#4762 - Random resets when playing while plugged in (USB) 
Closed by  Dave Chapman (linuxstb)
Tuesday, 04 September 2007, 10:03 GMT+2
Reason for closing:  Accepted
Additional comments about closing:  Committed to SVN. Thanks to all for testing.
Comment by Peter D'Hoye (petur) - Saturday, 01 September 2007, 20:29 GMT+2
patch is 0 bytes...
Comment by Nick Waterton (Nick_W) - Saturday, 01 September 2007, 20:30 GMT+2
looks like it would be a useful patch, but your patch (diff) file is empty!
Comment by Dave Chapman (linuxstb) - Saturday, 01 September 2007, 20:32 GMT+2
Patch attached to first comment should now be fine.
Comment by Nick Waterton (Nick_W) - Saturday, 01 September 2007, 21:10 GMT+2
Thanks, patch is fine now.
I downloaded, patched with no problems, and compiled fine.
Menu hold and "unknown USB" fix works great.

Tested in iPod nano, Win XP.
Comment by Peter D'Hoye (petur) - Saturday, 01 September 2007, 21:27 GMT+2
no different behavior seen on H10-5gb
Comment by Xinlu Huang (polygonal) - Saturday, 01 September 2007, 22:59 GMT+2
Works great on my 60GB ipod. No error message & short menu hold prevents disk mode. Also seems to fix my problem with my external charger (it used to trigger disk mode without menu hold; now rockbox seems to be able to detect that this is a charger, not usb connection).
Comment by Xinlu Huang (polygonal) - Sunday, 02 September 2007, 01:38 GMT+2
Works great on my 60GB ipod. No error message & short menu hold prevents disk mode. Also seems to fix my problem with my external charger (it used to trigger disk mode without menu hold; now rockbox seems to be able to detect that this is a charger, not usb connection).
Comment by David Hall (Soap) - Sunday, 02 September 2007, 17:04 GMT+2
"Menu" to prevent entering of disk mode works now with only a momentary push.
iPod still reboots into Apple disk mode when "Menu" not depressed while inserting USB cable.
Tested with an iPod 5th gen and Nano on Ubuntu and Windows 2000.

Only issue which remains (on my 5th gen, not my Nano)(separate bug?) is that booting with a USB cable inserted will successfully boot Rockbox, but Rockbox will freeze at the main menu - disk spinning - forever. Rockbox, in this state, does not respond to any button press except in activating the backlight.
Comment by Peter D'Hoye (petur) - Sunday, 02 September 2007, 17:21 GMT+2
Freezing on boot when USB was inserted is something that happens on all targets I think. At least my H380 does it too.
Comment by David Hall (Soap) - Sunday, 02 September 2007, 17:27 GMT+2
I am unable to make my Nano freeze on boot while USB is inserted. It boots normally, 2 seconds later the USB plug image shows and it successfully reboots into Apple disk mode.
Comment by Dave Chapman (linuxstb) - Monday, 03 September 2007, 00:00 GMT+2
I forgot to adjust the bootloaders with my first patch - here's an update.

Would someone be able to test the USB detection in the Sansa bootloader (the only PP bootloader that does USB detection) with this patch?
   usbv5.diff (18.6 KiB) 
 firmware/export/usb.h                                  |   37 ++++++-
 firmware/target/arm/usb-fw-pp502x.c                    |   88 ++++++++++++-----
 firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c |    4 
 firmware/target/arm/s3c2440/gigabeat-fx/usb-meg-fx.c   |    8 +
 firmware/target/arm/s3c2440/gigabeat-fx/usb-target.h   |    1 
 firmware/target/arm/usb-fw-pp5002.c                    |    6 -
 firmware/target/coldfire/iriver/h100/usb-h100.c        |    5 
 firmware/target/coldfire/iriver/h300/usb-h300.c        |    5 
 firmware/target/coldfire/iaudio/usb-iaudio.c           |    5 
 firmware/target/sh/archos/recorder/usb-recorder.c      |    5 
 firmware/target/sh/archos/ondio/usb-ondio.c            |    5 
 firmware/target/sh/archos/fm_v2/usb-fm_v2.c            |    5 
 firmware/target/sh/archos/player/usb-player.c          |    5 
 firmware/usb.c                                         |   51 +--------
 apps/main.c                                            |    2 
 bootloader/main-pp.c                                   |    2 
 bootloader/gigabeat.c                                  |    4 
 bootloader/main.c                                      |   10 -
 bootloader/iriver_h300.c                               |   11 +-
 19 files changed, 160 insertions(+), 99 deletions(-)

Comment by Jonathan Gordon (jdgordon) - Monday, 03 September 2007, 01:58 GMT+2
sansabooloader stll works correctly. with this patch

Loading...