Diffstat (limited to 'libopie2/opiecore/linux/opcmciasystem.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.cpp | 92 |
1 files changed, 77 insertions, 15 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp index 34e4477..c4b5316 100644 --- a/libopie2/opiecore/linux/opcmciasystem.cpp +++ b/libopie2/opiecore/linux/opcmciasystem.cpp | |||
@@ -43,2 +43,3 @@ using namespace Opie::Core; | |||
43 | #include <string.h> | 43 | #include <string.h> |
44 | #include <stdlib.h> | ||
44 | #include <sys/ioctl.h> | 45 | #include <sys/ioctl.h> |
@@ -79,10 +80,12 @@ void OPcmciaSystem::synchronize() | |||
79 | { | 80 | { |
80 | QString line = cardinfo.readLine(); | 81 | QString strSocket; |
81 | // qDebug( "line = '%s'", (const char*) line ); | 82 | int numSocket; |
82 | if ( line.startsWith( "Socket" ) && ! line.contains( "empty" ) ) | 83 | char colon; |
84 | QString cardName; | ||
85 | cardinfo >> strSocket >> numSocket >> colon; | ||
86 | cardName = cardinfo.readLine().stripWhiteSpace(); | ||
87 | qDebug( "strSocket = '%s', numSocket = '%d', colon = '%c', cardName = '%s'", (const char*) strSocket, numSocket, colon, ( const char*) cardName ); | ||
88 | if ( strSocket == "Socket" && colon == ':' ) | ||
83 | { | 89 | { |
84 | int mid = line.find( ':' ); | 90 | _interfaces.append( new OPcmciaSocket( numSocket, this, (const char*) cardName ) ); |
85 | QString name = line.right( line.length() - mid - 1 ); | ||
86 | QString id = line.right( line.length() - mid + 1 ); | ||
87 | if ( mid ) _interfaces.insert( name.stripWhiteSpace(), new OPcmciaCard( this, (const char*) id.stripWhiteSpace() ) ); | ||
88 | } | 91 | } |
@@ -102,5 +105,18 @@ int OPcmciaSystem::count() const | |||
102 | 105 | ||
103 | OPcmciaCard* OPcmciaSystem::card( const QString& iface ) const | 106 | int OPcmciaSystem::cardCount() const |
104 | { | 107 | { |
105 | return _interfaces[iface]; | 108 | int nonEmpty = 0; |
109 | OPcmciaSystem::CardIterator it = iterator(); | ||
110 | while ( it.current() ) | ||
111 | { | ||
112 | if ( !it.current()->isEmpty() ) nonEmpty++; | ||
113 | ++it; | ||
114 | } | ||
115 | return nonEmpty; | ||
116 | } | ||
117 | |||
118 | |||
119 | OPcmciaSocket* OPcmciaSystem::socket( unsigned int number ) | ||
120 | { | ||
121 | return _interfaces.at( number ); | ||
106 | } | 122 | } |
@@ -122,9 +138,9 @@ OPcmciaSystem::CardIterator OPcmciaSystem::iterator() const | |||
122 | /*====================================================================================== | 138 | /*====================================================================================== |
123 | * OPcmciaCard | 139 | * OPcmciaSocket |
124 | *======================================================================================*/ | 140 | *======================================================================================*/ |
125 | 141 | ||
126 | OPcmciaCard::OPcmciaCard( QObject* parent, const char* name ) | 142 | OPcmciaSocket::OPcmciaSocket( int socket, QObject* parent, const char* name ) |
127 | :QObject( parent, name ) | 143 | :QObject( parent, name ), _socket( socket ) |
128 | { | 144 | { |
129 | odebug << "OPcmciaCard::OPcmciaCard()" << oendl; | 145 | odebug << "OPcmciaSocket::OPcmciaSocket()" << oendl; |
130 | init(); | 146 | init(); |
@@ -133,4 +149,26 @@ OPcmciaCard::OPcmciaCard( QObject* parent, const char* name ) | |||
133 | 149 | ||
134 | OPcmciaCard::~OPcmciaCard() | 150 | OPcmciaSocket::~OPcmciaSocket() |
151 | { | ||
152 | } | ||
153 | |||
154 | |||
155 | /* internal */ void OPcmciaSocket::init() | ||
156 | { | ||
157 | } | ||
158 | |||
159 | /* internal */ bool OPcmciaSocket::command( const QString& cmd ) | ||
160 | { | ||
161 | QString cmdline = QString().sprintf( "cardctl %s %d &", (const char*) cmd, _socket ); | ||
162 | ::system( (const char*) cmdline ); | ||
163 | } | ||
164 | |||
165 | int OPcmciaSocket::number() const | ||
166 | { | ||
167 | return _socket; | ||
168 | } | ||
169 | |||
170 | |||
171 | QString OPcmciaSocket::identity() const | ||
135 | { | 172 | { |
173 | return ( strcmp( name(), "empty" ) == 0 ) ? "<Empty Socket>" : name(); | ||
136 | } | 174 | } |
@@ -138,4 +176,5 @@ OPcmciaCard::~OPcmciaCard() | |||
138 | 176 | ||
139 | void OPcmciaCard::init() | 177 | bool OPcmciaSocket::isEmpty() const |
140 | { | 178 | { |
179 | return ( strcmp( name(), "empty" ) == 0 ); | ||
141 | } | 180 | } |
@@ -143 +182,24 @@ void OPcmciaCard::init() | |||
143 | 182 | ||
183 | bool OPcmciaSocket::isSuspended() const | ||
184 | { | ||
185 | } | ||
186 | |||
187 | bool OPcmciaSocket::eject() | ||
188 | { | ||
189 | return command( "eject" ); | ||
190 | } | ||
191 | |||
192 | bool OPcmciaSocket::insert() | ||
193 | { | ||
194 | return command( "insert" ); | ||
195 | } | ||
196 | |||
197 | bool OPcmciaSocket::suspend() | ||
198 | { | ||
199 | return command( "suspend" ); | ||
200 | } | ||
201 | |||
202 | bool OPcmciaSocket::resume() | ||
203 | { | ||
204 | return command( "resume "); | ||
205 | } | ||