1 files changed, 35 insertions, 30 deletions
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h
index 1eb5959..c6306e7 100644
--- a/libopie2/opiecore/device/odevice.h
+++ b/libopie2/opiecore/device/odevice.h
@@ -42,128 +42,133 @@
 #include <qstrlist.h>
 #include <qwindowsystem_qws.h>
 class Sound;
 namespace Opie{
 namespace Core{
 class ODeviceData;
 /**
 * The available devices
 */
 enum OModel {
    Model_Unknown, // = 0
    Model_Series_Mask   = 0xffff0000,
    Model_iPAQ          = ( 1 << 16 ),
    Model_iPAQ_All      = ( Model_iPAQ | 0xffff ),
    Model_iPAQ_H31xx    = ( Model_iPAQ | 0x0001 ),
    Model_iPAQ_H36xx    = ( Model_iPAQ | 0x0002 ),
-    Model_iPAQ_H37xx    = ( Model_iPAQ | 0x0003 ),
+    Model_iPAQ_H37xx    = ( Model_iPAQ | 0x0004 ),
-    Model_iPAQ_H38xx    = ( Model_iPAQ | 0x0004 ),
+    Model_iPAQ_H38xx    = ( Model_iPAQ | 0x0008 ),
-    Model_iPAQ_H39xx    = ( Model_iPAQ | 0x0005 ),
+    Model_iPAQ_H39xx    = ( Model_iPAQ | 0x0010 ),
-    Model_iPAQ_H5xxx    = ( Model_iPAQ | 0x0006 ),
+    Model_iPAQ_H5xxx    = ( Model_iPAQ | 0x0020 ),
-    Model_iPAQ_H22xx    = ( Model_iPAQ | 0x0007 ),
+    Model_iPAQ_H22xx    = ( Model_iPAQ | 0x0040 ),
-    Model_iPAQ_H191x    = ( Model_iPAQ | 0x0008 ),
+    Model_iPAQ_H191x    = ( Model_iPAQ | 0x0080 ),
-    Model_iPAQ_H1940    = ( Model_iPAQ | 0x0009 ),
+    Model_iPAQ_H1940    = ( Model_iPAQ | 0x0100 ),
-    Model_iPAQ_HX4700   = ( Model_iPAQ | 0x000A ),
+    Model_iPAQ_HX4700   = ( Model_iPAQ | 0x0200 ),
-    Model_iPAQ_H4xxx    = ( Model_iPAQ | 0x000b ),
+    Model_iPAQ_H4xxx    = ( Model_iPAQ | 0x0400 ),
-    Model_Jornada       = ( 6 << 16 ),
+    Model_Jornada       = ( 3 << 17 ),
    Model_Jornada_56x   = ( Model_Jornada | 0x0001 ),
    Model_Jornada_720   = ( Model_Jornada | 0x0002 ),
-    Model_Jornada_820   = ( Model_Jornada | 0x0003 ),
+    Model_Jornada_820   = ( Model_Jornada | 0x0004 ),
    Model_Zaurus        = ( 2 << 16 ),
    Model_Zaurus_SL5000 = ( Model_Zaurus | 0x0001 ),
    Model_Zaurus_SL5500 = ( Model_Zaurus | 0x0002 ),
-    Model_Zaurus_SLA300 = ( Model_Zaurus | 0x0003 ),
+    Model_Zaurus_SLA300 = ( Model_Zaurus | 0x0004 ),
-    Model_Zaurus_SLB600 = ( Model_Zaurus | 0x0004 ),
+    Model_Zaurus_SLB600 = ( Model_Zaurus | 0x0008 ),
-    Model_Zaurus_SLC7x0 = ( Model_Zaurus | 0x0005 ),
+    Model_Zaurus_SLC7x0 = ( Model_Zaurus | 0x0010 ),
-    Model_Zaurus_SL6000 = ( Model_Zaurus | 0x0006 ),
+    Model_Zaurus_SL6000 = ( Model_Zaurus | 0x0020 ),
-    Model_Zaurus_SLC3000 = ( Model_Zaurus | 0x0007 ),
+    Model_Zaurus_SLC3000 = ( Model_Zaurus | 0x0040 ),
-    Model_Zaurus_SLC1000 = ( Model_Zaurus | 0x0008 ),
+    Model_Zaurus_SLC1000 = ( Model_Zaurus | 0x0080 ),
-    Model_Zaurus_SLC3100 = ( Model_Zaurus | 0x0009 ),
+    Model_Zaurus_SLC3100 = ( Model_Zaurus | 0x0100 ),
    Model_SIMpad        = ( 3 << 16 ),
    Model_SIMpad_All    = ( Model_SIMpad | 0xffff ),
    Model_SIMpad_CL4    = ( Model_SIMpad | 0x0001 ),
    Model_SIMpad_SL4    = ( Model_SIMpad | 0x0002 ),
-    Model_SIMpad_SLC    = ( Model_SIMpad | 0x0003 ),
+    Model_SIMpad_SLC    = ( Model_SIMpad | 0x0004 ),
-    Model_SIMpad_TSinus = ( Model_SIMpad | 0x0004 ),
+    Model_SIMpad_TSinus = ( Model_SIMpad | 0x0008 ),
    Model_Ramses        = ( 4 << 16 ),
    Model_Ramses_All    = ( Model_Ramses | 0xffff ),
    Model_Ramses_MNCI   = ( Model_Ramses | 0x0001 ),
    Model_Ramses_MNCIRX = ( Model_Ramses | 0x0002 ),
    Model_Yopy          = ( 5 << 16 ),
    Model_Yopy_All      = ( Model_Yopy | 0xffff ),
    Model_Yopy_3000     = ( Model_Yopy | 0x0001 ),
    Model_Yopy_3500     = ( Model_Yopy | 0x0002 ),
-    Model_Yopy_3700     = ( Model_Yopy | 0x0003 ),
+    Model_Yopy_3700     = ( Model_Yopy | 0x0004 ),
    Model_Beagle        = ( 6 << 16 ),
    Model_Beagle_All    = ( Model_Beagle | 0xffff ),
    Model_Beagle_PA100  = ( Model_Beagle | 0x0001 ),
    Model_GenuineIntel  = ( 7 << 16 ),
    Model_MyPal         = ( 8 << 16 ),
    Model_MyPal_All     = ( Model_MyPal | 0xffff ),
    Model_MyPal_620     = ( Model_MyPal | 0x0001 ),
    Model_MyPal_716     = ( Model_MyPal | 0x0002 ),
-    Model_MyPal_730     = ( Model_MyPal | 0x0003 ),
+    Model_MyPal_730     = ( Model_MyPal | 0x0004 ),
    Model_HTC           = ( 9 << 16 ),
    Model_HTC_All       = ( Model_HTC | 0xffff ),
    Model_HTC_Universal = ( Model_HTC | 0x0001 ),
    Model_HTC_Alpine    = ( Model_HTC | 0x0002 ),
-    Model_HTC_Apache    = ( Model_HTC | 0x0003 ),
+    Model_HTC_Apache    = ( Model_HTC | 0x0004 ),
-    Model_HTC_Beetles   = ( Model_HTC | 0x0004 ),
+    Model_HTC_Beetles   = ( Model_HTC | 0x0008 ),
-    Model_HTC_Blueangel = ( Model_HTC | 0x0005 ),
+    Model_HTC_Blueangel = ( Model_HTC | 0x0010 ),
-    Model_HTC_Himalaya  = ( Model_HTC | 0x0006 ),
+    Model_HTC_Himalaya  = ( Model_HTC | 0x0020 ),
-    Model_HTC_Magician  = ( Model_HTC | 0x0007 ),
+    Model_HTC_Magician  = ( Model_HTC | 0x0040 ),
+    Model_Motorola      = ( 2 << 17 ),
-    Model_Motorola      = ( 9 << 17 ),
    Model_Motorola_All  = ( Model_Motorola | 0xffff ),
    Model_Motorola_EZX  = ( Model_Motorola | 0x0001 ),
-    Model_Palm          = ( 10 << 16),
+    Model_Palm          = ( 1 << 17),
    Model_Palm_All      = ( Model_Palm | 0xffff ),
    Model_Palm_LD       = ( Model_Palm | 0x0001 ),
    Model_Palm_TX       = ( Model_Palm | 0x0002 ),
-    Model_Palm_Z72      = ( Model_Palm | 0x0003 ),
+    Model_Palm_Z72      = ( Model_Palm | 0x0004 ),
 };
 /**
 * The vendor of the device
 */
 enum OVendor {
    Vendor_Unknown,
    Vendor_HP,
    Vendor_Sharp,
    Vendor_SIEMENS,
    Vendor_MundN,
    Vendor_GMate,
    Vendor_MasterIA,
    Vendor_GenuineIntel,
    Vendor_Asus,
    Vendor_HTC,
    Vendor_Motorola,
    Vendor_Palm,
 };
 /**
 * The System used

diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h index 1eb5959..c6306e7 100644 --- a/libopie2/opiecore/device/odevice.h +++ b/libopie2/opiecore/device/odevice.h
@@ -42,128 +42,133 @@
42		42
43	#include <qstrlist.h>	43	#include <qstrlist.h>
44	#include <qwindowsystem_qws.h>	44	#include <qwindowsystem_qws.h>
45		45
46		46
47	class Sound;	47	class Sound;
48		48
49	namespace Opie{	49	namespace Opie{
50	namespace Core{	50	namespace Core{
51		51
52	class ODeviceData;	52	class ODeviceData;
53	/**	53	/**
54	* The available devices	54	* The available devices
55	*/	55	*/
56	enum OModel {	56	enum OModel {
57	Model_Unknown, // = 0	57	Model_Unknown, // = 0
58		58
59	Model_Series_Mask = 0xffff0000,	59	Model_Series_Mask = 0xffff0000,
60		60
61	Model_iPAQ = ( 1 << 16 ),	61	Model_iPAQ = ( 1 << 16 ),
62		62
63	Model_iPAQ_All = ( Model_iPAQ \| 0xffff ),	63	Model_iPAQ_All = ( Model_iPAQ \| 0xffff ),
64	Model_iPAQ_H31xx = ( Model_iPAQ \| 0x0001 ),	64	Model_iPAQ_H31xx = ( Model_iPAQ \| 0x0001 ),
65	Model_iPAQ_H36xx = ( Model_iPAQ \| 0x0002 ),	65	Model_iPAQ_H36xx = ( Model_iPAQ \| 0x0002 ),
66	Model_iPAQ_H37xx = ( Model_iPAQ \| 0x0003 ),	66	Model_iPAQ_H37xx = ( Model_iPAQ \| 0x0004 ),
67	Model_iPAQ_H38xx = ( Model_iPAQ \| 0x0004 ),	67	Model_iPAQ_H38xx = ( Model_iPAQ \| 0x0008 ),
68	Model_iPAQ_H39xx = ( Model_iPAQ \| 0x0005 ),	68	Model_iPAQ_H39xx = ( Model_iPAQ \| 0x0010 ),
69	Model_iPAQ_H5xxx = ( Model_iPAQ \| 0x0006 ),	69	Model_iPAQ_H5xxx = ( Model_iPAQ \| 0x0020 ),
70	Model_iPAQ_H22xx = ( Model_iPAQ \| 0x0007 ),	70	Model_iPAQ_H22xx = ( Model_iPAQ \| 0x0040 ),
71	Model_iPAQ_H191x = ( Model_iPAQ \| 0x0008 ),	71	Model_iPAQ_H191x = ( Model_iPAQ \| 0x0080 ),
72	Model_iPAQ_H1940 = ( Model_iPAQ \| 0x0009 ),	72	Model_iPAQ_H1940 = ( Model_iPAQ \| 0x0100 ),
73	Model_iPAQ_HX4700 = ( Model_iPAQ \| 0x000A ),	73	Model_iPAQ_HX4700 = ( Model_iPAQ \| 0x0200 ),
74	Model_iPAQ_H4xxx = ( Model_iPAQ \| 0x000b ),	74	Model_iPAQ_H4xxx = ( Model_iPAQ \| 0x0400 ),
75	Model_Jornada = ( 6 << 16 ),	75
		76	Model_Jornada = ( 3 << 17 ),
		77
76	Model_Jornada_56x = ( Model_Jornada \| 0x0001 ),	78	Model_Jornada_56x = ( Model_Jornada \| 0x0001 ),
77	Model_Jornada_720 = ( Model_Jornada \| 0x0002 ),	79	Model_Jornada_720 = ( Model_Jornada \| 0x0002 ),
78	Model_Jornada_820 = ( Model_Jornada \| 0x0003 ),	80	Model_Jornada_820 = ( Model_Jornada \| 0x0004 ),
79		81
80	Model_Zaurus = ( 2 << 16 ),	82	Model_Zaurus = ( 2 << 16 ),
81		83
82	Model_Zaurus_SL5000 = ( Model_Zaurus \| 0x0001 ),	84	Model_Zaurus_SL5000 = ( Model_Zaurus \| 0x0001 ),
83	Model_Zaurus_SL5500 = ( Model_Zaurus \| 0x0002 ),	85	Model_Zaurus_SL5500 = ( Model_Zaurus \| 0x0002 ),
84	Model_Zaurus_SLA300 = ( Model_Zaurus \| 0x0003 ),	86	Model_Zaurus_SLA300 = ( Model_Zaurus \| 0x0004 ),
85	Model_Zaurus_SLB600 = ( Model_Zaurus \| 0x0004 ),	87	Model_Zaurus_SLB600 = ( Model_Zaurus \| 0x0008 ),
86	Model_Zaurus_SLC7x0 = ( Model_Zaurus \| 0x0005 ),	88	Model_Zaurus_SLC7x0 = ( Model_Zaurus \| 0x0010 ),
87	Model_Zaurus_SL6000 = ( Model_Zaurus \| 0x0006 ),	89	Model_Zaurus_SL6000 = ( Model_Zaurus \| 0x0020 ),
88	Model_Zaurus_SLC3000 = ( Model_Zaurus \| 0x0007 ),	90	Model_Zaurus_SLC3000 = ( Model_Zaurus \| 0x0040 ),
89	Model_Zaurus_SLC1000 = ( Model_Zaurus \| 0x0008 ),	91	Model_Zaurus_SLC1000 = ( Model_Zaurus \| 0x0080 ),
90	Model_Zaurus_SLC3100 = ( Model_Zaurus \| 0x0009 ),	92	Model_Zaurus_SLC3100 = ( Model_Zaurus \| 0x0100 ),
91		93
92	Model_SIMpad = ( 3 << 16 ),	94	Model_SIMpad = ( 3 << 16 ),
93		95
94	Model_SIMpad_All = ( Model_SIMpad \| 0xffff ),	96	Model_SIMpad_All = ( Model_SIMpad \| 0xffff ),
95	Model_SIMpad_CL4 = ( Model_SIMpad \| 0x0001 ),	97	Model_SIMpad_CL4 = ( Model_SIMpad \| 0x0001 ),
96	Model_SIMpad_SL4 = ( Model_SIMpad \| 0x0002 ),	98	Model_SIMpad_SL4 = ( Model_SIMpad \| 0x0002 ),
97	Model_SIMpad_SLC = ( Model_SIMpad \| 0x0003 ),	99	Model_SIMpad_SLC = ( Model_SIMpad \| 0x0004 ),
98	Model_SIMpad_TSinus = ( Model_SIMpad \| 0x0004 ),	100	Model_SIMpad_TSinus = ( Model_SIMpad \| 0x0008 ),
99		101
100	Model_Ramses = ( 4 << 16 ),	102	Model_Ramses = ( 4 << 16 ),
101		103
102	Model_Ramses_All = ( Model_Ramses \| 0xffff ),	104	Model_Ramses_All = ( Model_Ramses \| 0xffff ),
103	Model_Ramses_MNCI = ( Model_Ramses \| 0x0001 ),	105	Model_Ramses_MNCI = ( Model_Ramses \| 0x0001 ),
104	Model_Ramses_MNCIRX = ( Model_Ramses \| 0x0002 ),	106	Model_Ramses_MNCIRX = ( Model_Ramses \| 0x0002 ),
105		107
106	Model_Yopy = ( 5 << 16 ),	108	Model_Yopy = ( 5 << 16 ),
107		109
108	Model_Yopy_All = ( Model_Yopy \| 0xffff ),	110	Model_Yopy_All = ( Model_Yopy \| 0xffff ),
109	Model_Yopy_3000 = ( Model_Yopy \| 0x0001 ),	111	Model_Yopy_3000 = ( Model_Yopy \| 0x0001 ),
110	Model_Yopy_3500 = ( Model_Yopy \| 0x0002 ),	112	Model_Yopy_3500 = ( Model_Yopy \| 0x0002 ),
111	Model_Yopy_3700 = ( Model_Yopy \| 0x0003 ),	113	Model_Yopy_3700 = ( Model_Yopy \| 0x0004 ),
112		114
113	Model_Beagle = ( 6 << 16 ),	115	Model_Beagle = ( 6 << 16 ),
114		116
115	Model_Beagle_All = ( Model_Beagle \| 0xffff ),	117	Model_Beagle_All = ( Model_Beagle \| 0xffff ),
116	Model_Beagle_PA100 = ( Model_Beagle \| 0x0001 ),	118	Model_Beagle_PA100 = ( Model_Beagle \| 0x0001 ),
117		119
118	Model_GenuineIntel = ( 7 << 16 ),	120	Model_GenuineIntel = ( 7 << 16 ),
119		121
120	Model_MyPal = ( 8 << 16 ),	122	Model_MyPal = ( 8 << 16 ),
121		123
122	Model_MyPal_All = ( Model_MyPal \| 0xffff ),	124	Model_MyPal_All = ( Model_MyPal \| 0xffff ),
123	Model_MyPal_620 = ( Model_MyPal \| 0x0001 ),	125	Model_MyPal_620 = ( Model_MyPal \| 0x0001 ),
124	Model_MyPal_716 = ( Model_MyPal \| 0x0002 ),	126	Model_MyPal_716 = ( Model_MyPal \| 0x0002 ),
125	Model_MyPal_730 = ( Model_MyPal \| 0x0003 ),	127	Model_MyPal_730 = ( Model_MyPal \| 0x0004 ),
126		128
127	Model_HTC = ( 9 << 16 ),	129	Model_HTC = ( 9 << 16 ),
		130
128	Model_HTC_All = ( Model_HTC \| 0xffff ),	131	Model_HTC_All = ( Model_HTC \| 0xffff ),
129	Model_HTC_Universal = ( Model_HTC \| 0x0001 ),	132	Model_HTC_Universal = ( Model_HTC \| 0x0001 ),
130	Model_HTC_Alpine = ( Model_HTC \| 0x0002 ),	133	Model_HTC_Alpine = ( Model_HTC \| 0x0002 ),
131	Model_HTC_Apache = ( Model_HTC \| 0x0003 ),	134	Model_HTC_Apache = ( Model_HTC \| 0x0004 ),
132	Model_HTC_Beetles = ( Model_HTC \| 0x0004 ),	135	Model_HTC_Beetles = ( Model_HTC \| 0x0008 ),
133	Model_HTC_Blueangel = ( Model_HTC \| 0x0005 ),	136	Model_HTC_Blueangel = ( Model_HTC \| 0x0010 ),
134	Model_HTC_Himalaya = ( Model_HTC \| 0x0006 ),	137	Model_HTC_Himalaya = ( Model_HTC \| 0x0020 ),
135	Model_HTC_Magician = ( Model_HTC \| 0x0007 ),	138	Model_HTC_Magician = ( Model_HTC \| 0x0040 ),
		139
		140	Model_Motorola = ( 2 << 17 ),
136		141
137	Model_Motorola = ( 9 << 17 ),
138	Model_Motorola_All = ( Model_Motorola \| 0xffff ),	142	Model_Motorola_All = ( Model_Motorola \| 0xffff ),
139	Model_Motorola_EZX = ( Model_Motorola \| 0x0001 ),	143	Model_Motorola_EZX = ( Model_Motorola \| 0x0001 ),
140		144
141	Model_Palm = ( 10 << 16),	145	Model_Palm = ( 1 << 17),
		146
142	Model_Palm_All = ( Model_Palm \| 0xffff ),	147	Model_Palm_All = ( Model_Palm \| 0xffff ),
143	Model_Palm_LD = ( Model_Palm \| 0x0001 ),	148	Model_Palm_LD = ( Model_Palm \| 0x0001 ),
144	Model_Palm_TX = ( Model_Palm \| 0x0002 ),	149	Model_Palm_TX = ( Model_Palm \| 0x0002 ),
145	Model_Palm_Z72 = ( Model_Palm \| 0x0003 ),	150	Model_Palm_Z72 = ( Model_Palm \| 0x0004 ),
146		151
147	};	152	};
148		153
149	/**	154	/**
150	* The vendor of the device	155	* The vendor of the device
151	*/	156	*/
152	enum OVendor {	157	enum OVendor {
153	Vendor_Unknown,	158	Vendor_Unknown,
154		159
155	Vendor_HP,	160	Vendor_HP,
156	Vendor_Sharp,	161	Vendor_Sharp,
157	Vendor_SIEMENS,	162	Vendor_SIEMENS,
158	Vendor_MundN,	163	Vendor_MundN,
159	Vendor_GMate,	164	Vendor_GMate,
160	Vendor_MasterIA,	165	Vendor_MasterIA,
161	Vendor_GenuineIntel,	166	Vendor_GenuineIntel,
162	Vendor_Asus,	167	Vendor_Asus,
163	Vendor_HTC,	168	Vendor_HTC,
164	Vendor_Motorola,	169	Vendor_Motorola,
165	Vendor_Palm,	170	Vendor_Palm,
166	};	171	};
167		172
168	/**	173	/**
169	* The System used	174	* The System used