-rw-r--r-- | libopie2/opiecore/linux/linux.pro | 2 | ||||
-rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libopie2/opiecore/linux/linux.pro b/libopie2/opiecore/linux/linux.pro index c0c4f7f..d2e36ae 100644 --- a/libopie2/opiecore/linux/linux.pro +++ b/libopie2/opiecore/linux/linux.pro | |||
@@ -1,11 +1,11 @@ | |||
1 | HEADERS += \ | 1 | HEADERS += \ |
2 | linux/ofilenotify.h \ | 2 | linux/ofilenotify.h \ |
3 | linux/oinputsystem.h \ | 3 | linux/oinputsystem.h \ |
4 | linux/opcmciasystem.h | 4 | linux/opcmciasystem.h |
5 | 5 | ||
6 | SOURCES += \ | 6 | SOURCES += \ |
7 | linux/ofilenotify.cpp \ | 7 | linux/ofilenotify.cpp \ |
8 | linux/oinputsystem.cpp \ | 8 | linux/oinputsystem.cpp \ |
9 | linux/opcmciasystem.cpp | 9 | linux/opcmciasystem.cpp |
10 | 10 | ||
11 | DEFINES += OPCMCIA_DEBUG=1 | 11 | # DEFINES += OPCMCIA_DEBUG=1 |
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp index 445d903..2b0c01d 100644 --- a/libopie2/opiecore/linux/opcmciasystem.cpp +++ b/libopie2/opiecore/linux/opcmciasystem.cpp | |||
@@ -161,100 +161,102 @@ OPcmciaSystem* OPcmciaSystem::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 | else | 210 | else |
210 | { | 211 | { |
211 | ::unlink( (const char*) filename ); | 212 | ::unlink( (const char*) filename ); |
212 | } | 213 | } |
214 | #endif | ||
213 | } | 215 | } |
214 | else | 216 | else |
215 | { | 217 | { |
216 | 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 ) ); |
217 | } | 219 | } |
218 | } | 220 | } |
219 | } | 221 | } |
220 | 222 | ||
221 | /* internal */ void OPcmciaSocket::cleanup() | 223 | /* internal */ void OPcmciaSocket::cleanup() |
222 | { | 224 | { |
223 | // close control socket | 225 | // close control socket |
224 | } | 226 | } |
225 | 227 | ||
226 | /* internal */ bool OPcmciaSocket::getTuple( cisdata_t tuple ) const | 228 | /* internal */ bool OPcmciaSocket::getTuple( cisdata_t tuple ) const |
227 | { | 229 | { |
228 | _ioctlarg.tuple.DesiredTuple = tuple; | 230 | _ioctlarg.tuple.DesiredTuple = tuple; |
229 | _ioctlarg.tuple.Attributes = TUPLE_RETURN_COMMON; | 231 | _ioctlarg.tuple.Attributes = TUPLE_RETURN_COMMON; |
230 | _ioctlarg.tuple.TupleOffset = 0; | 232 | _ioctlarg.tuple.TupleOffset = 0; |
231 | 233 | ||
232 | int result; | 234 | int result; |
233 | result = ::ioctl(_fd, DS_GET_FIRST_TUPLE, &_ioctlarg); | 235 | result = ::ioctl(_fd, DS_GET_FIRST_TUPLE, &_ioctlarg); |
234 | if ( result != 0 ) | 236 | if ( result != 0 ) |
235 | { | 237 | { |
236 | qWarning( "OPcmciaSocket::getTuple() - DS_GET_FIRST_TUPLE failed (%s)", strerror( errno ) ); | 238 | qWarning( "OPcmciaSocket::getTuple() - DS_GET_FIRST_TUPLE failed (%s)", strerror( errno ) ); |
237 | return false; | 239 | return false; |
238 | } | 240 | } |
239 | 241 | ||
240 | result = ::ioctl(_fd, DS_GET_TUPLE_DATA, &_ioctlarg); | 242 | result = ::ioctl(_fd, DS_GET_TUPLE_DATA, &_ioctlarg); |
241 | if ( result != 0 ) | 243 | if ( result != 0 ) |
242 | { | 244 | { |
243 | qWarning( "OPcmciaSocket::getTuple() - DS_GET_TUPLE_DATA failed (%s)", strerror( errno ) ); | 245 | qWarning( "OPcmciaSocket::getTuple() - DS_GET_TUPLE_DATA failed (%s)", strerror( errno ) ); |
244 | return false; | 246 | return false; |
245 | } | 247 | } |
246 | 248 | ||
247 | result = ::ioctl( _fd, DS_PARSE_TUPLE, &_ioctlarg ); | 249 | result = ::ioctl( _fd, DS_PARSE_TUPLE, &_ioctlarg ); |
248 | if ( result != 0 ) | 250 | if ( result != 0 ) |
249 | { | 251 | { |
250 | qWarning( "OPcmciaSocket::getTuple() - DS_PARSE_TUPLE failed (%s)", strerror( errno ) ); | 252 | qWarning( "OPcmciaSocket::getTuple() - DS_PARSE_TUPLE failed (%s)", strerror( errno ) ); |
251 | return false; | 253 | return false; |
252 | } | 254 | } |
253 | 255 | ||
254 | return true; | 256 | return true; |
255 | } | 257 | } |
256 | 258 | ||
257 | 259 | ||
258 | int OPcmciaSocket::number() const | 260 | int OPcmciaSocket::number() const |
259 | { | 261 | { |
260 | return _socket; | 262 | return _socket; |