author | mickeyl <mickeyl> | 2005-06-22 14:12:45 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-06-22 14:12:45 (UTC) |
commit | 4775588885d60ea208c667a5863244a847a69f94 (patch) (unidiff) | |
tree | ee6d5b1388a7b92dba2188af52995cefc4164d74 | |
parent | c7d80acef0bab4babadac288796117987bb4e846 (diff) | |
download | opie-4775588885d60ea208c667a5863244a847a69f94.zip opie-4775588885d60ea208c667a5863244a847a69f94.tar.gz opie-4775588885d60ea208c667a5863244a847a69f94.tar.bz2 |
respect number of product strings in CIS data
-rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp index 2b0c01d..a5725f1 100644 --- a/libopie2/opiecore/linux/opcmciasystem.cpp +++ b/libopie2/opiecore/linux/opcmciasystem.cpp | |||
@@ -151,244 +151,246 @@ int OPcmciaSystem::cardCount() const | |||
151 | OPcmciaSocket* OPcmciaSystem::socket( unsigned int number ) | 151 | OPcmciaSocket* OPcmciaSystem::socket( unsigned int number ) |
152 | { | 152 | { |
153 | return _interfaces.at( number ); | 153 | return _interfaces.at( number ); |
154 | } | 154 | } |
155 | 155 | ||
156 | 156 | ||
157 | OPcmciaSystem* OPcmciaSystem::instance() | 157 | OPcmciaSystem* OPcmciaSystem::instance() |
158 | { | 158 | { |
159 | if ( !_instance ) _instance = new OPcmciaSystem(); | 159 | if ( !_instance ) _instance = new OPcmciaSystem(); |
160 | return _instance; | 160 | return _instance; |
161 | } | 161 | } |
162 | 162 | ||
163 | 163 | ||
164 | OPcmciaSystem::CardIterator OPcmciaSystem::iterator() const | 164 | OPcmciaSystem::CardIterator OPcmciaSystem::iterator() const |
165 | { | 165 | { |
166 | return OPcmciaSystem::CardIterator( _interfaces ); | 166 | return OPcmciaSystem::CardIterator( _interfaces ); |
167 | } | 167 | } |
168 | 168 | ||
169 | 169 | ||
170 | /*====================================================================================== | 170 | /*====================================================================================== |
171 | * OPcmciaSocket | 171 | * OPcmciaSocket |
172 | *======================================================================================*/ | 172 | *======================================================================================*/ |
173 | 173 | ||
174 | OPcmciaSocket::OPcmciaSocket( int major, int socket, QObject* parent, const char* name ) | 174 | OPcmciaSocket::OPcmciaSocket( int major, int socket, QObject* parent, const char* name ) |
175 | :QObject( parent, name ), _major( major ), _socket( socket ) | 175 | :QObject( parent, name ), _major( major ), _socket( socket ) |
176 | { | 176 | { |
177 | qDebug( "OPcmciaSocket::OPcmciaSocket()" ); | 177 | qDebug( "OPcmciaSocket::OPcmciaSocket()" ); |
178 | init(); | 178 | init(); |
179 | } | 179 | } |
180 | 180 | ||
181 | 181 | ||
182 | OPcmciaSocket::~OPcmciaSocket() | 182 | OPcmciaSocket::~OPcmciaSocket() |
183 | { | 183 | { |
184 | qDebug( "OPcmciaSocket::~OPcmciaSocket()" ); | 184 | qDebug( "OPcmciaSocket::~OPcmciaSocket()" ); |
185 | cleanup(); | 185 | cleanup(); |
186 | } | 186 | } |
187 | 187 | ||
188 | 188 | ||
189 | /* internal */ void OPcmciaSocket::init() | 189 | /* internal */ void OPcmciaSocket::init() |
190 | { | 190 | { |
191 | // open control socket and gather file descriptor | 191 | // open control socket and gather file descriptor |
192 | if ( _major ) | 192 | if ( _major ) |
193 | { | 193 | { |
194 | dev_t dev = makedev( _major, _socket ); | 194 | dev_t dev = makedev( _major, _socket ); |
195 | 195 | ||
196 | #ifdef OPCMCIA_DEBUG | 196 | #ifdef OPCMCIA_DEBUG |
197 | QString filename = "/tmp/opcmciasystem-debug"; | 197 | QString filename = "/tmp/opcmciasystem-debug"; |
198 | if ( QFile::exists( filename ) ) | 198 | if ( QFile::exists( filename ) ) |
199 | #else | 199 | #else |
200 | QString filename = QString().sprintf( "/tmp/opcmciasystem-%d", ::getpid() ); | 200 | QString filename = QString().sprintf( "/tmp/opcmciasystem-%d", ::getpid() ); |
201 | if ( ::mknod( (const char*) filename, ( S_IFCHR|S_IREAD|S_IWRITE ), dev ) == 0 ) | 201 | if ( ::mknod( (const char*) filename, ( S_IFCHR|S_IREAD|S_IWRITE ), dev ) == 0 ) |
202 | #endif | 202 | #endif |
203 | { | 203 | { |
204 | _fd = ::open( (const char*) filename, O_RDONLY); | 204 | _fd = ::open( (const char*) filename, O_RDONLY); |
205 | if ( !_fd ) | 205 | if ( !_fd ) |
206 | { | 206 | { |
207 | qWarning( "OPcmciaSocket::init() - can't open control socket (%s)", strerror( errno ) ); | 207 | qWarning( "OPcmciaSocket::init() - can't open control socket (%s)", strerror( errno ) ); |
208 | } | 208 | } |
209 | #ifndef OPCMCIA_DEBUG | 209 | #ifndef OPCMCIA_DEBUG |
210 | else | 210 | else |
211 | { | 211 | { |
212 | ::unlink( (const char*) filename ); | 212 | ::unlink( (const char*) filename ); |
213 | } | 213 | } |
214 | #endif | 214 | #endif |
215 | } | 215 | } |
216 | else | 216 | else |
217 | { | 217 | { |
218 | qWarning( "OPcmciaSocket::init() - can't create device node '%s' (%s)", (const char*) filename, strerror( errno ) ); | 218 | qWarning( "OPcmciaSocket::init() - can't create device node '%s' (%s)", (const char*) filename, strerror( errno ) ); |
219 | } | 219 | } |
220 | } | 220 | } |
221 | } | 221 | } |
222 | 222 | ||
223 | /* internal */ void OPcmciaSocket::cleanup() | 223 | /* internal */ void OPcmciaSocket::cleanup() |
224 | { | 224 | { |
225 | // close control socket | 225 | // close control socket |
226 | } | 226 | } |
227 | 227 | ||
228 | /* internal */ bool OPcmciaSocket::getTuple( cisdata_t tuple ) const | 228 | /* internal */ bool OPcmciaSocket::getTuple( cisdata_t tuple ) const |
229 | { | 229 | { |
230 | _ioctlarg.tuple.DesiredTuple = tuple; | 230 | _ioctlarg.tuple.DesiredTuple = tuple; |
231 | _ioctlarg.tuple.Attributes = TUPLE_RETURN_COMMON; | 231 | _ioctlarg.tuple.Attributes = TUPLE_RETURN_COMMON; |
232 | _ioctlarg.tuple.TupleOffset = 0; | 232 | _ioctlarg.tuple.TupleOffset = 0; |
233 | 233 | ||
234 | int result; | 234 | int result; |
235 | result = ::ioctl(_fd, DS_GET_FIRST_TUPLE, &_ioctlarg); | 235 | result = ::ioctl(_fd, DS_GET_FIRST_TUPLE, &_ioctlarg); |
236 | if ( result != 0 ) | 236 | if ( result != 0 ) |
237 | { | 237 | { |
238 | qWarning( "OPcmciaSocket::getTuple() - DS_GET_FIRST_TUPLE failed (%s)", strerror( errno ) ); | 238 | qWarning( "OPcmciaSocket::getTuple() - DS_GET_FIRST_TUPLE failed (%s)", strerror( errno ) ); |
239 | return false; | 239 | return false; |
240 | } | 240 | } |
241 | 241 | ||
242 | result = ::ioctl(_fd, DS_GET_TUPLE_DATA, &_ioctlarg); | 242 | result = ::ioctl(_fd, DS_GET_TUPLE_DATA, &_ioctlarg); |
243 | if ( result != 0 ) | 243 | if ( result != 0 ) |
244 | { | 244 | { |
245 | qWarning( "OPcmciaSocket::getTuple() - DS_GET_TUPLE_DATA failed (%s)", strerror( errno ) ); | 245 | qWarning( "OPcmciaSocket::getTuple() - DS_GET_TUPLE_DATA failed (%s)", strerror( errno ) ); |
246 | return false; | 246 | return false; |
247 | } | 247 | } |
248 | 248 | ||
249 | result = ::ioctl( _fd, DS_PARSE_TUPLE, &_ioctlarg ); | 249 | result = ::ioctl( _fd, DS_PARSE_TUPLE, &_ioctlarg ); |
250 | if ( result != 0 ) | 250 | if ( result != 0 ) |
251 | { | 251 | { |
252 | qWarning( "OPcmciaSocket::getTuple() - DS_PARSE_TUPLE failed (%s)", strerror( errno ) ); | 252 | qWarning( "OPcmciaSocket::getTuple() - DS_PARSE_TUPLE failed (%s)", strerror( errno ) ); |
253 | return false; | 253 | return false; |
254 | } | 254 | } |
255 | 255 | ||
256 | return true; | 256 | return true; |
257 | } | 257 | } |
258 | 258 | ||
259 | 259 | ||
260 | int OPcmciaSocket::number() const | 260 | int OPcmciaSocket::number() const |
261 | { | 261 | { |
262 | return _socket; | 262 | return _socket; |
263 | } | 263 | } |
264 | 264 | ||
265 | 265 | ||
266 | QString OPcmciaSocket::identity() const | 266 | QString OPcmciaSocket::identity() const |
267 | { | 267 | { |
268 | return ( strcmp( name(), "empty" ) == 0 ) ? "<Empty Socket>" : name(); | 268 | return ( strcmp( name(), "empty" ) == 0 ) ? "<Empty Socket>" : name(); |
269 | } | 269 | } |
270 | 270 | ||
271 | 271 | ||
272 | const OPcmciaSocket::OPcmciaSocketCardStatus OPcmciaSocket::status() const | 272 | const OPcmciaSocket::OPcmciaSocketCardStatus OPcmciaSocket::status() const |
273 | { | 273 | { |
274 | cs_status_t cs_status; | 274 | cs_status_t cs_status; |
275 | cs_status.Function = 0; | 275 | cs_status.Function = 0; |
276 | int result = ::ioctl( _fd, DS_GET_STATUS, &cs_status ); | 276 | int result = ::ioctl( _fd, DS_GET_STATUS, &cs_status ); |
277 | if ( result != 0 ) | 277 | if ( result != 0 ) |
278 | { | 278 | { |
279 | qWarning( "OPcmciaSocket::status() - DS_GET_STATUS failed (%s)", strerror( errno ) ); | 279 | qWarning( "OPcmciaSocket::status() - DS_GET_STATUS failed (%s)", strerror( errno ) ); |
280 | return Unknown; | 280 | return Unknown; |
281 | } | 281 | } |
282 | else | 282 | else |
283 | { | 283 | { |
284 | qDebug( " card status = 0x%08x", cs_status.CardState ); | 284 | qDebug( " card status = 0x%08x", cs_status.CardState ); |
285 | qDebug( " socket status = 0x%08x", cs_status.SocketState ); | 285 | qDebug( " socket status = 0x%08x", cs_status.SocketState ); |
286 | return (OPcmciaSocket::OPcmciaSocketCardStatus) (cs_status.CardState + cs_status.SocketState); | 286 | return (OPcmciaSocket::OPcmciaSocketCardStatus) (cs_status.CardState + cs_status.SocketState); |
287 | } | 287 | } |
288 | } | 288 | } |
289 | 289 | ||
290 | 290 | ||
291 | bool OPcmciaSocket::isUnsupported() const | 291 | bool OPcmciaSocket::isUnsupported() const |
292 | { | 292 | { |
293 | return ( strcmp( name(), "unsupported card" ) == 0 ); | 293 | return ( strcmp( name(), "unsupported card" ) == 0 ); |
294 | } | 294 | } |
295 | 295 | ||
296 | 296 | ||
297 | bool OPcmciaSocket::isEmpty() const | 297 | bool OPcmciaSocket::isEmpty() const |
298 | { | 298 | { |
299 | return ! status() && ( Occupied || OccupiedCardBus ); | 299 | return ! status() && ( Occupied || OccupiedCardBus ); |
300 | } | 300 | } |
301 | 301 | ||
302 | 302 | ||
303 | bool OPcmciaSocket::isSuspended() const | 303 | bool OPcmciaSocket::isSuspended() const |
304 | { | 304 | { |
305 | return status() && Suspended; | 305 | return status() && Suspended; |
306 | } | 306 | } |
307 | 307 | ||
308 | 308 | ||
309 | bool OPcmciaSocket::eject() | 309 | bool OPcmciaSocket::eject() |
310 | { | 310 | { |
311 | return ::ioctl( _fd, DS_EJECT_CARD ) != -1; | 311 | return ::ioctl( _fd, DS_EJECT_CARD ) != -1; |
312 | } | 312 | } |
313 | 313 | ||
314 | 314 | ||
315 | bool OPcmciaSocket::insert() | 315 | bool OPcmciaSocket::insert() |
316 | { | 316 | { |
317 | return ::ioctl( _fd, DS_INSERT_CARD ) != -1; | 317 | return ::ioctl( _fd, DS_INSERT_CARD ) != -1; |
318 | } | 318 | } |
319 | 319 | ||
320 | 320 | ||
321 | bool OPcmciaSocket::suspend() | 321 | bool OPcmciaSocket::suspend() |
322 | { | 322 | { |
323 | return ::ioctl( _fd, DS_SUSPEND_CARD ) != -1; | 323 | return ::ioctl( _fd, DS_SUSPEND_CARD ) != -1; |
324 | } | 324 | } |
325 | 325 | ||
326 | 326 | ||
327 | bool OPcmciaSocket::resume() | 327 | bool OPcmciaSocket::resume() |
328 | { | 328 | { |
329 | return ::ioctl( _fd, DS_RESUME_CARD ) != -1; | 329 | return ::ioctl( _fd, DS_RESUME_CARD ) != -1; |
330 | } | 330 | } |
331 | 331 | ||
332 | 332 | ||
333 | bool OPcmciaSocket::reset() | 333 | bool OPcmciaSocket::reset() |
334 | { | 334 | { |
335 | return ::ioctl( _fd, DS_RESET_CARD ) != -1; | 335 | return ::ioctl( _fd, DS_RESET_CARD ) != -1; |
336 | } | 336 | } |
337 | 337 | ||
338 | 338 | ||
339 | QStringList OPcmciaSocket::productIdentity() const | 339 | QStringList OPcmciaSocket::productIdentity() const |
340 | { | 340 | { |
341 | QStringList list; | 341 | QStringList list; |
342 | cistpl_vers_1_t *vers = &_ioctlarg.tuple_parse.parse.version_1; | 342 | cistpl_vers_1_t *vers = &_ioctlarg.tuple_parse.parse.version_1; |
343 | vers->ns = 0; // number of strings | ||
343 | if ( getTuple( CISTPL_VERS_1 ) ) | 344 | if ( getTuple( CISTPL_VERS_1 ) ) |
344 | { | 345 | { |
345 | for ( int i = 0; i < CISTPL_VERS_1_MAX_PROD_STRINGS; ++i ) | 346 | qDebug( " NUMBER_OF_PRODIDs = %d", vers->ns ); |
347 | for ( int i = 0; i < QMIN( CISTPL_VERS_1_MAX_PROD_STRINGS, vers->ns ); ++i ) | ||
346 | { | 348 | { |
347 | qDebug( " PRODID = '%s'", vers->str+vers->ofs[i] ); | 349 | qDebug( " PRODID = '%s'", vers->str+vers->ofs[i] ); |
348 | list += vers->str+vers->ofs[i]; | 350 | list += vers->str+vers->ofs[i]; |
349 | } | 351 | } |
350 | } | 352 | } |
351 | else | 353 | else |
352 | { | 354 | { |
353 | list += "<unknown>"; | 355 | list += "<unknown>"; |
354 | } | 356 | } |
355 | return list; | 357 | return list; |
356 | } | 358 | } |
357 | 359 | ||
358 | 360 | ||
359 | QString OPcmciaSocket::manufacturerIdentity() const | 361 | QString OPcmciaSocket::manufacturerIdentity() const |
360 | { | 362 | { |
361 | cistpl_manfid_t *manfid = &_ioctlarg.tuple_parse.parse.manfid; | 363 | cistpl_manfid_t *manfid = &_ioctlarg.tuple_parse.parse.manfid; |
362 | if ( getTuple( CISTPL_MANFID ) ) | 364 | if ( getTuple( CISTPL_MANFID ) ) |
363 | { | 365 | { |
364 | return QString().sprintf( "0x%04x, 0x%04x", manfid->manf, manfid->card ); | 366 | return QString().sprintf( "0x%04x, 0x%04x", manfid->manf, manfid->card ); |
365 | } | 367 | } |
366 | else | 368 | else |
367 | return "<unknown>"; | 369 | return "<unknown>"; |
368 | } | 370 | } |
369 | 371 | ||
370 | 372 | ||
371 | QString OPcmciaSocket::function() const | 373 | QString OPcmciaSocket::function() const |
372 | { | 374 | { |
373 | cistpl_funcid_t *funcid = &_ioctlarg.tuple_parse.parse.funcid; | 375 | cistpl_funcid_t *funcid = &_ioctlarg.tuple_parse.parse.funcid; |
374 | if ( getTuple( CISTPL_FUNCID ) ) | 376 | if ( getTuple( CISTPL_FUNCID ) ) |
375 | { | 377 | { |
376 | switch ( funcid->func ) | 378 | switch ( funcid->func ) |
377 | { | 379 | { |
378 | case 0: return "Multifunction"; break; | 380 | case 0: return "Multifunction"; break; |
379 | case 1: return "Memory"; break; | 381 | case 1: return "Memory"; break; |
380 | case 2: return "Serial"; break; | 382 | case 2: return "Serial"; break; |
381 | case 3: return "Parallel"; break; | 383 | case 3: return "Parallel"; break; |
382 | case 4: return "Fixed Disk"; break; | 384 | case 4: return "Fixed Disk"; break; |
383 | case 5: return "Video"; break; | 385 | case 5: return "Video"; break; |
384 | case 6: return "Network"; break; | 386 | case 6: return "Network"; break; |
385 | case 7: return "AIMS"; break; | 387 | case 7: return "AIMS"; break; |
386 | case 8: return "SCSI"; break; | 388 | case 8: return "SCSI"; break; |
387 | default: return "<unknown>"; break; | 389 | default: return "<unknown>"; break; |
388 | } | 390 | } |
389 | } | 391 | } |
390 | else | 392 | else |
391 | { | 393 | { |
392 | return "<unknown>"; | 394 | return "<unknown>"; |
393 | } | 395 | } |
394 | } | 396 | } |