author | mickeyl <mickeyl> | 2004-05-03 09:40:07 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-05-03 09:40:07 (UTC) |
commit | fb6f93892d4d0e0471d62f5b5ab6d9bdef0a5e76 (patch) (unidiff) | |
tree | 9ff1498eddd22a29df1639abb66b863ac5d36931 /libopie2/opienet/onetwork.h | |
parent | d65575b75d8b755e27a1b7c655ad464fc417d093 (diff) | |
download | opie-fb6f93892d4d0e0471d62f5b5ab6d9bdef0a5e76.zip opie-fb6f93892d4d0e0471d62f5b5ab6d9bdef0a5e76.tar.gz opie-fb6f93892d4d0e0471d62f5b5ab6d9bdef0a5e76.tar.bz2 |
remove the OPIE_WE_VERSION crap. this was a step into the wrong direction.
remove the wireless.h user headers also. we are doomed to use the kernel
ones until Jean himself provides user headers. As a nice side effect,
the automatic WE_VERSION detected has been removed. It was too weak anyway,
since e.g. the handhelds.org community updated kernel 2.4.19 to WE V16
about 14 months ago...
-rw-r--r-- | libopie2/opienet/onetwork.h | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h index a49c8fb..057b1a0 100644 --- a/libopie2/opienet/onetwork.h +++ b/libopie2/opienet/onetwork.h | |||
@@ -31,41 +31,28 @@ | |||
31 | #ifndef ONETWORK_H | 31 | #ifndef ONETWORK_H |
32 | #define ONETWORK_H | 32 | #define ONETWORK_H |
33 | 33 | ||
34 | #if !defined( OPIE_WE_VERSION ) | ||
35 | #warning No wireless extension specified; autodetecting... | ||
36 | #include <linux/version.h> | ||
37 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23) | ||
38 | #define OPIE_WE_VERSION 15 | ||
39 | #else | ||
40 | #define OPIE_WE_VERSION 16 | ||
41 | #endif // LINUX_VERSION_CODE < KERNEL_VERSION(2.4.23) | ||
42 | #endif // !defined( OPIE_WE_VERSION ) | ||
43 | |||
44 | #if OPIE_WE_VERSION == 15 | ||
45 | #include "wireless.15.h" | ||
46 | #warning Using WE V15 | ||
47 | #endif | ||
48 | #if OPIE_WE_VERSION == 16 | ||
49 | #include "wireless.16.h" | ||
50 | #warning Using WE V16 | ||
51 | #endif | ||
52 | |||
53 | /* OPIE */ | 34 | /* OPIE */ |
54 | |||
55 | #include <opie2/onetutils.h> | 35 | #include <opie2/onetutils.h> |
56 | #include <opie2/ostation.h> | 36 | #include <opie2/ostation.h> |
57 | 37 | ||
58 | /* QT */ | 38 | /* QT */ |
59 | |||
60 | #include <qvaluelist.h> | 39 | #include <qvaluelist.h> |
61 | #include <qdict.h> | 40 | #include <qdict.h> |
62 | #include <qmap.h> | 41 | #include <qmap.h> |
63 | #include <qobject.h> | 42 | #include <qobject.h> |
64 | #include <qhostaddress.h> | 43 | #include <qhostaddress.h> |
65 | 44 | ||
45 | /* STD */ | ||
46 | // hacky workaround until we have a user space wireless.h | ||
47 | #include <net/if.h> | ||
48 | #define _LINUX_IF_H | ||
49 | #include <linux/wireless.h> | ||
50 | #ifndef IW_MAX_PRIV_DEF | ||
51 | #define IW_MAX_PRIV_DEF 128 | ||
52 | #endif | ||
53 | |||
66 | namespace Opie { | 54 | namespace Opie { |
67 | namespace Net { | 55 | namespace Net { |
68 | |||
69 | class ONetworkInterface; | 56 | class ONetworkInterface; |
70 | class OWirelessNetworkInterface; | 57 | class OWirelessNetworkInterface; |
71 | class OChannelHopper; | 58 | class OChannelHopper; |