summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-05-25 19:03:26 (UTC)
committer mickeyl <mickeyl>2005-05-25 19:03:26 (UTC)
commit8d2d91b9b6e590e474fe3acd92f71e40779a493b (patch) (side-by-side diff)
tree877bf0b4c6a23892ed0d2d2a0a3e3aa7b82ee2a1
parent5fdc5b4cba7743947a23840ba09fadcc7414309b (diff)
downloadopie-8d2d91b9b6e590e474fe3acd92f71e40779a493b.zip
opie-8d2d91b9b6e590e474fe3acd92f71e40779a493b.tar.gz
opie-8d2d91b9b6e590e474fe3acd92f71e40779a493b.tar.bz2
be nice to gcc 3.3
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiecore/linux/opcmciasystem.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp
index 7bd7178..0f7ff46 100644
--- a/libopie2/opiecore/linux/opcmciasystem.cpp
+++ b/libopie2/opiecore/linux/opcmciasystem.cpp
@@ -145,97 +145,97 @@ int OPcmciaSystem::cardCount() const
}
OPcmciaSocket* OPcmciaSystem::socket( unsigned int number )
{
return _interfaces.at( number );
}
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();
buildInformation();
}
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 );
+ dev_t dev = makedev( _major, _socket );
QString filename = QString().sprintf( "/tmp/opcmciasystem-%d", ::getpid() );
if ( ::mknod( (const char*) filename, ( S_IFCHR|S_IREAD|S_IWRITE ), dev ) == 0 )
{
_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 ) );
}
}
}
/* internal */ void OPcmciaSocket::buildInformation()
{
cistpl_vers_1_t *vers = &_ioctlarg.tuple_parse.parse.version_1;
cistpl_manfid_t *manfid = &_ioctlarg.tuple_parse.parse.manfid;
cistpl_funcid_t *funcid = &_ioctlarg.tuple_parse.parse.funcid;
config_info_t config;
if ( getTuple( CISTPL_VERS_1 ) )
{
for ( int i = 0; i < CISTPL_VERS_1_MAX_PROD_STRINGS; ++i )
{
qDebug( " PRODID = '%s'", vers->str+vers->ofs[i] );
_productId += vers->str+vers->ofs[i];
}
}
/*
for (i = 0; i < 4; i++)
printf("PRODID_%d=\"%s\"\n", i+1,
(i < vers->ns) ? vers->str+vers->ofs[i] : "");
*manfid = (cistpl_manfid_t) { 0, 0 };
get_tuple(fd, CISTPL_MANFID, &arg);
printf("MANFID=%04x,%04x\n", manfid->manf, manfid->card);
*funcid = (cistpl_funcid_t) { 0xff, 0xff };
get_tuple(fd, CISTPL_FUNCID, &arg);
printf("FUNCID=%d\n", funcid->func);
config.Function = config.ConfigBase = 0;
*/
}