summaryrefslogtreecommitdiff
path: root/libopie2/opiecore/linux/opcmciasystem.cpp
Unidiff
Diffstat (limited to 'libopie2/opiecore/linux/opcmciasystem.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.cpp7
1 files changed, 7 insertions, 0 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
@@ -109,96 +109,103 @@ void OPcmciaSystem::synchronize()
109 } 109 }
110 QTextStream cardinfo( &cardinfofile ); 110 QTextStream cardinfo( &cardinfofile );
111 while ( !cardinfo.atEnd() ) 111 while ( !cardinfo.atEnd() )
112 { 112 {
113 QString strSocket; 113 QString strSocket;
114 int numSocket; 114 int numSocket;
115 char colon; 115 char colon;
116 QString cardName; 116 QString cardName;
117 cardinfo >> strSocket >> numSocket >> colon; 117 cardinfo >> strSocket >> numSocket >> colon;
118 cardName = cardinfo.readLine().stripWhiteSpace(); 118 cardName = cardinfo.readLine().stripWhiteSpace();
119 qDebug( "strSocket = '%s', numSocket = '%d', colon = '%c', cardName = '%s'", (const char*) strSocket, numSocket, colon, ( const char*) cardName ); 119 qDebug( "strSocket = '%s', numSocket = '%d', colon = '%c', cardName = '%s'", (const char*) strSocket, numSocket, colon, ( const char*) cardName );
120 if ( strSocket == "Socket" && colon == ':' ) 120 if ( strSocket == "Socket" && colon == ':' )
121 { 121 {
122 _interfaces.append( new OPcmciaSocket( _major, numSocket, this, (const char*) cardName ) ); 122 _interfaces.append( new OPcmciaSocket( _major, numSocket, this, (const char*) cardName ) );
123 } 123 }
124 else 124 else
125 { 125 {
126 continue; 126 continue;
127 } 127 }
128 } 128 }
129} 129}
130 130
131 131
132int OPcmciaSystem::count() const 132int OPcmciaSystem::count() const
133{ 133{
134 return _interfaces.count(); 134 return _interfaces.count();
135} 135}
136 136
137 137
138int OPcmciaSystem::cardCount() const 138int OPcmciaSystem::cardCount() const
139{ 139{
140 int nonEmpty = 0; 140 int nonEmpty = 0;
141 OPcmciaSystem::CardIterator it = iterator(); 141 OPcmciaSystem::CardIterator it = iterator();
142 while ( it.current() ) 142 while ( it.current() )
143 { 143 {
144 if ( !it.current()->isEmpty() ) nonEmpty++; 144 if ( !it.current()->isEmpty() ) nonEmpty++;
145 ++it; 145 ++it;
146 } 146 }
147 return nonEmpty; 147 return nonEmpty;
148} 148}
149 149
150 150
151OPcmciaSocket* OPcmciaSystem::socket( unsigned int number ) 151OPcmciaSocket* OPcmciaSystem::socket( unsigned int number )
152{ 152{
153 return _interfaces.at( number ); 153 return _interfaces.at( number );
154} 154}
155 155
156 156
157void OPcmciaSystem::restart()
158{
159 //FIXME Use OProcess or something that allows more control
160 ::system( "/etc/init.d/pcmcia restart" );
161}
162
163
157OPcmciaSystem* OPcmciaSystem::instance() 164OPcmciaSystem* OPcmciaSystem::instance()
158{ 165{
159 if ( !_instance ) _instance = new OPcmciaSystem(); 166 if ( !_instance ) _instance = new OPcmciaSystem();
160 return _instance; 167 return _instance;
161} 168}
162 169
163 170
164OPcmciaSystem::CardIterator OPcmciaSystem::iterator() const 171OPcmciaSystem::CardIterator OPcmciaSystem::iterator() const
165{ 172{
166 return OPcmciaSystem::CardIterator( _interfaces ); 173 return OPcmciaSystem::CardIterator( _interfaces );
167} 174}
168 175
169 176
170/*====================================================================================== 177/*======================================================================================
171 * OPcmciaSocket 178 * OPcmciaSocket
172 *======================================================================================*/ 179 *======================================================================================*/
173 180
174OPcmciaSocket::OPcmciaSocket( int major, int socket, QObject* parent, const char* name ) 181OPcmciaSocket::OPcmciaSocket( int major, int socket, QObject* parent, const char* name )
175 :QObject( parent, name ), _major( major ), _socket( socket ) 182 :QObject( parent, name ), _major( major ), _socket( socket )
176{ 183{
177 qDebug( "OPcmciaSocket::OPcmciaSocket()" ); 184 qDebug( "OPcmciaSocket::OPcmciaSocket()" );
178 init(); 185 init();
179} 186}
180 187
181 188
182OPcmciaSocket::~OPcmciaSocket() 189OPcmciaSocket::~OPcmciaSocket()
183{ 190{
184 qDebug( "OPcmciaSocket::~OPcmciaSocket()" ); 191 qDebug( "OPcmciaSocket::~OPcmciaSocket()" );
185 cleanup(); 192 cleanup();
186} 193}
187 194
188 195
189/* internal */ void OPcmciaSocket::init() 196/* internal */ void OPcmciaSocket::init()
190{ 197{
191 // open control socket and gather file descriptor 198 // open control socket and gather file descriptor
192 if ( _major ) 199 if ( _major )
193 { 200 {
194 dev_t dev = makedev( _major, _socket ); 201 dev_t dev = makedev( _major, _socket );
195 202
196#ifdef OPCMCIA_DEBUG 203#ifdef OPCMCIA_DEBUG
197 QString filename = "/tmp/opcmciasystem-debug"; 204 QString filename = "/tmp/opcmciasystem-debug";
198 if ( QFile::exists( filename ) ) 205 if ( QFile::exists( filename ) )
199#else 206#else
200 QString filename = QString().sprintf( "/tmp/opcmciasystem-%d", ::getpid() ); 207 QString filename = QString().sprintf( "/tmp/opcmciasystem-%d", ::getpid() );
201 if ( ::mknod( (const char*) filename, ( S_IFCHR|S_IREAD|S_IWRITE ), dev ) == 0 ) 208 if ( ::mknod( (const char*) filename, ( S_IFCHR|S_IREAD|S_IWRITE ), dev ) == 0 )
202#endif 209#endif
203 { 210 {
204 _fd = ::open( (const char*) filename, O_RDONLY); 211 _fd = ::open( (const char*) filename, O_RDONLY);