mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-09 13:15:18 -05:00
FS#10100: Wait for the system to remount the player after bootloader installation.
OS X requires to unmount the player during bootloader installation on Sansas / Ipods. The system remounts the player automatically after a short while. Not waiting for the system to remount the player will result in a changed mount point, making the small / full install write the main build to the wrong location. This currently waits up to 60 seconds for the player to get remounted until it errors out. This value seems to be sufficient, if it's not please report so we can adjust it. Also, the waiting can't be interrupted right now. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23716 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
46e56582b0
commit
38dde55c27
7 changed files with 116 additions and 7 deletions
|
|
@ -74,6 +74,10 @@ class BootloaderInstallBase : public QObject
|
|||
void downloadReqFinished(int id, bool error);
|
||||
void downloadBlFinish(bool error);
|
||||
void installBlfile(void);
|
||||
|
||||
// NOTE: we need to keep this slot even on targets that don't need it
|
||||
// -- using the preprocessor here confused moc.
|
||||
void checkRemount(void);
|
||||
protected:
|
||||
enum LogMode
|
||||
{ LogAdd, LogRemove };
|
||||
|
|
@ -88,11 +92,22 @@ class BootloaderInstallBase : public QObject
|
|||
QTemporaryFile m_tempfile; //! temporary file for download
|
||||
QDateTime m_blversion; //! download timestamp used for version information
|
||||
QString m_offile; //! path to the offile
|
||||
#if defined(Q_OS_MACX)
|
||||
void waitRemount(void);
|
||||
|
||||
int m_remountTries;
|
||||
QString m_remountDevice;
|
||||
#endif
|
||||
|
||||
signals:
|
||||
void downloadDone(void); //! internal signal sent when download finished.
|
||||
void done(bool);
|
||||
void logItem(QString, int); //! set logger item
|
||||
void logProgress(int, int); //! set progress bar.
|
||||
|
||||
// NOTE: we need to keep this signal even on targets that don't need it
|
||||
// -- using the preprocessor here confused moc.
|
||||
void remounted(bool);
|
||||
};
|
||||
|
||||
Q_DECLARE_OPERATORS_FOR_FLAGS(BootloaderInstallBase::Capabilities)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue