summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-06-29 13:04:06 (UTC)
committer mickeyl <mickeyl>2005-06-29 13:04:06 (UTC)
commit094e14624d99d521af6cfc875abafcdc550a7378 (patch) (side-by-side diff)
treee305bb28c71fdb9483f03dd536b7f13929a73f0a
parentb82756d94b91516a7c36903648382a224a36f0e2 (diff)
downloadopie-094e14624d99d521af6cfc875abafcdc550a7378.zip
opie-094e14624d99d521af6cfc875abafcdc550a7378.tar.gz
opie-094e14624d99d521af6cfc875abafcdc550a7378.tar.bz2
add restart() method (FIXME included ;)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.cpp7
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.h8
2 files changed, 13 insertions, 2 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp
index 21c5a84..9f151ce 100644
--- a/libopie2/opiecore/linux/opcmciasystem.cpp
+++ b/libopie2/opiecore/linux/opcmciasystem.cpp
@@ -61,192 +61,199 @@ OPcmciaSystem::OPcmciaSystem()
qDebug( "OPcmciaSystem::OPcmciaSystem()" );
// get major node number out of /proc/devices
QFile procfile( PROC_DEVICES );
if ( procfile.exists() && procfile.open( IO_ReadOnly ) )
{
QTextStream devstream( &procfile );
devstream.readLine(); // skip header
while ( !devstream.atEnd() && !_major )
{
int nodenumber;
QString driver;
devstream >> nodenumber >> driver;
if ( driver == "pcmcia" )
{
qDebug( "OPcmciaSystem::OPcmciaSystem(): gotcha! pcmcia node number = %d", nodenumber );
_major = nodenumber;
break;
}
}
}
else
{
qWarning( "OPcmciaSystem::OPcmciaSystem() - can't open /proc/devices - continuing with limited functionality." );
}
synchronize();
}
void OPcmciaSystem::synchronize()
{
qDebug( "OPcmciaSystem::synchronize()" );
_interfaces.clear();
//NOTE: We _could_ use ioctl's here as well, however we want to know if
// the card is recognized by the cardmgr (hence has a valid binding)
// If it is not recognized yet, userland may want to provide a configuration dialog
//TODO: Revise for pcmciautils
QString fileName;
if ( QFile::exists( "/var/run/stab" ) ) { fileName = "/var/run/stab"; }
else if ( QFile::exists( "/var/state/pcmcia/stab" ) ) { fileName = "/var/state/pcmcia/stab"; }
else { fileName = "/var/lib/pcmcia/stab"; }
QFile cardinfofile( fileName );
if ( !cardinfofile.exists() || !cardinfofile.open( IO_ReadOnly ) )
{
qWarning( "pcmcia info file not found or unaccessible" );
return;
}
QTextStream cardinfo( &cardinfofile );
while ( !cardinfo.atEnd() )
{
QString strSocket;
int numSocket;
char colon;
QString cardName;
cardinfo >> strSocket >> numSocket >> colon;
cardName = cardinfo.readLine().stripWhiteSpace();
qDebug( "strSocket = '%s', numSocket = '%d', colon = '%c', cardName = '%s'", (const char*) strSocket, numSocket, colon, ( const char*) cardName );
if ( strSocket == "Socket" && colon == ':' )
{
_interfaces.append( new OPcmciaSocket( _major, numSocket, this, (const char*) cardName ) );
}
else
{
continue;
}
}
}
int OPcmciaSystem::count() const
{
return _interfaces.count();
}
int OPcmciaSystem::cardCount() const
{
int nonEmpty = 0;
OPcmciaSystem::CardIterator it = iterator();
while ( it.current() )
{
if ( !it.current()->isEmpty() ) nonEmpty++;
++it;
}
return nonEmpty;
}
OPcmciaSocket* OPcmciaSystem::socket( unsigned int number )
{
return _interfaces.at( number );
}
+void OPcmciaSystem::restart()
+{
+ //FIXME Use OProcess or something that allows more control
+ ::system( "/etc/init.d/pcmcia restart" );
+}
+
+
OPcmciaSystem* OPcmciaSystem::instance()
{
if ( !_instance ) _instance = new OPcmciaSystem();
return _instance;
}
OPcmciaSystem::CardIterator OPcmciaSystem::iterator() const
{
return OPcmciaSystem::CardIterator( _interfaces );
}
/*======================================================================================
* OPcmciaSocket
*======================================================================================*/
OPcmciaSocket::OPcmciaSocket( int major, int socket, QObject* parent, const char* name )
:QObject( parent, name ), _major( major ), _socket( socket )
{
qDebug( "OPcmciaSocket::OPcmciaSocket()" );
init();
}
OPcmciaSocket::~OPcmciaSocket()
{
qDebug( "OPcmciaSocket::~OPcmciaSocket()" );
cleanup();
}
/* internal */ void OPcmciaSocket::init()
{
// open control socket and gather file descriptor
if ( _major )
{
dev_t dev = makedev( _major, _socket );
#ifdef OPCMCIA_DEBUG
QString filename = "/tmp/opcmciasystem-debug";
if ( QFile::exists( filename ) )
#else
QString filename = QString().sprintf( "/tmp/opcmciasystem-%d", ::getpid() );
if ( ::mknod( (const char*) filename, ( S_IFCHR|S_IREAD|S_IWRITE ), dev ) == 0 )
#endif
{
_fd = ::open( (const char*) filename, O_RDONLY);
if ( !_fd )
{
qWarning( "OPcmciaSocket::init() - can't open control socket (%s)", strerror( errno ) );
}
#ifndef OPCMCIA_DEBUG
else
{
::unlink( (const char*) filename );
}
#endif
}
else
{
qWarning( "OPcmciaSocket::init() - can't create device node '%s' (%s)", (const char*) filename, strerror( errno ) );
}
}
}
/* internal */ void OPcmciaSocket::cleanup()
{
// close control socket
}
/* internal */ bool OPcmciaSocket::getTuple( cisdata_t tuple ) const
{
_ioctlarg.tuple.DesiredTuple = tuple;
_ioctlarg.tuple.Attributes = TUPLE_RETURN_COMMON;
_ioctlarg.tuple.TupleOffset = 0;
int result;
result = ::ioctl(_fd, DS_GET_FIRST_TUPLE, &_ioctlarg);
if ( result != 0 )
{
qWarning( "OPcmciaSocket::getTuple() - DS_GET_FIRST_TUPLE failed (%s)", strerror( errno ) );
return false;
}
result = ::ioctl(_fd, DS_GET_TUPLE_DATA, &_ioctlarg);
if ( result != 0 )
{
qWarning( "OPcmciaSocket::getTuple() - DS_GET_TUPLE_DATA failed (%s)", strerror( errno ) );
return false;
}
result = ::ioctl( _fd, DS_PARSE_TUPLE, &_ioctlarg );
if ( result != 0 )
{
qWarning( "OPcmciaSocket::getTuple() - DS_PARSE_TUPLE failed (%s)", strerror( errno ) );
diff --git a/libopie2/opiecore/linux/opcmciasystem.h b/libopie2/opiecore/linux/opcmciasystem.h
index 23d8c41..fecbb21 100644
--- a/libopie2/opiecore/linux/opcmciasystem.h
+++ b/libopie2/opiecore/linux/opcmciasystem.h
@@ -1,180 +1,184 @@
/*
                This file is part of the Opie Project
=. (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
.=l.
           .>+-=
 _;:,     .>    :=|. This program is free software; you can
.> <`_,   >  .   <= redistribute it and/or modify it under
:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
.="- .-=="i,     .._ License as published by the Free Software
 - .   .-<_>     .<> Foundation; version 2 of the License.
     ._= =}       :
    .%`+i>       _;_.
    .i_,=:_.      -<s. This program is distributed in the hope that
     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
    : ..    .:,     . . . without even the implied warranty of
    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
..}^=.=       =       ; Library General Public License for more
++=   -.     .`     .: details.
 :     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = Library General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef OPCMCIASYSTEM_H
#define OPCMCIASYSTEM_H
#include "linux_pcmcia.h"
#include <qobject.h>
#include <qlist.h>
namespace Opie {
namespace Core {
class OPcmciaSocket;
/*======================================================================================
* OPcmciaSystem
*======================================================================================*/
/**
* @brief A container class for the linux pcmcia subsystem
*
* This class provides access to all available pcmcia/cf cards on your device.
*
* @author Michael 'Mickey' Lauer <mickey@Vanille.de>
*/
class OPcmciaSystem : public QObject
{
Q_OBJECT
public:
typedef QList<OPcmciaSocket> CardList;
typedef QListIterator<OPcmciaSocket> CardIterator;
public:
/**
* @returns the number of available sockets
*/
int count() const;
/**
* @returns the number of populated sockets
*/
int cardCount() const;
/**
- * @returns a pointer to the (one and only) @ref OSystem instance.
+ * @returns a pointer to the (one and only) @ref OSystem instance
*/
static OPcmciaSystem* instance();
/**
- * @returns an iterator usable for iterating through all sound cards.
+ * @returns an iterator usable for iterating through all sound cards
*/
CardIterator iterator() const;
/**
* @returns a pointer to the @ref OPcmciaSocket object correspinding to socket number n, or 0, if not found
* @see OPcmciaSocket
*/
OPcmciaSocket* socket( unsigned int number );
/**
+ * Restarts the subsystem
+ */
+ void restart();
+ /**
* @internal Rebuild the internal database
* @note Sometimes it might be useful to call this from client code,
* e.g. after issuing a cardctl insert
*/
void synchronize();
protected:
OPcmciaSystem();
private:
static OPcmciaSystem* _instance;
CardList _interfaces;
int _major;
private:
class Private;
Private *d;
};
/*======================================================================================
* OPcmciaSocket
*======================================================================================*/
class OPcmciaSocket : public QObject
{
Q_OBJECT
public:
enum OPcmciaSocketCardStatus
{
Unknown = 0,
Occupied = CS_EVENT_CARD_DETECT,
OccupiedCardBus = CS_EVENT_CB_DETECT,
WriteProtected = CS_EVENT_WRITE_PROTECT,
BatteryLow = CS_EVENT_BATTERY_LOW,
BatteryDead = CS_EVENT_BATTERY_DEAD,
Ready = CS_EVENT_READY_CHANGE,
Suspended = CS_EVENT_PM_SUSPEND,
Attention = CS_EVENT_REQUEST_ATTENTION,
InsertionInProgress = CS_EVENT_CARD_INSERTION,
RemovalInProgress = CS_EVENT_CARD_REMOVAL,
ThreeVolts = CS_EVENT_3VCARD,
SupportsVoltage = CS_EVENT_XVCARD,
};
public:
/**
* Constructor. Normally you don't create @ref OPcmciaSocket objects yourself,
* but access them via @ref OPcmciaSystem::socket().
*/
OPcmciaSocket( int major, int socket, QObject* parent, const char* name );
/**
* Destructor.
*/
virtual ~OPcmciaSocket();
/**
* @returns the corresponding socket number
*/
int number() const;
/**
* @returns the card managers idea of the cards' identy, or "<Empty Socket>"
*/
QString identity() const;
/**
* @returns the socket status
*/
const OPcmciaSocketCardStatus status() const;
/**
* @returns true, if the card is unsupported by the cardmgr
*/
bool isUnsupported() const;
/**
* @returns true, if the socket is empty
*/
bool isEmpty() const;
/**
* @returns true, if the socket is suspended
*/
bool isSuspended() const;
/**
* Eject card. @returns true, if operation succeeded
* @note: This operation needs root privileges
*/
bool eject();
/**
* Insert card. @returns true, if operation succeeded
* @note: This operation needs root privileges
*/
bool insert();
/**
* Suspend card. @returns true, if operation succeeded
* @note: This operation needs root privileges
*/
bool suspend();
/**