diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2007-07-29 21:59:11 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2007-07-29 21:59:11 +0000 |
commit | 206a5d3585fcda50692fae2d60b2fba639c373b1 (patch) | |
tree | cdbb3bb39131d28335323943f08aa78c8ac3b7d7 | |
parent | f119dc0d8202f8a000153fcf3558d336f2ff5c30 (diff) | |
download | rockbox-206a5d3585fcda50692fae2d60b2fba639c373b1.tar.gz rockbox-206a5d3585fcda50692fae2d60b2fba639c373b1.zip |
move iriver checksums to its own file to remove unneeded inclusion and kill warnings. Tiny whitespace cleanup.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14070 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | rbutil/rbutilqt/installbl.h | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/installbootloader.cpp | 5 | ||||
-rw-r--r-- | rbutil/rbutilqt/irivertools/checksums.h | 39 | ||||
-rw-r--r-- | rbutil/rbutilqt/irivertools/irivertools.h | 15 |
4 files changed, 44 insertions, 19 deletions
diff --git a/rbutil/rbutilqt/installbl.h b/rbutil/rbutilqt/installbl.h index 2376c51c4d..4f38242040 100644 --- a/rbutil/rbutilqt/installbl.h +++ b/rbutil/rbutilqt/installbl.h | |||
@@ -46,7 +46,7 @@ class InstallBl : public QDialog | |||
46 | 46 | ||
47 | private: | 47 | private: |
48 | Ui::InstallBootloaderFrm ui; | 48 | Ui::InstallBootloaderFrm ui; |
49 | ProgressLoggerGui* logger; | 49 | ProgressLoggerGui* logger; |
50 | QUrl proxy; | 50 | QUrl proxy; |
51 | QSettings *devices; | 51 | QSettings *devices; |
52 | QSettings *userSettings; | 52 | QSettings *userSettings; |
@@ -62,7 +62,7 @@ class InstallBl : public QDialog | |||
62 | void browseFolder(void); | 62 | void browseFolder(void); |
63 | void browseOF(void); | 63 | void browseOF(void); |
64 | void done(bool); | 64 | void done(bool); |
65 | 65 | ||
66 | }; | 66 | }; |
67 | 67 | ||
68 | 68 | ||
diff --git a/rbutil/rbutilqt/installbootloader.cpp b/rbutil/rbutilqt/installbootloader.cpp index 7ee90c6ced..f6973259ff 100644 --- a/rbutil/rbutilqt/installbootloader.cpp +++ b/rbutil/rbutilqt/installbootloader.cpp | |||
@@ -18,6 +18,7 @@ | |||
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #include "installbootloader.h" | 20 | #include "installbootloader.h" |
21 | #include "irivertools/checksums.h" | ||
21 | 22 | ||
22 | BootloaderInstaller::BootloaderInstaller(QObject* parent): QObject(parent) | 23 | BootloaderInstaller::BootloaderInstaller(QObject* parent): QObject(parent) |
23 | { | 24 | { |
@@ -961,8 +962,8 @@ void BootloaderInstaller::iriverFinish() | |||
961 | { | 962 | { |
962 | // Patch firmware | 963 | // Patch firmware |
963 | char md5sum_str[32]; | 964 | char md5sum_str[32]; |
964 | struct sumpairs *sums; | 965 | struct sumpairs *sums = 0; |
965 | int origin; | 966 | int origin = 0; |
966 | 967 | ||
967 | /* get pointer to the correct bootloader.bin */ | 968 | /* get pointer to the correct bootloader.bin */ |
968 | switch(series) { | 969 | switch(series) { |
diff --git a/rbutil/rbutilqt/irivertools/checksums.h b/rbutil/rbutilqt/irivertools/checksums.h new file mode 100644 index 0000000000..aab58f6bca --- /dev/null +++ b/rbutil/rbutilqt/irivertools/checksums.h | |||
@@ -0,0 +1,39 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * Module: rbutil | ||
9 | * File: irivertools.h | ||
10 | * | ||
11 | * Copyright (C) 2007 Dominik Wenger | ||
12 | * | ||
13 | * All files in this archive are subject to the GNU General Public License. | ||
14 | * See the file COPYING in the source tree root for full license agreement. | ||
15 | * | ||
16 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
17 | * KIND, either express or implied. | ||
18 | * | ||
19 | ****************************************************************************/ | ||
20 | |||
21 | #ifndef CHECKSUMS_H | ||
22 | #define CHECKSUMS_H | ||
23 | |||
24 | /* precalculated checksums for H110/H115 */ | ||
25 | static struct sumpairs h100pairs[] = { | ||
26 | #include "h100sums.h" | ||
27 | }; | ||
28 | |||
29 | /* precalculated checksums for H120/H140 */ | ||
30 | static struct sumpairs h120pairs[] = { | ||
31 | #include "h120sums.h" | ||
32 | }; | ||
33 | |||
34 | /* precalculated checksums for H320/H340 */ | ||
35 | static struct sumpairs h300pairs[] = { | ||
36 | #include "h300sums.h" | ||
37 | }; | ||
38 | |||
39 | #endif | ||
diff --git a/rbutil/rbutilqt/irivertools/irivertools.h b/rbutil/rbutilqt/irivertools/irivertools.h index dda84b1c75..8ded0807f8 100644 --- a/rbutil/rbutilqt/irivertools/irivertools.h +++ b/rbutil/rbutilqt/irivertools/irivertools.h | |||
@@ -34,21 +34,6 @@ struct sumpairs { | |||
34 | char *patched; | 34 | char *patched; |
35 | }; | 35 | }; |
36 | 36 | ||
37 | /* precalculated checksums for H110/H115 */ | ||
38 | static struct sumpairs h100pairs[] = { | ||
39 | #include "h100sums.h" | ||
40 | }; | ||
41 | |||
42 | /* precalculated checksums for H120/H140 */ | ||
43 | static struct sumpairs h120pairs[] = { | ||
44 | #include "h120sums.h" | ||
45 | }; | ||
46 | |||
47 | /* precalculated checksums for H320/H340 */ | ||
48 | static struct sumpairs h300pairs[] = { | ||
49 | #include "h300sums.h" | ||
50 | }; | ||
51 | |||
52 | 37 | ||
53 | enum striptype | 38 | enum striptype |
54 | { | 39 | { |