diff options
Diffstat (limited to 'rbutil/rbutilqt/base/bootloaderinstallmi4.cpp')
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallmi4.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp b/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp index 0b42425903..8ae872d5ab 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallmi4.cpp | |||
@@ -32,7 +32,7 @@ BootloaderInstallMi4::BootloaderInstallMi4(QObject *parent) | |||
32 | bool BootloaderInstallMi4::install(void) | 32 | bool BootloaderInstallMi4::install(void) |
33 | { | 33 | { |
34 | emit logItem(tr("Downloading bootloader"), LOGINFO); | 34 | emit logItem(tr("Downloading bootloader"), LOGINFO); |
35 | qDebug() << __func__; | 35 | qDebug() << "[BootloaderInstallMi4] installing bootloader"; |
36 | downloadBlStart(m_blurl); | 36 | downloadBlStart(m_blurl); |
37 | connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2())); | 37 | connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2())); |
38 | return true; | 38 | return true; |
@@ -49,17 +49,17 @@ void BootloaderInstallMi4::installStage2(void) | |||
49 | QString moved = QFileInfo(resolvePathCase(m_blfile)).absolutePath() | 49 | QString moved = QFileInfo(resolvePathCase(m_blfile)).absolutePath() |
50 | + "/OF.mi4"; | 50 | + "/OF.mi4"; |
51 | if(!QFileInfo(moved).exists()) { | 51 | if(!QFileInfo(moved).exists()) { |
52 | qDebug() << "renaming" << fwfile << "->" << moved; | 52 | qDebug() << "[BootloaderInstallMi4] renaming" << fwfile << "to" << moved; |
53 | oldbl.rename(moved); | 53 | oldbl.rename(moved); |
54 | } | 54 | } |
55 | else { | 55 | else { |
56 | qDebug() << "OF.mi4 already present, not renaming again."; | 56 | qDebug() << "[BootloaderInstallMi4] OF.mi4 already present, not renaming again."; |
57 | oldbl.remove(); | 57 | oldbl.remove(); |
58 | } | 58 | } |
59 | 59 | ||
60 | // place new bootloader | 60 | // place new bootloader |
61 | m_tempfile.open(); | 61 | m_tempfile.open(); |
62 | qDebug() << "renaming" << m_tempfile.fileName() << "->" << fwfile; | 62 | qDebug() << "[BootloaderInstallMi4] renaming" << m_tempfile.fileName() << "to" << fwfile; |
63 | m_tempfile.close(); | 63 | m_tempfile.close(); |
64 | m_tempfile.rename(fwfile); | 64 | m_tempfile.rename(fwfile); |
65 | 65 | ||
@@ -72,7 +72,7 @@ void BootloaderInstallMi4::installStage2(void) | |||
72 | 72 | ||
73 | bool BootloaderInstallMi4::uninstall(void) | 73 | bool BootloaderInstallMi4::uninstall(void) |
74 | { | 74 | { |
75 | qDebug() << __func__; | 75 | qDebug() << "[BootloaderInstallMi4] Uninstalling bootloader"; |
76 | 76 | ||
77 | // check if it's actually a Rockbox bootloader | 77 | // check if it's actually a Rockbox bootloader |
78 | emit logItem(tr("Checking for Rockbox bootloader"), LOGINFO); | 78 | emit logItem(tr("Checking for Rockbox bootloader"), LOGINFO); |
@@ -117,7 +117,7 @@ BootloaderInstallBase::BootloaderType BootloaderInstallMi4::installed(void) | |||
117 | QString resolved; | 117 | QString resolved; |
118 | resolved = resolvePathCase(m_blfile); | 118 | resolved = resolvePathCase(m_blfile); |
119 | if(resolved.isEmpty()) { | 119 | if(resolved.isEmpty()) { |
120 | qDebug("%s: BootloaderNone", __func__); | 120 | qDebug() << "[BootloaderInstallMi4] installed: BootloaderNone"; |
121 | return BootloaderNone; | 121 | return BootloaderNone; |
122 | } | 122 | } |
123 | 123 | ||
@@ -129,11 +129,11 @@ BootloaderInstallBase::BootloaderType BootloaderInstallMi4::installed(void) | |||
129 | f.close(); | 129 | f.close(); |
130 | 130 | ||
131 | if(!memcmp(magic, "RBBL", 4)) { | 131 | if(!memcmp(magic, "RBBL", 4)) { |
132 | qDebug("%s: BootloaderRockbox", __func__); | 132 | qDebug() << "[BootloaderInstallMi4] installed: BootloaderRockbox"; |
133 | return BootloaderRockbox; | 133 | return BootloaderRockbox; |
134 | } | 134 | } |
135 | else { | 135 | else { |
136 | qDebug("%s: BootloaderOther", __func__); | 136 | qDebug() << "[BootloaderInstallMi4] installed: BootloaderOther"; |
137 | return BootloaderOther; | 137 | return BootloaderOther; |
138 | } | 138 | } |
139 | } | 139 | } |
@@ -141,7 +141,7 @@ BootloaderInstallBase::BootloaderType BootloaderInstallMi4::installed(void) | |||
141 | 141 | ||
142 | BootloaderInstallBase::Capabilities BootloaderInstallMi4::capabilities(void) | 142 | BootloaderInstallBase::Capabilities BootloaderInstallMi4::capabilities(void) |
143 | { | 143 | { |
144 | qDebug() << __func__; | 144 | qDebug() << "[BootloaderInstallMi4] getting capabilities"; |
145 | return Install | Uninstall | Backup | IsFile | CanCheckInstalled | CanCheckVersion; | 145 | return Install | Uninstall | Backup | IsFile | CanCheckInstalled | CanCheckVersion; |
146 | } | 146 | } |
147 | 147 | ||