-rw-r--r-- | libopie/odevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp index d78277f..501b601 100644 --- a/libopie/odevice.cpp +++ b/libopie/odevice.cpp | |||
@@ -1094,129 +1094,129 @@ int iPAQ::readLightSensor ( ) | |||
1094 | char *endptr; | 1094 | char *endptr; |
1095 | 1095 | ||
1096 | buffer [4] = 0; | 1096 | buffer [4] = 0; |
1097 | val = ::strtol ( buffer + 2, &endptr, 16 ); | 1097 | val = ::strtol ( buffer + 2, &endptr, 16 ); |
1098 | 1098 | ||
1099 | if ( *endptr != 0 ) | 1099 | if ( *endptr != 0 ) |
1100 | val = -1; | 1100 | val = -1; |
1101 | } | 1101 | } |
1102 | ::close ( fd ); | 1102 | ::close ( fd ); |
1103 | } | 1103 | } |
1104 | 1104 | ||
1105 | return val; | 1105 | return val; |
1106 | } | 1106 | } |
1107 | 1107 | ||
1108 | int iPAQ::lightSensorResolution ( ) const | 1108 | int iPAQ::lightSensorResolution ( ) const |
1109 | { | 1109 | { |
1110 | return 256; | 1110 | return 256; |
1111 | } | 1111 | } |
1112 | 1112 | ||
1113 | /************************************************** | 1113 | /************************************************** |
1114 | * | 1114 | * |
1115 | * Zaurus | 1115 | * Zaurus |
1116 | * | 1116 | * |
1117 | **************************************************/ | 1117 | **************************************************/ |
1118 | 1118 | ||
1119 | 1119 | ||
1120 | 1120 | ||
1121 | void Zaurus::init ( ) | 1121 | void Zaurus::init ( ) |
1122 | { | 1122 | { |
1123 | d-> m_vendorstr = "Sharp"; | 1123 | d-> m_vendorstr = "Sharp"; |
1124 | d-> m_vendor = Vendor_Sharp; | 1124 | d-> m_vendor = Vendor_Sharp; |
1125 | 1125 | ||
1126 | QFile f ( "/proc/filesystems" ); | 1126 | QFile f ( "/proc/filesystems" ); |
1127 | QString model; | 1127 | QString model; |
1128 | 1128 | ||
1129 | if ( f. open ( IO_ReadOnly ) && ( QTextStream ( &f ). read ( ). find ( "\tjffs2\n" ) >= 0 )) { | 1129 | if ( f. open ( IO_ReadOnly ) && ( QTextStream ( &f ). read ( ). find ( "\tjffs2\n" ) >= 0 )) { |
1130 | d-> m_vendorstr = "OpenZaurus Team"; | 1130 | d-> m_vendorstr = "OpenZaurus Team"; |
1131 | d-> m_systemstr = "OpenZaurus"; | 1131 | d-> m_systemstr = "OpenZaurus"; |
1132 | d-> m_system = System_OpenZaurus; | 1132 | d-> m_system = System_OpenZaurus; |
1133 | 1133 | ||
1134 | f. close ( ); | 1134 | f. close ( ); |
1135 | 1135 | ||
1136 | f. setName ( "/etc/oz_version" ); | 1136 | f. setName ( "/etc/oz_version" ); |
1137 | if ( f. open ( IO_ReadOnly )) { | 1137 | if ( f. open ( IO_ReadOnly )) { |
1138 | QTextStream ts ( &f ); | 1138 | QTextStream ts ( &f ); |
1139 | d-> m_sysverstr = ts. readLine ( );//. mid ( 10 ); | 1139 | d-> m_sysverstr = ts. readLine ( );//. mid ( 10 ); |
1140 | f. close ( ); | 1140 | f. close ( ); |
1141 | } | 1141 | } |
1142 | } | 1142 | } |
1143 | else { | 1143 | else { |
1144 | d-> m_systemstr = "Zaurus"; | 1144 | d-> m_systemstr = "Zaurus"; |
1145 | d-> m_system = System_Zaurus; | 1145 | d-> m_system = System_Zaurus; |
1146 | } | 1146 | } |
1147 | 1147 | ||
1148 | f. setName ( "/proc/cpuinfo" ); | 1148 | f. setName ( "/proc/cpuinfo" ); |
1149 | if ( f. open ( IO_ReadOnly ) ) { | 1149 | if ( f. open ( IO_ReadOnly ) ) { |
1150 | QTextStream ts ( &f ); | 1150 | QTextStream ts ( &f ); |
1151 | QString line; | 1151 | QString line; |
1152 | while( line = ts. readLine ( ) ) { | 1152 | while( line = ts. readLine ( ) ) { |
1153 | if ( line. left ( 8 ) == "Hardware" ) | 1153 | if ( line. left ( 8 ) == "Hardware" ) |
1154 | break; | 1154 | break; |
1155 | } | 1155 | } |
1156 | int loc = line. find ( ":" ); | 1156 | int loc = line. find ( ":" ); |
1157 | if ( loc != -1 ) | 1157 | if ( loc != -1 ) |
1158 | model = line. mid ( loc + 2 ). simplifyWhitespace( ); | 1158 | model = line. mid ( loc + 2 ). simplifyWhiteSpace( ); |
1159 | } | 1159 | } |
1160 | 1160 | ||
1161 | if ( model == "SHARP Corgi" ) { | 1161 | if ( model == "SHARP Corgi" ) { |
1162 | d-> m_model = Model_Zaurus_SLC700; | 1162 | d-> m_model = Model_Zaurus_SLC700; |
1163 | d-> m_modelstr = "Zaurus SL-C700"; | 1163 | d-> m_modelstr = "Zaurus SL-C700"; |
1164 | } else if ( model == "SHARP Poodle" ) { | 1164 | } else if ( model == "SHARP Poodle" ) { |
1165 | d-> m_model = Model_Zaurus_SLB600; | 1165 | d-> m_model = Model_Zaurus_SLB600; |
1166 | d-> m_modelstr = "Zaurus SL-B500 or SL-5600"; | 1166 | d-> m_modelstr = "Zaurus SL-B500 or SL-5600"; |
1167 | } else if ( model = "Sharp-Collie" ) { | 1167 | } else if ( model = "Sharp-Collie" ) { |
1168 | d-> m_model = Model_Zaurus_SL5500; | 1168 | d-> m_model = Model_Zaurus_SL5500; |
1169 | d-> m_modelstr = "Zaurus SL-5500 or SL-5000d"; | 1169 | d-> m_modelstr = "Zaurus SL-5500 or SL-5000d"; |
1170 | } else { | 1170 | } else { |
1171 | d-> m_model = Model_Zaurus_SL5500; | 1171 | d-> m_model = Model_Zaurus_SL5500; |
1172 | d-> m_modelstr = "Zaurus (Model unknown)"; | 1172 | d-> m_modelstr = "Zaurus (Model unknown)"; |
1173 | } | 1173 | } |
1174 | 1174 | ||
1175 | bool flipstate = false; | 1175 | bool flipstate = false; |
1176 | switch ( d-> m_model ) { | 1176 | switch ( d-> m_model ) { |
1177 | case Model_Zaurus_SLA300: | 1177 | case Model_Zaurus_SLA300: |
1178 | d-> m_rotation = Rot0; | 1178 | d-> m_rotation = Rot0; |
1179 | break; | 1179 | break; |
1180 | case Model_Zaurus_SLC700: | 1180 | case Model_Zaurus_SLC700: |
1181 | // Note: need to 1) set flipstate based on physical screen orientation | 1181 | // Note: need to 1) set flipstate based on physical screen orientation |
1182 | // and 2) check to see if the user overrode the rotation direction | 1182 | // and 2) check to see if the user overrode the rotation direction |
1183 | // using appearance, and if so, remove that item from the Config to | 1183 | // using appearance, and if so, remove that item from the Config to |
1184 | // ensure the rotate applet flips us back to the previous state. | 1184 | // ensure the rotate applet flips us back to the previous state. |
1185 | if ( flipstate ) { | 1185 | if ( flipstate ) { |
1186 | // 480x640 | 1186 | // 480x640 |
1187 | d-> m_rotation = Rot0; | 1187 | d-> m_rotation = Rot0; |
1188 | d-> m_direction = CW; | 1188 | d-> m_direction = CW; |
1189 | } else { | 1189 | } else { |
1190 | // 640x480 | 1190 | // 640x480 |
1191 | d-> m_rotation = Rot270; | 1191 | d-> m_rotation = Rot270; |
1192 | d-> m_direction = CCW; | 1192 | d-> m_direction = CCW; |
1193 | } | 1193 | } |
1194 | break; | 1194 | break; |
1195 | case Model_Zaurus_SLB600: | 1195 | case Model_Zaurus_SLB600: |
1196 | case Model_Zaurus_SL5500: | 1196 | case Model_Zaurus_SL5500: |
1197 | case Model_Zaurus_SL5000: | 1197 | case Model_Zaurus_SL5000: |
1198 | default: | 1198 | default: |
1199 | d-> m_rotation = Rot270; | 1199 | d-> m_rotation = Rot270; |
1200 | break; | 1200 | break; |
1201 | } | 1201 | } |
1202 | m_leds [0] = Led_Off; | 1202 | m_leds [0] = Led_Off; |
1203 | } | 1203 | } |
1204 | 1204 | ||
1205 | void Zaurus::initButtons ( ) | 1205 | void Zaurus::initButtons ( ) |
1206 | { | 1206 | { |
1207 | if ( d-> m_buttons ) | 1207 | if ( d-> m_buttons ) |
1208 | return; | 1208 | return; |
1209 | 1209 | ||
1210 | d-> m_qwsserver = qApp ? ( qApp-> type ( ) == QApplication::GuiServer ) : false; | 1210 | d-> m_qwsserver = qApp ? ( qApp-> type ( ) == QApplication::GuiServer ) : false; |
1211 | 1211 | ||
1212 | d-> m_buttons = new QValueList <ODeviceButton>; | 1212 | d-> m_buttons = new QValueList <ODeviceButton>; |
1213 | 1213 | ||
1214 | struct z_button * pz_buttons; | 1214 | struct z_button * pz_buttons; |
1215 | int buttoncount; | 1215 | int buttoncount; |
1216 | switch ( d-> m_model ) { | 1216 | switch ( d-> m_model ) { |
1217 | case Model_Zaurus_SLC700: | 1217 | case Model_Zaurus_SLC700: |
1218 | pz_buttons = z_buttons_c700; | 1218 | pz_buttons = z_buttons_c700; |
1219 | buttoncount = ARRAY_SIZE(z_buttons_c700); | 1219 | buttoncount = ARRAY_SIZE(z_buttons_c700); |
1220 | break; | 1220 | break; |
1221 | default: | 1221 | default: |
1222 | pz_buttons = z_buttons; | 1222 | pz_buttons = z_buttons; |