summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-06-14 13:14:38 (UTC)
committer mickeyl <mickeyl>2005-06-14 13:14:38 (UTC)
commitc1194d42d8456417452b125bd6c2c5048d7bbe02 (patch) (side-by-side diff)
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) (show whitespace changes)
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.cpp22
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.h6
2 files changed, 19 insertions, 9 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
@@ -44,16 +44,18 @@ using namespace Opie::Core;
#include <stdlib.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#define PROC_DEVICES "/proc/devices"
+#define OPCMCIA_DEBUG 1
+
/*======================================================================================
* OPcmciaSystem
*======================================================================================*/
OPcmciaSystem* OPcmciaSystem::_instance = 0;
OPcmciaSystem::OPcmciaSystem()
:_major( 0 )
@@ -184,32 +186,38 @@ OPcmciaSocket::~OPcmciaSocket()
/* 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 ) );
}
else
{
::unlink( (const char*) filename );
}
}
else
{
- qWarning( "OPcmciaSocket::init() - can't create device node (%s)", strerror( errno ) );
+ qWarning( "OPcmciaSocket::init() - can't create device node '%s' (%s)", (const char*) filename, strerror( errno ) );
}
}
}
/* internal */ void OPcmciaSocket::cleanup()
{
// close control socket
}
@@ -340,22 +348,26 @@ QStringList OPcmciaSocket::productIdentity() const
else
{
list += "<unknown>";
}
return list;
}
-#if 0
-const QPair& OPcmciaSocket::manufacturerIdentity() const
+QString OPcmciaSocket::manufacturerIdentity() const
+{
+ cistpl_manfid_t *manfid = &_ioctlarg.tuple_parse.parse.manfid;
+ if ( getTuple( CISTPL_MANFID ) )
{
- return _manufId;
+ return QString().sprintf( "0x%04x, 0x%04x", manfid->manf, manfid->card );
+ }
+ else
+ return "<unknown>";
}
-#endif
QString OPcmciaSocket::function() const
{
cistpl_funcid_t *funcid = &_ioctlarg.tuple_parse.parse.funcid;
if ( getTuple( CISTPL_FUNCID ) )
{
switch ( funcid->func )
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
@@ -187,21 +187,19 @@ class OPcmciaSocket : public QObject
* @note: This operation needs root privileges
*/
bool reset();
/**
* @returns a list of product IDs
*/
QStringList productIdentity() const;
/**
- * @returns the manufacturer ID pair
+ * @returns the manufacturer ID string
*/
-#if 0
- const QPair& manufacturerIdentity() const;
-#endif
+ QString manufacturerIdentity() const;
/**
* @returns the function string
*/
QString function() const;
private:
void init();
void cleanup();