summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-06-14 13:14:38 (UTC)
committer mickeyl <mickeyl>2005-06-14 13:14:38 (UTC)
commitc1194d42d8456417452b125bd6c2c5048d7bbe02 (patch) (unidiff)
treedbc31e47615d840745eafd0635f724548ece6281
parent9e210f138184f9cc93e28dd894243fc7bfea1b0f (diff)
downloadopie-c1194d42d8456417452b125bd6c2c5048d7bbe02.zip
opie-c1194d42d8456417452b125bd6c2c5048d7bbe02.tar.gz
opie-c1194d42d8456417452b125bd6c2c5048d7bbe02.tar.bz2
enable OPcmciaSocket::manufacturer()
Did I mention Qt2 sucks? We don't even have a QPair :/
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.cpp24
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.h6
2 files changed, 20 insertions, 10 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp
index 929e289..2eece6b 100644
--- a/libopie2/opiecore/linux/opcmciasystem.cpp
+++ b/libopie2/opiecore/linux/opcmciasystem.cpp
@@ -51,2 +51,4 @@ using namespace Opie::Core;
51 51
52#define OPCMCIA_DEBUG 1
53
52/*====================================================================================== 54/*======================================================================================
@@ -191,4 +193,10 @@ OPcmciaSocket::~OPcmciaSocket()
191 dev_t dev = makedev( _major, _socket ); 193 dev_t dev = makedev( _major, _socket );
194
195#ifdef OPCMCIA_DEBUG
196 QString filename = "/tmp/opcmciasystem-debug";
197 if ( QFile::exists( filename ) )
198#else
192 QString filename = QString().sprintf( "/tmp/opcmciasystem-%d", ::getpid() ); 199 QString filename = QString().sprintf( "/tmp/opcmciasystem-%d", ::getpid() );
193 if ( ::mknod( (const char*) filename, ( S_IFCHR|S_IREAD|S_IWRITE ), dev ) == 0 ) 200 if ( ::mknod( (const char*) filename, ( S_IFCHR|S_IREAD|S_IWRITE ), dev ) == 0 )
201#endif
194 { 202 {
@@ -206,3 +214,3 @@ OPcmciaSocket::~OPcmciaSocket()
206 { 214 {
207 qWarning( "OPcmciaSocket::init() - can't create device node (%s)", strerror( errno ) ); 215 qWarning( "OPcmciaSocket::init() - can't create device node '%s' (%s)", (const char*) filename, strerror( errno ) );
208 } 216 }
@@ -293,3 +301,3 @@ bool OPcmciaSocket::isSuspended() const
293{ 301{
294 return status() && Suspended; 302 return status() && Suspended;
295} 303}
@@ -347,8 +355,12 @@ QStringList OPcmciaSocket::productIdentity() const
347 355
348#if 0 356QString OPcmciaSocket::manufacturerIdentity() const
349const QPair& OPcmciaSocket::manufacturerIdentity() const
350{ 357{
351 return _manufId; 358 cistpl_manfid_t *manfid = &_ioctlarg.tuple_parse.parse.manfid;
359 if ( getTuple( CISTPL_MANFID ) )
360 {
361 return QString().sprintf( "0x%04x, 0x%04x", manfid->manf, manfid->card );
362 }
363 else
364 return "<unknown>";
352} 365}
353#endif
354 366
diff --git a/libopie2/opiecore/linux/opcmciasystem.h b/libopie2/opiecore/linux/opcmciasystem.h
index ac6c1de..0fd43cf 100644
--- a/libopie2/opiecore/linux/opcmciasystem.h
+++ b/libopie2/opiecore/linux/opcmciasystem.h
@@ -194,7 +194,5 @@ class OPcmciaSocket : public QObject
194 /** 194 /**
195 * @returns the manufacturer ID pair 195 * @returns the manufacturer ID string
196 */ 196 */
197#if 0 197 QString manufacturerIdentity() const;
198 const QPair& manufacturerIdentity() const;
199#endif
200 /** 198 /**