-rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.cpp | 15 | ||||
-rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.h | 9 |
2 files changed, 23 insertions, 1 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp index c4b5316..c310b85 100644 --- a/libopie2/opiecore/linux/opcmciasystem.cpp +++ b/libopie2/opiecore/linux/opcmciasystem.cpp | |||
@@ -161,45 +161,58 @@ OPcmciaSocket::~OPcmciaSocket() | |||
161 | QString cmdline = QString().sprintf( "cardctl %s %d &", (const char*) cmd, _socket ); | 161 | QString cmdline = QString().sprintf( "cardctl %s %d &", (const char*) cmd, _socket ); |
162 | ::system( (const char*) cmdline ); | 162 | ::system( (const char*) cmdline ); |
163 | } | 163 | } |
164 | 164 | ||
165 | int OPcmciaSocket::number() const | 165 | int OPcmciaSocket::number() const |
166 | { | 166 | { |
167 | return _socket; | 167 | return _socket; |
168 | } | 168 | } |
169 | 169 | ||
170 | 170 | ||
171 | QString OPcmciaSocket::identity() const | 171 | QString OPcmciaSocket::identity() const |
172 | { | 172 | { |
173 | return ( strcmp( name(), "empty" ) == 0 ) ? "<Empty Socket>" : name(); | 173 | return ( strcmp( name(), "empty" ) == 0 ) ? "<Empty Socket>" : name(); |
174 | } | 174 | } |
175 | 175 | ||
176 | 176 | ||
177 | bool OPcmciaSocket::isUnsupported() const | ||
178 | { | ||
179 | return ( strcmp( name(), "unsupported card" ) == 0 ); | ||
180 | } | ||
181 | |||
182 | |||
177 | bool OPcmciaSocket::isEmpty() const | 183 | bool OPcmciaSocket::isEmpty() const |
178 | { | 184 | { |
179 | return ( strcmp( name(), "empty" ) == 0 ); | 185 | return ( strcmp( name(), "empty" ) == 0 ); |
180 | } | 186 | } |
181 | 187 | ||
182 | 188 | ||
183 | bool OPcmciaSocket::isSuspended() const | 189 | bool OPcmciaSocket::isSuspended() const |
184 | { | 190 | { |
191 | //FIXME | ||
192 | return false; | ||
185 | } | 193 | } |
186 | 194 | ||
187 | bool OPcmciaSocket::eject() | 195 | bool OPcmciaSocket::eject() |
188 | { | 196 | { |
189 | return command( "eject" ); | 197 | return command( "eject" ); |
190 | } | 198 | } |
191 | 199 | ||
192 | bool OPcmciaSocket::insert() | 200 | bool OPcmciaSocket::insert() |
193 | { | 201 | { |
194 | return command( "insert" ); | 202 | return command( "insert" ); |
195 | } | 203 | } |
196 | 204 | ||
197 | bool OPcmciaSocket::suspend() | 205 | bool OPcmciaSocket::suspend() |
198 | { | 206 | { |
199 | return command( "suspend" ); | 207 | return command( "suspend" ); |
200 | } | 208 | } |
201 | 209 | ||
202 | bool OPcmciaSocket::resume() | 210 | bool OPcmciaSocket::resume() |
203 | { | 211 | { |
204 | return command( "resume "); | 212 | return command( "resume"); |
213 | } | ||
214 | |||
215 | bool OPcmciaSocket::reset() | ||
216 | { | ||
217 | return command( "reset"); | ||
205 | } | 218 | } |
diff --git a/libopie2/opiecore/linux/opcmciasystem.h b/libopie2/opiecore/linux/opcmciasystem.h index 4b445aa..630a434 100644 --- a/libopie2/opiecore/linux/opcmciasystem.h +++ b/libopie2/opiecore/linux/opcmciasystem.h | |||
@@ -111,59 +111,68 @@ class OPcmciaSocket : public QObject | |||
111 | * but access them via @ref OPcmciaSystem::card(). | 111 | * but access them via @ref OPcmciaSystem::card(). |
112 | */ | 112 | */ |
113 | OPcmciaSocket( int socket, QObject* parent, const char* name ); | 113 | OPcmciaSocket( int socket, QObject* parent, const char* name ); |
114 | /** | 114 | /** |
115 | * Destructor. | 115 | * Destructor. |
116 | */ | 116 | */ |
117 | virtual ~OPcmciaSocket(); | 117 | virtual ~OPcmciaSocket(); |
118 | /** | 118 | /** |
119 | * @returns the corresponding socket number | 119 | * @returns the corresponding socket number |
120 | */ | 120 | */ |
121 | int number() const; | 121 | int number() const; |
122 | /** | 122 | /** |
123 | * @returns the identification string of the card in this socket, or "<Empty Socket>" | 123 | * @returns the identification string of the card in this socket, or "<Empty Socket>" |
124 | */ | 124 | */ |
125 | QString identity() const; | 125 | QString identity() const; |
126 | /** | 126 | /** |
127 | * @returns true, if the card is unsupported by the cardmgr | ||
128 | */ | ||
129 | bool isUnsupported() const; | ||
130 | /** | ||
127 | * @returns true, if the socket is empty | 131 | * @returns true, if the socket is empty |
128 | */ | 132 | */ |
129 | bool isEmpty() const; | 133 | bool isEmpty() const; |
130 | /** | 134 | /** |
131 | * @returns true, if the socket is suspended | 135 | * @returns true, if the socket is suspended |
132 | */ | 136 | */ |
133 | bool isSuspended() const; | 137 | bool isSuspended() const; |
134 | /** | 138 | /** |
135 | * Eject card. @returns true, if operation succeeded | 139 | * Eject card. @returns true, if operation succeeded |
136 | * @note: This operation needs root privileges | 140 | * @note: This operation needs root privileges |
137 | */ | 141 | */ |
138 | bool eject(); | 142 | bool eject(); |
139 | /** | 143 | /** |
140 | * Insert card. @returns true, if operation succeeded | 144 | * Insert card. @returns true, if operation succeeded |
141 | * @note: This operation needs root privileges | 145 | * @note: This operation needs root privileges |
142 | */ | 146 | */ |
143 | bool insert(); | 147 | bool insert(); |
144 | /** | 148 | /** |
145 | * Suspend card. @returns true, if operation succeeded | 149 | * Suspend card. @returns true, if operation succeeded |
146 | * @note: This operation needs root privileges | 150 | * @note: This operation needs root privileges |
147 | */ | 151 | */ |
148 | bool suspend(); | 152 | bool suspend(); |
149 | /** | 153 | /** |
150 | * Resume card. @returns true, if operation succeeded | 154 | * Resume card. @returns true, if operation succeeded |
151 | * @note: This operation needs root privileges | 155 | * @note: This operation needs root privileges |
152 | */ | 156 | */ |
153 | bool resume(); | 157 | bool resume(); |
158 | /** | ||
159 | * Reset card. @returns true, if operation succeeded | ||
160 | * @note: This operation needs root privileges | ||
161 | */ | ||
162 | bool reset(); | ||
154 | 163 | ||
155 | protected: | 164 | protected: |
156 | 165 | ||
157 | private: | 166 | private: |
158 | void init(); | 167 | void init(); |
159 | bool command( const QString& cmd ); | 168 | bool command( const QString& cmd ); |
160 | int _socket; | 169 | int _socket; |
161 | 170 | ||
162 | private: | 171 | private: |
163 | class Private; | 172 | class Private; |
164 | Private *d; | 173 | Private *d; |
165 | }; | 174 | }; |
166 | 175 | ||
167 | 176 | ||
168 | } | 177 | } |
169 | } | 178 | } |