summaryrefslogtreecommitdiff
authorerik <erik>2007-02-09 17:47:29 (UTC)
committer erik <erik>2007-02-09 17:47:29 (UTC)
commitb3cde0d17f52f996c04a55de90583ca60a7e0210 (patch) (unidiff)
treed088372023f1031c9ae7a37e66c42c6d8c4e3d25
parent98353ac16bb90ee4b5df18945acf4fa7f05f9a85 (diff)
downloadopie-b3cde0d17f52f996c04a55de90583ca60a7e0210.zip
opie-b3cde0d17f52f996c04a55de90583ca60a7e0210.tar.gz
opie-b3cde0d17f52f996c04a55de90583ca60a7e0210.tar.bz2
This commit makes all supported models bit unique from each other within
their respective families. It also makes the model families bit unique with each other. This patch makes button (and general device features) not overlap. This fixes Opie bug 1836. Thanks goes out to Paul E. (aka BlueLightning) for originally reporting this problem and providing the text for a reasonable near-term solution. On top of all that, Paul even test the patch that this commit is based on, confirming that it was a reasonable solution. For those of you out there who support distros for the other model families, please be careful. And note that we have not tested on any of model family but iPAQs. We don't anticipate any problems, but be careful out there.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice.h65
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
@@ -64,17 +64,19 @@ enum OModel {
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 ),
@@ -82,11 +84,11 @@ enum OModel {
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 ),
@@ -95,6 +97,6 @@ enum OModel {
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 ),
@@ -109,5 +111,5 @@ enum OModel {
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 ),
@@ -123,25 +125,28 @@ enum OModel {
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};