1 files changed, 50 insertions, 43 deletions
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h
index 05bb167..76cf97d 100644
--- a/libopie2/opiecore/device/odevice.h
+++ b/libopie2/opiecore/device/odevice.h
@@ -56,63 +56,69 @@ class ODeviceData;
 enum OModel {
    Model_Unknown, // = 0
-    Model_Series_Mask   = 0xff000000,
+    Model_Series_Mask   = 0xffff0000,
-    Model_iPAQ          = ( 1 << 24 ),
+    Model_iPAQ          = ( 1 << 16 ),
-    Model_iPAQ_All      = ( Model_iPAQ | 0xffffff ),
+    Model_iPAQ_All      = ( Model_iPAQ | 0xffff ),
-    Model_iPAQ_H31xx    = ( Model_iPAQ | 0x000001 ),
+    Model_iPAQ_H31xx    = ( Model_iPAQ | 0x0001 ),
-    Model_iPAQ_H36xx    = ( Model_iPAQ | 0x000002 ),
+    Model_iPAQ_H36xx    = ( Model_iPAQ | 0x0002 ),
-    Model_iPAQ_H37xx    = ( Model_iPAQ | 0x000004 ),
+    Model_iPAQ_H37xx    = ( Model_iPAQ | 0x0003 ),
-    Model_iPAQ_H38xx    = ( Model_iPAQ | 0x000008 ),
+    Model_iPAQ_H38xx    = ( Model_iPAQ | 0x0004 ),
-    Model_iPAQ_H39xx    = ( Model_iPAQ | 0x000010 ),
+    Model_iPAQ_H39xx    = ( Model_iPAQ | 0x0005 ),
-    Model_iPAQ_H5xxx    = ( Model_iPAQ | 0x000020 ),
+    Model_iPAQ_H5xxx    = ( Model_iPAQ | 0x0006 ),
-    Model_iPAQ_H22xx    = ( Model_iPAQ | 0x000040 ),
+    Model_iPAQ_H22xx    = ( Model_iPAQ | 0x0007 ),
-    Model_iPAQ_H191x    = ( Model_iPAQ | 0x000080 ),
+    Model_iPAQ_H191x    = ( Model_iPAQ | 0x0008 ),
-    Model_Jornada       = ( 6 << 24 ),
+    Model_Jornada       = ( 6 << 16 ),
-    Model_Jornada_56x   = ( Model_Jornada | 0x000001 ),
+    Model_Jornada_56x   = ( Model_Jornada | 0x0001 ),
-    Model_Jornada_720   = ( Model_Jornada | 0x000002 ),
+    Model_Jornada_720   = ( Model_Jornada | 0x0002 ),
-    Model_Zaurus        = ( 2 << 24 ),
+    Model_Zaurus        = ( 2 << 16 ),
-    Model_Zaurus_SL5000 = ( Model_Zaurus | 0x000001 ),
+    Model_Zaurus_SL5000 = ( Model_Zaurus | 0x0001 ),
-    Model_Zaurus_SL5500 = ( Model_Zaurus | 0x000002 ),
+    Model_Zaurus_SL5500 = ( Model_Zaurus | 0x0002 ),
-    Model_Zaurus_SLA300 = ( Model_Zaurus | 0x000003 ),
+    Model_Zaurus_SLA300 = ( Model_Zaurus | 0x0003 ),
-    Model_Zaurus_SLB600 = ( Model_Zaurus | 0x000004 ),
+    Model_Zaurus_SLB600 = ( Model_Zaurus | 0x0004 ),
-    Model_Zaurus_SLC7x0 = ( Model_Zaurus | 0x000005 ),
+    Model_Zaurus_SLC7x0 = ( Model_Zaurus | 0x0005 ),
-    Model_Zaurus_SL6000 = ( Model_Zaurus | 0x000006 ),
+    Model_Zaurus_SL6000 = ( Model_Zaurus | 0x0006 ),
-    Model_Zaurus_SLC3000 = ( Model_Zaurus | 0x000007 ),
+    Model_Zaurus_SLC3000 = ( Model_Zaurus | 0x0007 ),
-    Model_Zaurus_SLC1000 = ( Model_Zaurus | 0x000008 ),
+    Model_Zaurus_SLC1000 = ( Model_Zaurus | 0x0008 ),
-    Model_SIMpad        = ( 3 << 24 ),
+    Model_SIMpad        = ( 3 << 16 ),
-    Model_SIMpad_All    = ( Model_SIMpad | 0xffffff ),
+    Model_SIMpad_All    = ( Model_SIMpad | 0xffff ),
-    Model_SIMpad_CL4    = ( Model_SIMpad | 0x000001 ),
+    Model_SIMpad_CL4    = ( Model_SIMpad | 0x0001 ),
-    Model_SIMpad_SL4    = ( Model_SIMpad | 0x000002 ),
+    Model_SIMpad_SL4    = ( Model_SIMpad | 0x0002 ),
-    Model_SIMpad_SLC    = ( Model_SIMpad | 0x000004 ),
+    Model_SIMpad_SLC    = ( Model_SIMpad | 0x0003 ),
-    Model_SIMpad_TSinus = ( Model_SIMpad | 0x000008 ),
+    Model_SIMpad_TSinus = ( Model_SIMpad | 0x0004 ),
-    Model_Ramses        = ( 4 << 24 ),
+    Model_Ramses        = ( 4 << 16 ),
-    Model_Ramses_All    = ( Model_Ramses | 0xffffff ),
+    Model_Ramses_All    = ( Model_Ramses | 0xffff ),
-    Model_Ramses_MNCI   = ( Model_Ramses | 0x000001 ),
+    Model_Ramses_MNCI   = ( Model_Ramses | 0x0001 ),
-    Model_Ramses_MNCIRX = ( Model_Ramses | 0x000002 ),
+    Model_Ramses_MNCIRX = ( Model_Ramses | 0x0002 ),
-    Model_Yopy          = ( 5 << 24 ),
+    Model_Yopy          = ( 5 << 16 ),
-    Model_Yopy_All      = ( Model_Yopy | 0xffffff ),
+    Model_Yopy_All      = ( Model_Yopy | 0xffff ),
-    Model_Yopy_3000     = ( Model_Yopy | 0x000001 ),
+    Model_Yopy_3000     = ( Model_Yopy | 0x0001 ),
-    Model_Yopy_3500     = ( Model_Yopy | 0x000002 ),
+    Model_Yopy_3500     = ( Model_Yopy | 0x0002 ),
-    Model_Yopy_3700     = ( Model_Yopy | 0x000003 ),
+    Model_Yopy_3700     = ( Model_Yopy | 0x0003 ),
-    Model_Beagle        = ( 6 << 24 ),
+    Model_Beagle        = ( 6 << 16 ),
-    Model_Beagle_All    = ( Model_Beagle | 0xffffff ),
+    Model_Beagle_All    = ( Model_Beagle | 0xffff ),
-    Model_Beagle_PA100  = ( Model_Beagle | 0x000001 ),
+    Model_Beagle_PA100  = ( Model_Beagle | 0x0001 ),
-    Model_GenuineIntel  = ( 7 << 24 )
+    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 )
 };
 /**
@@ -127,7 +133,8 @@ enum OVendor {
    Vendor_MundN,
    Vendor_GMate,
    Vendor_MasterIA,
-    Vendor_GenuineIntel
+    Vendor_GenuineIntel,
+    Vendor_Asus
 };
 /**

diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h index 05bb167..76cf97d 100644 --- a/libopie2/opiecore/device/odevice.h +++ b/libopie2/opiecore/device/odevice.h
@@ -56,63 +56,69 @@ class ODeviceData;
56	enum OModel {	56	enum OModel {
57	Model_Unknown, // = 0	57	Model_Unknown, // = 0
58		58
59	Model_Series_Mask = 0xff000000,	59	Model_Series_Mask = 0xffff0000,
60		60
61	Model_iPAQ = ( 1 << 24 ),	61	Model_iPAQ = ( 1 << 16 ),
62		62
63	Model_iPAQ_All = ( Model_iPAQ \| 0xffffff ),	63	Model_iPAQ_All = ( Model_iPAQ \| 0xffff ),
64	Model_iPAQ_H31xx = ( Model_iPAQ \| 0x000001 ),	64	Model_iPAQ_H31xx = ( Model_iPAQ \| 0x0001 ),
65	Model_iPAQ_H36xx = ( Model_iPAQ \| 0x000002 ),	65	Model_iPAQ_H36xx = ( Model_iPAQ \| 0x0002 ),
66	Model_iPAQ_H37xx = ( Model_iPAQ \| 0x000004 ),	66	Model_iPAQ_H37xx = ( Model_iPAQ \| 0x0003 ),
67	Model_iPAQ_H38xx = ( Model_iPAQ \| 0x000008 ),	67	Model_iPAQ_H38xx = ( Model_iPAQ \| 0x0004 ),
68	Model_iPAQ_H39xx = ( Model_iPAQ \| 0x000010 ),	68	Model_iPAQ_H39xx = ( Model_iPAQ \| 0x0005 ),
69	Model_iPAQ_H5xxx = ( Model_iPAQ \| 0x000020 ),	69	Model_iPAQ_H5xxx = ( Model_iPAQ \| 0x0006 ),
70	Model_iPAQ_H22xx = ( Model_iPAQ \| 0x000040 ),	70	Model_iPAQ_H22xx = ( Model_iPAQ \| 0x0007 ),
71	Model_iPAQ_H191x = ( Model_iPAQ \| 0x000080 ),	71	Model_iPAQ_H191x = ( Model_iPAQ \| 0x0008 ),
72		72
73	Model_Jornada = ( 6 << 24 ),	73	Model_Jornada = ( 6 << 16 ),
74	Model_Jornada_56x = ( Model_Jornada \| 0x000001 ),	74	Model_Jornada_56x = ( Model_Jornada \| 0x0001 ),
75	Model_Jornada_720 = ( Model_Jornada \| 0x000002 ),	75	Model_Jornada_720 = ( Model_Jornada \| 0x0002 ),
76		76
77	Model_Zaurus = ( 2 << 24 ),	77	Model_Zaurus = ( 2 << 16 ),
78		78
79	Model_Zaurus_SL5000 = ( Model_Zaurus \| 0x000001 ),	79	Model_Zaurus_SL5000 = ( Model_Zaurus \| 0x0001 ),
80	Model_Zaurus_SL5500 = ( Model_Zaurus \| 0x000002 ),	80	Model_Zaurus_SL5500 = ( Model_Zaurus \| 0x0002 ),
81	Model_Zaurus_SLA300 = ( Model_Zaurus \| 0x000003 ),	81	Model_Zaurus_SLA300 = ( Model_Zaurus \| 0x0003 ),
82	Model_Zaurus_SLB600 = ( Model_Zaurus \| 0x000004 ),	82	Model_Zaurus_SLB600 = ( Model_Zaurus \| 0x0004 ),
83	Model_Zaurus_SLC7x0 = ( Model_Zaurus \| 0x000005 ),	83	Model_Zaurus_SLC7x0 = ( Model_Zaurus \| 0x0005 ),
84	Model_Zaurus_SL6000 = ( Model_Zaurus \| 0x000006 ),	84	Model_Zaurus_SL6000 = ( Model_Zaurus \| 0x0006 ),
85	Model_Zaurus_SLC3000 = ( Model_Zaurus \| 0x000007 ),	85	Model_Zaurus_SLC3000 = ( Model_Zaurus \| 0x0007 ),
86	Model_Zaurus_SLC1000 = ( Model_Zaurus \| 0x000008 ),	86	Model_Zaurus_SLC1000 = ( Model_Zaurus \| 0x0008 ),
87		87
88	Model_SIMpad = ( 3 << 24 ),	88	Model_SIMpad = ( 3 << 16 ),
89		89
90	Model_SIMpad_All = ( Model_SIMpad \| 0xffffff ),	90	Model_SIMpad_All = ( Model_SIMpad \| 0xffff ),
91	Model_SIMpad_CL4 = ( Model_SIMpad \| 0x000001 ),	91	Model_SIMpad_CL4 = ( Model_SIMpad \| 0x0001 ),
92	Model_SIMpad_SL4 = ( Model_SIMpad \| 0x000002 ),	92	Model_SIMpad_SL4 = ( Model_SIMpad \| 0x0002 ),
93	Model_SIMpad_SLC = ( Model_SIMpad \| 0x000004 ),	93	Model_SIMpad_SLC = ( Model_SIMpad \| 0x0003 ),
94	Model_SIMpad_TSinus = ( Model_SIMpad \| 0x000008 ),	94	Model_SIMpad_TSinus = ( Model_SIMpad \| 0x0004 ),
95		95
96	Model_Ramses = ( 4 << 24 ),	96	Model_Ramses = ( 4 << 16 ),
97		97
98	Model_Ramses_All = ( Model_Ramses \| 0xffffff ),	98	Model_Ramses_All = ( Model_Ramses \| 0xffff ),
99	Model_Ramses_MNCI = ( Model_Ramses \| 0x000001 ),	99	Model_Ramses_MNCI = ( Model_Ramses \| 0x0001 ),
100	Model_Ramses_MNCIRX = ( Model_Ramses \| 0x000002 ),	100	Model_Ramses_MNCIRX = ( Model_Ramses \| 0x0002 ),
101		101
102	Model_Yopy = ( 5 << 24 ),	102	Model_Yopy = ( 5 << 16 ),
103		103
104	Model_Yopy_All = ( Model_Yopy \| 0xffffff ),	104	Model_Yopy_All = ( Model_Yopy \| 0xffff ),
105	Model_Yopy_3000 = ( Model_Yopy \| 0x000001 ),	105	Model_Yopy_3000 = ( Model_Yopy \| 0x0001 ),
106	Model_Yopy_3500 = ( Model_Yopy \| 0x000002 ),	106	Model_Yopy_3500 = ( Model_Yopy \| 0x0002 ),
107	Model_Yopy_3700 = ( Model_Yopy \| 0x000003 ),	107	Model_Yopy_3700 = ( Model_Yopy \| 0x0003 ),
108		108
109	Model_Beagle = ( 6 << 24 ),	109	Model_Beagle = ( 6 << 16 ),
110		110
111	Model_Beagle_All = ( Model_Beagle \| 0xffffff ),	111	Model_Beagle_All = ( Model_Beagle \| 0xffff ),
112	Model_Beagle_PA100 = ( Model_Beagle \| 0x000001 ),	112	Model_Beagle_PA100 = ( Model_Beagle \| 0x0001 ),
113		113
114	Model_GenuineIntel = ( 7 << 24 )	114	Model_GenuineIntel = ( 7 << 16 ),
115		115
		116	Model_MyPal = ( 8 << 16 ),
		117
		118	Model_MyPal_All = ( Model_MyPal \| 0xffff ),
		119	Model_MyPal_620 = ( Model_MyPal \| 0x0001 ),
		120	Model_MyPal_716 = ( Model_MyPal \| 0x0002 ),
		121	Model_MyPal_730 = ( Model_MyPal \| 0x0003 )
116	};	122	};
117		123
118	/**	124	/**
@@ -127,7 +133,8 @@ enum OVendor {
127	Vendor_MundN,	133	Vendor_MundN,
128	Vendor_GMate,	134	Vendor_GMate,
129	Vendor_MasterIA,	135	Vendor_MasterIA,
130	Vendor_GenuineIntel	136	Vendor_GenuineIntel,
		137	Vendor_Asus
131	};	138	};
132		139
133	/**	140	/**