author | mickeyl <mickeyl> | 2005-06-29 13:04:06 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-06-29 13:04:06 (UTC) |
commit | 094e14624d99d521af6cfc875abafcdc550a7378 (patch) (unidiff) | |
tree | e305bb28c71fdb9483f03dd536b7f13929a73f0a | |
parent | b82756d94b91516a7c36903648382a224a36f0e2 (diff) | |
download | opie-094e14624d99d521af6cfc875abafcdc550a7378.zip opie-094e14624d99d521af6cfc875abafcdc550a7378.tar.gz opie-094e14624d99d521af6cfc875abafcdc550a7378.tar.bz2 |
add restart() method (FIXME included ;)
-rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.cpp | 7 | ||||
-rw-r--r-- | libopie2/opiecore/linux/opcmciasystem.h | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp index 21c5a84..9f151ce 100644 --- a/libopie2/opiecore/linux/opcmciasystem.cpp +++ b/libopie2/opiecore/linux/opcmciasystem.cpp | |||
@@ -125,64 +125,71 @@ void OPcmciaSystem::synchronize() | |||
125 | { | 125 | { |
126 | continue; | 126 | continue; |
127 | } | 127 | } |
128 | } | 128 | } |
129 | } | 129 | } |
130 | 130 | ||
131 | 131 | ||
132 | int OPcmciaSystem::count() const | 132 | int OPcmciaSystem::count() const |
133 | { | 133 | { |
134 | return _interfaces.count(); | 134 | return _interfaces.count(); |
135 | } | 135 | } |
136 | 136 | ||
137 | 137 | ||
138 | int OPcmciaSystem::cardCount() const | 138 | int OPcmciaSystem::cardCount() const |
139 | { | 139 | { |
140 | int nonEmpty = 0; | 140 | int nonEmpty = 0; |
141 | OPcmciaSystem::CardIterator it = iterator(); | 141 | OPcmciaSystem::CardIterator it = iterator(); |
142 | while ( it.current() ) | 142 | while ( it.current() ) |
143 | { | 143 | { |
144 | if ( !it.current()->isEmpty() ) nonEmpty++; | 144 | if ( !it.current()->isEmpty() ) nonEmpty++; |
145 | ++it; | 145 | ++it; |
146 | } | 146 | } |
147 | return nonEmpty; | 147 | return nonEmpty; |
148 | } | 148 | } |
149 | 149 | ||
150 | 150 | ||
151 | OPcmciaSocket* OPcmciaSystem::socket( unsigned int number ) | 151 | OPcmciaSocket* OPcmciaSystem::socket( unsigned int number ) |
152 | { | 152 | { |
153 | return _interfaces.at( number ); | 153 | return _interfaces.at( number ); |
154 | } | 154 | } |
155 | 155 | ||
156 | 156 | ||
157 | void OPcmciaSystem::restart() | ||
158 | { | ||
159 | //FIXME Use OProcess or something that allows more control | ||
160 | ::system( "/etc/init.d/pcmcia restart" ); | ||
161 | } | ||
162 | |||
163 | |||
157 | OPcmciaSystem* OPcmciaSystem::instance() | 164 | OPcmciaSystem* OPcmciaSystem::instance() |
158 | { | 165 | { |
159 | if ( !_instance ) _instance = new OPcmciaSystem(); | 166 | if ( !_instance ) _instance = new OPcmciaSystem(); |
160 | return _instance; | 167 | return _instance; |
161 | } | 168 | } |
162 | 169 | ||
163 | 170 | ||
164 | OPcmciaSystem::CardIterator OPcmciaSystem::iterator() const | 171 | OPcmciaSystem::CardIterator OPcmciaSystem::iterator() const |
165 | { | 172 | { |
166 | return OPcmciaSystem::CardIterator( _interfaces ); | 173 | return OPcmciaSystem::CardIterator( _interfaces ); |
167 | } | 174 | } |
168 | 175 | ||
169 | 176 | ||
170 | /*====================================================================================== | 177 | /*====================================================================================== |
171 | * OPcmciaSocket | 178 | * OPcmciaSocket |
172 | *======================================================================================*/ | 179 | *======================================================================================*/ |
173 | 180 | ||
174 | OPcmciaSocket::OPcmciaSocket( int major, int socket, QObject* parent, const char* name ) | 181 | OPcmciaSocket::OPcmciaSocket( int major, int socket, QObject* parent, const char* name ) |
175 | :QObject( parent, name ), _major( major ), _socket( socket ) | 182 | :QObject( parent, name ), _major( major ), _socket( socket ) |
176 | { | 183 | { |
177 | qDebug( "OPcmciaSocket::OPcmciaSocket()" ); | 184 | qDebug( "OPcmciaSocket::OPcmciaSocket()" ); |
178 | init(); | 185 | init(); |
179 | } | 186 | } |
180 | 187 | ||
181 | 188 | ||
182 | OPcmciaSocket::~OPcmciaSocket() | 189 | OPcmciaSocket::~OPcmciaSocket() |
183 | { | 190 | { |
184 | qDebug( "OPcmciaSocket::~OPcmciaSocket()" ); | 191 | qDebug( "OPcmciaSocket::~OPcmciaSocket()" ); |
185 | cleanup(); | 192 | cleanup(); |
186 | } | 193 | } |
187 | 194 | ||
188 | 195 | ||
diff --git a/libopie2/opiecore/linux/opcmciasystem.h b/libopie2/opiecore/linux/opcmciasystem.h index 23d8c41..fecbb21 100644 --- a/libopie2/opiecore/linux/opcmciasystem.h +++ b/libopie2/opiecore/linux/opcmciasystem.h | |||
@@ -40,77 +40,81 @@ namespace Core { | |||
40 | 40 | ||
41 | class OPcmciaSocket; | 41 | class OPcmciaSocket; |
42 | 42 | ||
43 | /*====================================================================================== | 43 | /*====================================================================================== |
44 | * OPcmciaSystem | 44 | * OPcmciaSystem |
45 | *======================================================================================*/ | 45 | *======================================================================================*/ |
46 | 46 | ||
47 | /** | 47 | /** |
48 | * @brief A container class for the linux pcmcia subsystem | 48 | * @brief A container class for the linux pcmcia subsystem |
49 | * | 49 | * |
50 | * This class provides access to all available pcmcia/cf cards on your device. | 50 | * This class provides access to all available pcmcia/cf cards on your device. |
51 | * | 51 | * |
52 | * @author Michael 'Mickey' Lauer <mickey@Vanille.de> | 52 | * @author Michael 'Mickey' Lauer <mickey@Vanille.de> |
53 | */ | 53 | */ |
54 | class OPcmciaSystem : public QObject | 54 | class OPcmciaSystem : public QObject |
55 | { | 55 | { |
56 | Q_OBJECT | 56 | Q_OBJECT |
57 | 57 | ||
58 | public: | 58 | public: |
59 | typedef QList<OPcmciaSocket> CardList; | 59 | typedef QList<OPcmciaSocket> CardList; |
60 | typedef QListIterator<OPcmciaSocket> CardIterator; | 60 | typedef QListIterator<OPcmciaSocket> CardIterator; |
61 | 61 | ||
62 | public: | 62 | public: |
63 | /** | 63 | /** |
64 | * @returns the number of available sockets | 64 | * @returns the number of available sockets |
65 | */ | 65 | */ |
66 | int count() const; | 66 | int count() const; |
67 | /** | 67 | /** |
68 | * @returns the number of populated sockets | 68 | * @returns the number of populated sockets |
69 | */ | 69 | */ |
70 | int cardCount() const; | 70 | int cardCount() const; |
71 | /** | 71 | /** |
72 | * @returns a pointer to the (one and only) @ref OSystem instance. | 72 | * @returns a pointer to the (one and only) @ref OSystem instance |
73 | */ | 73 | */ |
74 | static OPcmciaSystem* instance(); | 74 | static OPcmciaSystem* instance(); |
75 | /** | 75 | /** |
76 | * @returns an iterator usable for iterating through all sound cards. | 76 | * @returns an iterator usable for iterating through all sound cards |
77 | */ | 77 | */ |
78 | CardIterator iterator() const; | 78 | CardIterator iterator() const; |
79 | /** | 79 | /** |
80 | * @returns a pointer to the @ref OPcmciaSocket object correspinding to socket number n, or 0, if not found | 80 | * @returns a pointer to the @ref OPcmciaSocket object correspinding to socket number n, or 0, if not found |
81 | * @see OPcmciaSocket | 81 | * @see OPcmciaSocket |
82 | */ | 82 | */ |
83 | OPcmciaSocket* socket( unsigned int number ); | 83 | OPcmciaSocket* socket( unsigned int number ); |
84 | /** | 84 | /** |
85 | * Restarts the subsystem | ||
86 | */ | ||
87 | void restart(); | ||
88 | /** | ||
85 | * @internal Rebuild the internal database | 89 | * @internal Rebuild the internal database |
86 | * @note Sometimes it might be useful to call this from client code, | 90 | * @note Sometimes it might be useful to call this from client code, |
87 | * e.g. after issuing a cardctl insert | 91 | * e.g. after issuing a cardctl insert |
88 | */ | 92 | */ |
89 | void synchronize(); | 93 | void synchronize(); |
90 | 94 | ||
91 | protected: | 95 | protected: |
92 | OPcmciaSystem(); | 96 | OPcmciaSystem(); |
93 | 97 | ||
94 | private: | 98 | private: |
95 | static OPcmciaSystem* _instance; | 99 | static OPcmciaSystem* _instance; |
96 | CardList _interfaces; | 100 | CardList _interfaces; |
97 | int _major; | 101 | int _major; |
98 | 102 | ||
99 | private: | 103 | private: |
100 | class Private; | 104 | class Private; |
101 | Private *d; | 105 | Private *d; |
102 | }; | 106 | }; |
103 | 107 | ||
104 | 108 | ||
105 | /*====================================================================================== | 109 | /*====================================================================================== |
106 | * OPcmciaSocket | 110 | * OPcmciaSocket |
107 | *======================================================================================*/ | 111 | *======================================================================================*/ |
108 | 112 | ||
109 | class OPcmciaSocket : public QObject | 113 | class OPcmciaSocket : public QObject |
110 | { | 114 | { |
111 | Q_OBJECT | 115 | Q_OBJECT |
112 | public: | 116 | public: |
113 | 117 | ||
114 | enum OPcmciaSocketCardStatus | 118 | enum OPcmciaSocketCardStatus |
115 | { | 119 | { |
116 | Unknown = 0, | 120 | Unknown = 0, |