author | mickeyl <mickeyl> | 2005-05-22 21:55:59 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-05-22 21:55:59 (UTC) |
commit | b153f9739d300b3bc608ea76968b818818fce1d0 (patch) (unidiff) | |
tree | 8b05eedb78f5eab6b5d49c68248da8425f09410b /libopie2/opiecore/linux/opcmciasystem.h | |
parent | ffe68fa0d9b4eb89fe1549b5734ca6ab23c8ab62 (diff) | |
download | opie-b153f9739d300b3bc608ea76968b818818fce1d0.zip opie-b153f9739d300b3bc608ea76968b818818fce1d0.tar.gz opie-b153f9739d300b3bc608ea76968b818818fce1d0.tar.bz2 |
start talking directly to pcmcia card services
Diffstat (limited to 'libopie2/opiecore/linux/opcmciasystem.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.h | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.h b/libopie2/opiecore/linux/opcmciasystem.h index 630a434..ef34964 100644 --- a/libopie2/opiecore/linux/opcmciasystem.h +++ b/libopie2/opiecore/linux/opcmciasystem.h | |||
@@ -30,6 +30,8 @@ | |||
30 | #ifndef OPCMCIASYSTEM_H | 30 | #ifndef OPCMCIASYSTEM_H |
31 | #define OPCMCIASYSTEM_H | 31 | #define OPCMCIASYSTEM_H |
32 | 32 | ||
33 | #include "linux_pcmcia.h" | ||
34 | |||
33 | #include <qobject.h> | 35 | #include <qobject.h> |
34 | #include <qlist.h> | 36 | #include <qlist.h> |
35 | 37 | ||
@@ -92,6 +94,9 @@ class OPcmciaSystem : public QObject | |||
92 | private: | 94 | private: |
93 | static OPcmciaSystem* _instance; | 95 | static OPcmciaSystem* _instance; |
94 | CardList _interfaces; | 96 | CardList _interfaces; |
97 | int _major; | ||
98 | |||
99 | private: | ||
95 | class Private; | 100 | class Private; |
96 | Private *d; | 101 | Private *d; |
97 | }; | 102 | }; |
@@ -108,9 +113,9 @@ class OPcmciaSocket : public QObject | |||
108 | public: | 113 | public: |
109 | /** | 114 | /** |
110 | * Constructor. Normally you don't create @ref OPcmciaSocket objects yourself, | 115 | * Constructor. Normally you don't create @ref OPcmciaSocket objects yourself, |
111 | * but access them via @ref OPcmciaSystem::card(). | 116 | * but access them via @ref OPcmciaSystem::socket(). |
112 | */ | 117 | */ |
113 | OPcmciaSocket( int socket, QObject* parent, const char* name ); | 118 | OPcmciaSocket( int major, int socket, QObject* parent, const char* name ); |
114 | /** | 119 | /** |
115 | * Destructor. | 120 | * Destructor. |
116 | */ | 121 | */ |
@@ -160,13 +165,30 @@ class OPcmciaSocket : public QObject | |||
160 | * @note: This operation needs root privileges | 165 | * @note: This operation needs root privileges |
161 | */ | 166 | */ |
162 | bool reset(); | 167 | bool reset(); |
168 | /** | ||
169 | * @returns a list of product IDs | ||
170 | */ | ||
171 | const QStringList& productIdentity() const; | ||
172 | /** | ||
173 | * @returns the manufacturer ID pair | ||
174 | */ | ||
175 | #if 0 | ||
176 | const QPair& manufacturerIdentity() const; | ||
177 | #endif | ||
163 | 178 | ||
164 | protected: | 179 | private: |
180 | QStringList _productId; | ||
165 | 181 | ||
166 | private: | 182 | private: |
167 | void init(); | 183 | void init(); |
184 | void buildInformation(); | ||
185 | void cleanup(); | ||
168 | bool command( const QString& cmd ); | 186 | bool command( const QString& cmd ); |
187 | bool getTuple( cisdata_t tuple ); | ||
188 | int _major; | ||
169 | int _socket; | 189 | int _socket; |
190 | int _fd; | ||
191 | ds_ioctl_arg_t _ioctlarg; | ||
170 | 192 | ||
171 | private: | 193 | private: |
172 | class Private; | 194 | class Private; |