diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-12-23 23:36:00 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-01-01 15:06:34 +0100 |
commit | 9c1ed84d28edfa4a2b5b0a327dccd83d1a1beef8 (patch) | |
tree | 1c884e4db52c2d365095c281e63956f909691226 /rbutil/rbutilqt/base/autodetection.cpp | |
parent | 24e37ddf57bac6a1c9786d50abbe3a1982930382 (diff) | |
download | rockbox-9c1ed84d28edfa4a2b5b0a327dccd83d1a1beef8.tar.gz rockbox-9c1ed84d28edfa4a2b5b0a327dccd83d1a1beef8.zip |
sansapatcher: move sectorbuf pointer into sansa_t structure.
Similar as the ipod_t structure for ipodpatcher the sansa_t structure holds all
relevant information for sansapatcher. Put the global sansa_sectorbuf pointer
into it as well.
Change-Id: Iad08ef6aafc49609c3d0d556914246f230ee0179
Diffstat (limited to 'rbutil/rbutilqt/base/autodetection.cpp')
-rw-r--r-- | rbutil/rbutilqt/base/autodetection.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/base/autodetection.cpp b/rbutil/rbutilqt/base/autodetection.cpp index 8fba1d8cea..a453fa8d60 100644 --- a/rbutil/rbutilqt/base/autodetection.cpp +++ b/rbutil/rbutilqt/base/autodetection.cpp | |||
@@ -167,9 +167,8 @@ bool Autodetection::detect() | |||
167 | 167 | ||
168 | // try sansapatcher | 168 | // try sansapatcher |
169 | // initialize sector buffer. Needed. | 169 | // initialize sector buffer. Needed. |
170 | sansa_sectorbuf = NULL; | ||
171 | sansa_alloc_buffer(&sansa_sectorbuf, BUFFER_SIZE); | ||
172 | struct sansa_t sansa; | 170 | struct sansa_t sansa; |
171 | sansa_alloc_buffer(&sansa, BUFFER_SIZE); | ||
173 | n = sansa_scan(&sansa); | 172 | n = sansa_scan(&sansa); |
174 | if(n == 1) { | 173 | if(n == 1) { |
175 | qDebug() << "[Autodetect] Sansa found:" << sansa.targetname << "at" << sansa.diskname; | 174 | qDebug() << "[Autodetect] Sansa found:" << sansa.targetname << "at" << sansa.diskname; |
@@ -187,8 +186,8 @@ bool Autodetection::detect() | |||
187 | else { | 186 | else { |
188 | qDebug() << "[Autodetect] sansapatcher: no Sansa found." << n; | 187 | qDebug() << "[Autodetect] sansapatcher: no Sansa found." << n; |
189 | } | 188 | } |
190 | free(sansa_sectorbuf); | 189 | free(sansa.sectorbuf); |
191 | sansa_sectorbuf = NULL; | 190 | sansa.sectorbuf = NULL; |
192 | 191 | ||
193 | if(m_mountpoint.isEmpty() && m_device.isEmpty() | 192 | if(m_mountpoint.isEmpty() && m_device.isEmpty() |
194 | && m_errdev.isEmpty() && m_incompat.isEmpty()) | 193 | && m_errdev.isEmpty() && m_incompat.isEmpty()) |