summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-06-17 13:47:42 (UTC)
committer mickeyl <mickeyl>2005-06-17 13:47:42 (UTC)
commitc36e39b5b1e450e64d4c38cb59e56048a2bec258 (patch) (unidiff)
tree0e796a165a2e4ce8e24b8b79f15bb58f4265a7bb
parent0e11eb29a20ff6bff533a07ff604ed858237f82b (diff)
downloadopie-c36e39b5b1e450e64d4c38cb59e56048a2bec258.zip
opie-c36e39b5b1e450e64d4c38cb59e56048a2bec258.tar.gz
opie-c36e39b5b1e450e64d4c38cb59e56048a2bec258.tar.bz2
- disable DEBUG in opcmciasystem
- fix suspend/resume logic
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.cpp12
-rw-r--r--noncore/applets/pcmcia/pcmcia.cpp9
2 files changed, 11 insertions, 10 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp
index 2eece6b..054d261 100644
--- a/libopie2/opiecore/linux/opcmciasystem.cpp
+++ b/libopie2/opiecore/linux/opcmciasystem.cpp
@@ -28,49 +28,49 @@
28*/ 28*/
29 29
30#include "opcmciasystem.h" 30#include "opcmciasystem.h"
31using namespace Opie::Core; 31using namespace Opie::Core;
32 32
33/* OPIE */ 33/* OPIE */
34#include <opie2/odebug.h> 34#include <opie2/odebug.h>
35 35
36/* QT */ 36/* QT */
37#include <qfile.h> 37#include <qfile.h>
38#include <qtextstream.h> 38#include <qtextstream.h>
39 39
40/* STD */ 40/* STD */
41#include <errno.h> 41#include <errno.h>
42#include <fcntl.h> 42#include <fcntl.h>
43#include <string.h> 43#include <string.h>
44#include <stdlib.h> 44#include <stdlib.h>
45#include <sys/ioctl.h> 45#include <sys/ioctl.h>
46#include <sys/types.h> 46#include <sys/types.h>
47#include <sys/stat.h> 47#include <sys/stat.h>
48#include <unistd.h> 48#include <unistd.h>
49 49
50#define PROC_DEVICES "/proc/devices" 50#define PROC_DEVICES "/proc/devices"
51 51
52#define OPCMCIA_DEBUG 1 52// #define OPCMCIA_DEBUG 1
53 53
54/*====================================================================================== 54/*======================================================================================
55 * OPcmciaSystem 55 * OPcmciaSystem
56 *======================================================================================*/ 56 *======================================================================================*/
57 57
58OPcmciaSystem* OPcmciaSystem::_instance = 0; 58OPcmciaSystem* OPcmciaSystem::_instance = 0;
59 59
60OPcmciaSystem::OPcmciaSystem() 60OPcmciaSystem::OPcmciaSystem()
61 :_major( 0 ) 61 :_major( 0 )
62{ 62{
63 qDebug( "OPcmciaSystem::OPcmciaSystem()" ); 63 qDebug( "OPcmciaSystem::OPcmciaSystem()" );
64 64
65 // get major node number out of /proc/devices 65 // get major node number out of /proc/devices
66 QFile procfile( PROC_DEVICES ); 66 QFile procfile( PROC_DEVICES );
67 if ( procfile.exists() && procfile.open( IO_ReadOnly ) ) 67 if ( procfile.exists() && procfile.open( IO_ReadOnly ) )
68 { 68 {
69 QTextStream devstream( &procfile ); 69 QTextStream devstream( &procfile );
70 devstream.readLine(); // skip header 70 devstream.readLine(); // skip header
71 while ( !devstream.atEnd() && !_major ) 71 while ( !devstream.atEnd() && !_major )
72 { 72 {
73 int nodenumber; 73 int nodenumber;
74 QString driver; 74 QString driver;
75 devstream >> nodenumber >> driver; 75 devstream >> nodenumber >> driver;
76 if ( driver == "pcmcia" ) 76 if ( driver == "pcmcia" )
@@ -284,73 +284,73 @@ const OPcmciaSocket::OPcmciaSocketCardStatus OPcmciaSocket::status() const
284 } 284 }
285} 285}
286 286
287 287
288bool OPcmciaSocket::isUnsupported() const 288bool OPcmciaSocket::isUnsupported() const
289{ 289{
290 return ( strcmp( name(), "unsupported card" ) == 0 ); 290 return ( strcmp( name(), "unsupported card" ) == 0 );
291} 291}
292 292
293 293
294bool OPcmciaSocket::isEmpty() const 294bool OPcmciaSocket::isEmpty() const
295{ 295{
296 return ! status() && ( Occupied || OccupiedCardBus ); 296 return ! status() && ( Occupied || OccupiedCardBus );
297} 297}
298 298
299 299
300bool OPcmciaSocket::isSuspended() const 300bool OPcmciaSocket::isSuspended() const
301{ 301{
302 return status() && Suspended; 302 return status() && Suspended;
303} 303}
304 304
305 305
306bool OPcmciaSocket::eject() 306bool OPcmciaSocket::eject()
307{ 307{
308 return ::ioctl( _fd, DS_EJECT_CARD ); 308 return ::ioctl( _fd, DS_EJECT_CARD ) != -1;
309} 309}
310 310
311 311
312bool OPcmciaSocket::insert() 312bool OPcmciaSocket::insert()
313{ 313{
314 return ::ioctl( _fd, DS_INSERT_CARD ); 314 return ::ioctl( _fd, DS_INSERT_CARD ) != -1;
315} 315}
316 316
317 317
318bool OPcmciaSocket::suspend() 318bool OPcmciaSocket::suspend()
319{ 319{
320 return ::ioctl( _fd, DS_SUSPEND_CARD ); 320 return ::ioctl( _fd, DS_SUSPEND_CARD ) != -1;
321} 321}
322 322
323 323
324bool OPcmciaSocket::resume() 324bool OPcmciaSocket::resume()
325{ 325{
326 return ::ioctl( _fd, DS_RESUME_CARD ); 326 return ::ioctl( _fd, DS_RESUME_CARD ) != -1;
327} 327}
328 328
329 329
330bool OPcmciaSocket::reset() 330bool OPcmciaSocket::reset()
331{ 331{
332 return ::ioctl( _fd, DS_RESET_CARD ); 332 return ::ioctl( _fd, DS_RESET_CARD ) != -1;
333} 333}
334 334
335 335
336QStringList OPcmciaSocket::productIdentity() const 336QStringList OPcmciaSocket::productIdentity() const
337{ 337{
338 QStringList list; 338 QStringList list;
339 cistpl_vers_1_t *vers = &_ioctlarg.tuple_parse.parse.version_1; 339 cistpl_vers_1_t *vers = &_ioctlarg.tuple_parse.parse.version_1;
340 if ( getTuple( CISTPL_VERS_1 ) ) 340 if ( getTuple( CISTPL_VERS_1 ) )
341 { 341 {
342 for ( int i = 0; i < CISTPL_VERS_1_MAX_PROD_STRINGS; ++i ) 342 for ( int i = 0; i < CISTPL_VERS_1_MAX_PROD_STRINGS; ++i )
343 { 343 {
344 qDebug( " PRODID = '%s'", vers->str+vers->ofs[i] ); 344 qDebug( " PRODID = '%s'", vers->str+vers->ofs[i] );
345 list += vers->str+vers->ofs[i]; 345 list += vers->str+vers->ofs[i];
346 } 346 }
347 } 347 }
348 else 348 else
349 { 349 {
350 list += "<unknown>"; 350 list += "<unknown>";
351 } 351 }
352 return list; 352 return list;
353} 353}
354 354
355 355
356QString OPcmciaSocket::manufacturerIdentity() const 356QString OPcmciaSocket::manufacturerIdentity() const
diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp
index aea699f..99c1bc9 100644
--- a/noncore/applets/pcmcia/pcmcia.cpp
+++ b/noncore/applets/pcmcia/pcmcia.cpp
@@ -36,48 +36,49 @@
36#include <opie2/oconfig.h> 36#include <opie2/oconfig.h>
37#include <opie2/oprocess.h> 37#include <opie2/oprocess.h>
38#include <opie2/opcmciasystem.h> 38#include <opie2/opcmciasystem.h>
39#include <opie2/oresource.h> 39#include <opie2/oresource.h>
40#include <opie2/otaskbarapplet.h> 40#include <opie2/otaskbarapplet.h>
41#include <qpe/applnk.h> 41#include <qpe/applnk.h>
42#include <qpe/resource.h> 42#include <qpe/resource.h>
43using namespace Opie::Core; 43using namespace Opie::Core;
44using namespace Opie::Ui; 44using namespace Opie::Ui;
45 45
46/* QT */ 46/* QT */
47#include <qcopchannel_qws.h> 47#include <qcopchannel_qws.h>
48#include <qpainter.h> 48#include <qpainter.h>
49#include <qfile.h> 49#include <qfile.h>
50#include <qtextstream.h> 50#include <qtextstream.h>
51#include <qmessagebox.h> 51#include <qmessagebox.h>
52#include <qsound.h> 52#include <qsound.h>
53#include <qtimer.h> 53#include <qtimer.h>
54 54
55/* STD */ 55/* STD */
56#include <stdio.h> 56#include <stdio.h>
57#include <unistd.h> 57#include <unistd.h>
58#include <stdlib.h> 58#include <stdlib.h>
59#include <string.h> 59#include <string.h>
60#include <errno.h>
60#include <fcntl.h> 61#include <fcntl.h>
61#if defined(_OS_LINUX_) || defined(Q_OS_LINUX) 62#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
62#include <sys/vfs.h> 63#include <sys/vfs.h>
63#include <mntent.h> 64#include <mntent.h>
64#endif 65#endif
65 66
66PcmciaManager::PcmciaManager( QWidget * parent ) : QWidget( parent ) 67PcmciaManager::PcmciaManager( QWidget * parent ) : QWidget( parent )
67{ 68{
68 QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this ); 69 QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this );
69 connect( pcmciaChannel, 70 connect( pcmciaChannel,
70 SIGNAL( received(const QCString&,const QByteArray&) ), this, 71 SIGNAL( received(const QCString&,const QByteArray&) ), this,
71 SLOT( cardMessage(const QCString&,const QByteArray&) ) ); 72 SLOT( cardMessage(const QCString&,const QByteArray&) ) );
72 73
73 setFocusPolicy( NoFocus ); 74 setFocusPolicy( NoFocus );
74 setFixedWidth ( AppLnk::smallIconSize() ); 75 setFixedWidth ( AppLnk::smallIconSize() );
75 setFixedHeight ( AppLnk::smallIconSize() ); 76 setFixedHeight ( AppLnk::smallIconSize() );
76 pm = Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ); 77 pm = Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon );
77 configuring = false; 78 configuring = false;
78} 79}
79 80
80 81
81PcmciaManager::~PcmciaManager() 82PcmciaManager::~PcmciaManager()
82{ 83{
83} 84}
@@ -115,50 +116,50 @@ enum { EJECT, INSERT, SUSPEND, RESUME, RESET, CONFIGURE };
115 116
116void PcmciaManager::mousePressEvent( QMouseEvent* ) 117void PcmciaManager::mousePressEvent( QMouseEvent* )
117{ 118{
118 QPopupMenu* menu = new QPopupMenu( this ); 119 QPopupMenu* menu = new QPopupMenu( this );
119 QStringList cmd; 120 QStringList cmd;
120 bool execute = true; 121 bool execute = true;
121 122
122 OPcmciaSystem* sys = OPcmciaSystem::instance(); 123 OPcmciaSystem* sys = OPcmciaSystem::instance();
123 OPcmciaSystem::CardIterator it = sys->iterator(); 124 OPcmciaSystem::CardIterator it = sys->iterator();
124 if ( !sys->count() ) return; 125 if ( !sys->count() ) return;
125 126
126 int i = 0; 127 int i = 0;
127 while ( it.current() ) 128 while ( it.current() )
128 { 129 {
129 QPopupMenu* submenu = new QPopupMenu( menu ); 130 QPopupMenu* submenu = new QPopupMenu( menu );
130 submenu->insertItem( "&Eject", EJECT+i*100 ); 131 submenu->insertItem( "&Eject", EJECT+i*100 );
131 submenu->insertItem( "&Insert", INSERT+i*100 ); 132 submenu->insertItem( "&Insert", INSERT+i*100 );
132 submenu->insertItem( "&Suspend", SUSPEND+i*100 ); 133 submenu->insertItem( "&Suspend", SUSPEND+i*100 );
133 submenu->insertItem( "&Resume", RESUME+i*100 ); 134 submenu->insertItem( "&Resume", RESUME+i*100 );
134 submenu->insertItem( "Rese&t", RESET+i*100 ); 135 submenu->insertItem( "Rese&t", RESET+i*100 );
135 submenu->insertItem( "&Configure", CONFIGURE+i*100 ); 136 submenu->insertItem( "&Configure", CONFIGURE+i*100 );
136 137
137 submenu->setItemEnabled( EJECT+i*100, !it.current()->isEmpty() ); 138 submenu->setItemEnabled( EJECT+i*100, !it.current()->isEmpty() );
138 submenu->setItemEnabled( INSERT+i*100, it.current()->isEmpty() ); 139 submenu->setItemEnabled( INSERT+i*100, it.current()->isEmpty() );
139 submenu->setItemEnabled( SUSPEND+i*100, !it.current()->isEmpty() && !it.current()->isSuspended() ); 140 submenu->setItemEnabled( SUSPEND+i*100, !it.current()->isEmpty() && it.current()->isSuspended() );
140 submenu->setItemEnabled( RESUME+i*100, !it.current()->isEmpty() && it.current()->isSuspended() ); 141 submenu->setItemEnabled( RESUME+i*100, !it.current()->isEmpty() && !it.current()->isSuspended() );
141 submenu->setItemEnabled( CONFIGURE+i*100, !it.current()->isEmpty() && !configuring ); 142 submenu->setItemEnabled( CONFIGURE+i*100, !it.current()->isEmpty() && !configuring );
142 143
143 connect( submenu, SIGNAL(activated(int)), this, SLOT(userCardAction(int)) ); 144 connect( submenu, SIGNAL(activated(int)), this, SLOT(userCardAction(int)) );
144 menu->insertItem( tr( "%1: %2" ).arg( i++ ).arg( it.current()->identity() ), submenu, 1 ); 145 menu->insertItem( tr( "%1: %2" ).arg( i++ ).arg( it.current()->identity() ), submenu, 1 );
145 ++it; 146 ++it;
146 } 147 }
147 148
148 QPoint p = mapToGlobal( QPoint( 0, 0 ) ); 149 QPoint p = mapToGlobal( QPoint( 0, 0 ) );
149 QSize s = menu->sizeHint(); 150 QSize s = menu->sizeHint();
150 int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ), p.y() - s.height() ), 0 ); 151 int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ), p.y() - s.height() ), 0 );
151 qDebug( "pcmcia: menu result = %d", opt ); 152 qDebug( "pcmcia: menu result = %d", opt );
152 delete menu; 153 delete menu;
153} 154}
154 155
155 156
156void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & ) 157void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
157{ 158{
158 odebug << "PcmciaManager::cardMessage( '" << msg << "' )" << oendl; 159 odebug << "PcmciaManager::cardMessage( '" << msg << "' )" << oendl;
159 if ( msg != "stabChanged()" ) return; 160 if ( msg != "stabChanged()" ) return;
160 161
161 /* check if a previously unknown card has been inserted */ 162 /* check if a previously unknown card has been inserted */
162 OPcmciaSystem::instance()->synchronize(); 163 OPcmciaSystem::instance()->synchronize();
163 164
164 if ( !OPcmciaSystem::instance()->cardCount() ) return; 165 if ( !OPcmciaSystem::instance()->cardCount() ) return;
@@ -238,60 +239,60 @@ void PcmciaManager::paintEvent( QPaintEvent * )
238 odebug << "sockets = " << OPcmciaSystem::instance()->count() << ", cards = " << OPcmciaSystem::instance()->cardCount() << oendl; 239 odebug << "sockets = " << OPcmciaSystem::instance()->count() << ", cards = " << OPcmciaSystem::instance()->cardCount() << oendl;
239 240
240 if ( OPcmciaSystem::instance()->cardCount() ) 241 if ( OPcmciaSystem::instance()->cardCount() )
241 { 242 {
242 p.drawPixmap( 0, 0, pm ); 243 p.drawPixmap( 0, 0, pm );
243 show(); 244 show();
244 } 245 }
245 else 246 else
246 { 247 {
247 hide(); 248 hide();
248 } 249 }
249} 250}
250 251
251int PcmciaManager::position() 252int PcmciaManager::position()
252{ 253{
253 return 7; 254 return 7;
254} 255}
255 256
256void PcmciaManager::execCommand( const QStringList &strList ) 257void PcmciaManager::execCommand( const QStringList &strList )
257{ 258{
258} 259}
259 260
260void PcmciaManager::userCardAction( int action ) 261void PcmciaManager::userCardAction( int action )
261{ 262{
262 odebug << "user action requested. action = " << action << oendl; 263 odebug << "user action on socket " << action / 100 << " requested. action = " << action << oendl;
263 264
264 int socket = action / 100; 265 int socket = action / 100;
265 int what = action % 100; 266 int what = action % 100;
266 bool success = false; 267 bool success = false;
267 268
268 switch ( what ) 269 switch ( what )
269 { 270 {
270 case CONFIGURE: configure( OPcmciaSystem::instance()->socket( socket ) ); success = true; break; 271 case CONFIGURE: configure( OPcmciaSystem::instance()->socket( socket ) ); success = true; break;
271 case EJECT: success = OPcmciaSystem::instance()->socket( socket )->eject(); break; 272 case EJECT: success = OPcmciaSystem::instance()->socket( socket )->eject(); break;
272 case INSERT: success = OPcmciaSystem::instance()->socket( socket )->insert(); break; 273 case INSERT: success = OPcmciaSystem::instance()->socket( socket )->insert(); break;
273 case SUSPEND: success = OPcmciaSystem::instance()->socket( socket )->suspend(); break; 274 case SUSPEND: success = OPcmciaSystem::instance()->socket( socket )->suspend(); break;
274 case RESUME: success = OPcmciaSystem::instance()->socket( socket )->resume(); break; 275 case RESUME: success = OPcmciaSystem::instance()->socket( socket )->resume(); break;
275 case RESET: success = OPcmciaSystem::instance()->socket( socket )->reset(); break; 276 case RESET: success = OPcmciaSystem::instance()->socket( socket )->reset(); break;
276 default: odebug << "not yet implemented" << oendl; 277 default: odebug << "not yet implemented" << oendl;
277 } 278 }
278 279
279 if ( !success ) 280 if ( !success )
280 { 281 {
281 owarn << "couldn't perform user action" << oendl; 282 owarn << "couldn't perform user action (" << strerror( errno ) << ")" << oendl;
282 } 283 }
283 284
284} 285}
285 286
286void PcmciaManager::configure( OPcmciaSocket* card ) 287void PcmciaManager::configure( OPcmciaSocket* card )
287{ 288{
288 configuring = true; 289 configuring = true;
289 ConfigDialog dialog( card, qApp->desktop() ); 290 ConfigDialog dialog( card, qApp->desktop() );
290 int configresult = QPEApplication::execDialog( &dialog, false ); 291 int configresult = QPEApplication::execDialog( &dialog, false );
291 configuring = false; 292 configuring = false;
292 odebug << "pcmcia: configresult = " << configresult << oendl; 293 odebug << "pcmcia: configresult = " << configresult << oendl;
293} 294}
294 295
295 296
296EXPORT_OPIE_APPLET_v1( PcmciaManager ) 297EXPORT_OPIE_APPLET_v1( PcmciaManager )
297 298