Merge lp:~ricmm/platform-api/v2-loader-first-take into lp:platform-api
- v2-loader-first-take
- Merge into trunk
Proposed by
Ricardo Mendoza
Status: | Superseded |
---|---|
Proposed branch: | lp:~ricmm/platform-api/v2-loader-first-take |
Merge into: | lp:platform-api |
Diff against target: |
3039 lines (+1239/-865) (has conflicts) 51 files modified
CMakeLists.txt (+12/-30) android/default/default_ubuntu_application_sensor.cpp (+109/-58) android/hybris/Android.mk (+24/-2) android/hybris/test_alarms_api.cpp (+62/-0) android/hybris/test_sensors_c_api.cpp (+8/-4) android/hybris/ubuntu_hardware_alarms_for_hybris.cpp (+197/-0) data/CMakeLists.txt (+6/-2) data/ubuntu-platform-hardware-api.pc.in (+10/-0) debian/control (+24/-45) debian/libplatform-api1-dev.install (+0/-4) debian/libplatform-api1-doc.doc-base (+0/-8) debian/libplatform-api1-doc.install (+0/-1) debian/libplatform-api1-hybris-tests.install (+0/-6) debian/libplatform-hardware-api1-dev.install (+1/-1) debian/libubuntu-application-api-mirclient1.install (+0/-1) debian/libubuntu-application-api-mirclient1.symbols (+0/-126) debian/libubuntu-application-api-mirserver1.install (+0/-1) debian/libubuntu-application-api-mirserver1.symbols (+0/-128) debian/libubuntu-application-api-test1.docs (+0/-1) debian/libubuntu-application-api-test1.install (+0/-1) debian/libubuntu-application-api1.install (+0/-1) debian/libubuntu-application-api1.symbols (+0/-130) debian/rules (+1/-4) doc/Doxyfile.in (+1/-1) include/ubuntu/application/sensors/accelerometer.h (+9/-6) include/ubuntu/application/sensors/event/accelerometer.h (+9/-6) include/ubuntu/application/sensors/event/light.h (+3/-2) include/ubuntu/application/sensors/light.h (+9/-6) include/ubuntu/application/sensors/proximity.h (+9/-6) include/ubuntu/application/sensors/ubuntu_application_sensors.h (+6/-3) include/ubuntu/hardware/CMakeLists.txt (+2/-1) include/ubuntu/hardware/alarm.h (+98/-0) src/ubuntu/CMakeLists.txt (+39/-22) src/ubuntu/common/CMakeLists.txt (+8/-0) src/ubuntu/common/mirclient/CMakeLists.txt (+10/-16) src/ubuntu/common/mirclient/ubuntu_application_api_mirclient.cpp (+9/-0) src/ubuntu/common/mircommon/CMakeLists.txt (+0/-14) src/ubuntu/common/mircommon/ubuntu_application_sensors_desktop.cpp (+119/-54) src/ubuntu/common/mirserver/CMakeLists.txt (+12/-19) src/ubuntu/common/mirserver/ubuntu_application_api_mirserver.cpp (+12/-3) src/ubuntu/desktop/CMakeLists.txt (+62/-0) src/ubuntu/testbackend/ubuntu_application_sensors.cpp (+119/-67) src/ubuntu/touch/CMakeLists.txt (+64/-0) src/ubuntu/touch/hybris/CMakeLists.txt (+15/-30) src/ubuntu/touch/hybris/bridge.h (+1/-17) src/ubuntu/touch/hybris/tests/CMakeLists.txt (+4/-4) src/ubuntu/touch/hybris/tests/test_alarms_api.cpp (+62/-0) src/ubuntu/touch/hybris/tests/test_sensors_api.cpp (+10/-4) src/ubuntu/touch/hybris/ubuntu_application_sensors_hybris.cpp (+13/-13) src/ubuntu/touch/hybris/ubuntu_platform_hardware_api.cpp (+35/-0) tests/test_ubuntu_application_sensors.cpp (+45/-17) Text conflict in src/ubuntu/common/mirserver/ubuntu_application_api_mirserver.cpp |
To merge this branch: | bzr merge lp:~ricmm/platform-api/v2-loader-first-take |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phablet Team | Pending | ||
Review via email: mp+218057@code.launchpad.net |
Commit message
V2 - loadable backend architecture
Description of the change
To post a comment you must log in.
Unmerged revisions
- 214. By Ricardo Mendoza
-
API/ABI bump to ver2
* Loadable backend architecture
* Global test separation
* Groundwork for platform hardware API v2 - 213. By Ricardo Mendoza
- 212. By Ricardo Mendoza
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'CMakeLists.txt' | |||
2 | --- CMakeLists.txt 2014-03-31 17:59:47 +0000 | |||
3 | +++ CMakeLists.txt 2014-05-02 12:23:55 +0000 | |||
4 | @@ -2,7 +2,7 @@ | |||
5 | 2 | 2 | ||
6 | 3 | project(ubuntu-platform-api) | 3 | project(ubuntu-platform-api) |
7 | 4 | 4 | ||
9 | 5 | set(UBUNTU_PLATFORM_API_VERSION_MAJOR 1) | 5 | set(UBUNTU_PLATFORM_API_VERSION_MAJOR 2) |
10 | 6 | set(UBUNTU_PLATFORM_API_VERSION_MINOR 0) | 6 | set(UBUNTU_PLATFORM_API_VERSION_MINOR 0) |
11 | 7 | set(UBUNTU_PLATFORM_API_VERSION_PATCH 0) | 7 | set(UBUNTU_PLATFORM_API_VERSION_PATCH 0) |
12 | 8 | 8 | ||
13 | @@ -57,37 +57,19 @@ | |||
14 | 57 | ON | 57 | ON |
15 | 58 | ) | 58 | ) |
16 | 59 | 59 | ||
46 | 60 | option( | 60 | find_package(PkgConfig) |
47 | 61 | ENABLE_MIRSERVER_IMPLEMENTATION | 61 | pkg_check_modules(MIRSERVER REQUIRED mirserver) |
48 | 62 | "Enable mirserver based platorm API implementation" | 62 | |
49 | 63 | OFF | 63 | find_package(PkgConfig) |
50 | 64 | ) | 64 | pkg_check_modules(MIRCLIENT REQUIRED mirclient) |
51 | 65 | 65 | ||
52 | 66 | if(ENABLE_MIRSERVER_IMPLEMENTATION) | 66 | find_package(Protobuf REQUIRED) |
53 | 67 | find_package(PkgConfig) | 67 | if(PROTOBUF_PROTOC_EXECUTABLE STREQUAL "PROTOBUF_PROTOC_EXECUTABLE-NOTFOUND") |
54 | 68 | pkg_check_modules(MIRSERVER REQUIRED mirserver) | 68 | message(SEND_ERROR "protoc executable not found! Missing protobuf-compiler package?") |
26 | 69 | endif(ENABLE_MIRSERVER_IMPLEMENTATION) | ||
27 | 70 | |||
28 | 71 | option( | ||
29 | 72 | ENABLE_MIRCLIENT_IMPLEMENTATION | ||
30 | 73 | "Enable mirclient based platform API implementation" | ||
31 | 74 | OFF | ||
32 | 75 | ) | ||
33 | 76 | |||
34 | 77 | if(ENABLE_MIRCLIENT_IMPLEMENTATION) | ||
35 | 78 | find_package(PkgConfig) | ||
36 | 79 | pkg_check_modules(MIRCLIENT REQUIRED mirclient) | ||
37 | 80 | |||
38 | 81 | find_package(Protobuf REQUIRED) | ||
39 | 82 | if(PROTOBUF_PROTOC_EXECUTABLE STREQUAL "PROTOBUF_PROTOC_EXECUTABLE-NOTFOUND") | ||
40 | 83 | message(SEND_ERROR "protoc executable not found! Missing protobuf-compiler package?") | ||
41 | 84 | endif() | ||
42 | 85 | endif(ENABLE_MIRCLIENT_IMPLEMENTATION) | ||
43 | 86 | |||
44 | 87 | if(ENABLE_MIRCLIENT_IMPLEMENTATION OR ENABLE_MIRSERVER_IMPLEMENTATION) | ||
45 | 88 | pkg_check_modules(MIRCOMMON REQUIRED mircommon) | ||
55 | 89 | endif() | 69 | endif() |
56 | 90 | 70 | ||
57 | 71 | pkg_check_modules(MIRCOMMON REQUIRED mircommon) | ||
58 | 72 | |||
59 | 91 | # Try to find hybris, and disable hybris from build if not found | 73 | # Try to find hybris, and disable hybris from build if not found |
60 | 92 | find_library(Hybris | 74 | find_library(Hybris |
61 | 93 | NAMES hybris-common | 75 | NAMES hybris-common |
62 | 94 | 76 | ||
63 | === modified file 'android/default/default_ubuntu_application_sensor.cpp' | |||
64 | --- android/default/default_ubuntu_application_sensor.cpp 2013-06-28 20:13:22 +0000 | |||
65 | +++ android/default/default_ubuntu_application_sensor.cpp 2014-05-02 12:23:55 +0000 | |||
66 | @@ -199,40 +199,49 @@ | |||
67 | 199 | return toHz(s->min_delay()); | 199 | return toHz(s->min_delay()); |
68 | 200 | } | 200 | } |
69 | 201 | 201 | ||
71 | 202 | float | 202 | UStatus |
72 | 203 | ua_sensors_proximity_get_min_value( | 203 | ua_sensors_proximity_get_min_value( |
74 | 204 | UASensorsProximity* sensor) | 204 | UASensorsProximity* sensor, |
75 | 205 | float* value) | ||
76 | 205 | { | 206 | { |
80 | 206 | if (sensor == NULL) | 207 | if (sensor == NULL || value == NULL) |
81 | 207 | return -1; | 208 | return U_STATUS_ERROR; |
82 | 208 | 209 | ||
83 | 209 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); | 210 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); |
84 | 210 | auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor); | 211 | auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor); |
86 | 211 | return s->min_value(); | 212 | *value = s->min_value(); |
87 | 213 | |||
88 | 214 | return U_STATUS_SUCCESS; | ||
89 | 212 | } | 215 | } |
90 | 213 | 216 | ||
92 | 214 | float | 217 | UStatus |
93 | 215 | ua_sensors_proximity_get_max_value( | 218 | ua_sensors_proximity_get_max_value( |
95 | 216 | UASensorsProximity* sensor) | 219 | UASensorsProximity* sensor, |
96 | 220 | float* value) | ||
97 | 217 | { | 221 | { |
100 | 218 | if (sensor == NULL) | 222 | if (sensor == NULL || value == NULL) |
101 | 219 | return -1; | 223 | return U_STATUS_ERROR; |
102 | 220 | 224 | ||
103 | 221 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); | 225 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); |
104 | 222 | auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor); | 226 | auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor); |
106 | 223 | return s->max_value(); | 227 | *value = s->max_value(); |
107 | 228 | |||
108 | 229 | return U_STATUS_SUCCESS; | ||
109 | 224 | } | 230 | } |
110 | 225 | 231 | ||
112 | 226 | float | 232 | UStatus |
113 | 227 | ua_sensors_proximity_get_resolution( | 233 | ua_sensors_proximity_get_resolution( |
115 | 228 | UASensorsProximity* sensor) | 234 | UASensorsProximity* sensor, |
116 | 235 | float* value) | ||
117 | 229 | { | 236 | { |
120 | 230 | if (sensor == NULL) | 237 | if (sensor == NULL || value == NULL) |
121 | 231 | return -1; | 238 | return U_STATUS_ERROR; |
122 | 232 | 239 | ||
123 | 233 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); | 240 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); |
124 | 234 | auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor); | 241 | auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor); |
126 | 235 | return s->resolution(); | 242 | *value = s->resolution(); |
127 | 243 | |||
128 | 244 | return U_STATUS_SUCCESS; | ||
129 | 236 | } | 245 | } |
130 | 237 | 246 | ||
131 | 238 | void | 247 | void |
132 | @@ -334,40 +343,49 @@ | |||
133 | 334 | return toHz(s->min_delay()); | 343 | return toHz(s->min_delay()); |
134 | 335 | } | 344 | } |
135 | 336 | 345 | ||
137 | 337 | float | 346 | UStatus |
138 | 338 | ua_sensors_light_get_min_value( | 347 | ua_sensors_light_get_min_value( |
140 | 339 | UASensorsLight* sensor) | 348 | UASensorsLight* sensor, |
141 | 349 | float* value) | ||
142 | 340 | { | 350 | { |
145 | 341 | if (sensor == NULL) | 351 | if (sensor == NULL || value == NULL) |
146 | 342 | return -1; | 352 | return U_STATUS_ERROR; |
147 | 343 | 353 | ||
148 | 344 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); | 354 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); |
149 | 345 | auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor); | 355 | auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor); |
151 | 346 | return s->min_value(); | 356 | *value = s->min_value(); |
152 | 357 | |||
153 | 358 | return U_STATUS_SUCCESS; | ||
154 | 347 | } | 359 | } |
155 | 348 | 360 | ||
157 | 349 | float | 361 | UStatus |
158 | 350 | ua_sensors_light_get_max_value( | 362 | ua_sensors_light_get_max_value( |
160 | 351 | UASensorsLight* sensor) | 363 | UASensorsLight* sensor, |
161 | 364 | float* value) | ||
162 | 352 | { | 365 | { |
165 | 353 | if (sensor == NULL) | 366 | if (sensor == NULL || value == NULL) |
166 | 354 | return -1; | 367 | return U_STATUS_ERROR; |
167 | 355 | 368 | ||
168 | 356 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); | 369 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); |
169 | 357 | auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor); | 370 | auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor); |
171 | 358 | return s->max_value(); | 371 | *value = s->max_value(); |
172 | 372 | |||
173 | 373 | return U_STATUS_SUCCESS; | ||
174 | 359 | } | 374 | } |
175 | 360 | 375 | ||
177 | 361 | float | 376 | UStatus |
178 | 362 | ua_sensors_light_get_resolution( | 377 | ua_sensors_light_get_resolution( |
180 | 363 | UASensorsLight* sensor) | 378 | UASensorsLight* sensor, |
181 | 379 | float* value) | ||
182 | 364 | { | 380 | { |
185 | 365 | if (sensor == NULL) | 381 | if (sensor == NULL || value == NULL) |
186 | 366 | return -1; | 382 | return U_STATUS_ERROR; |
187 | 367 | 383 | ||
188 | 368 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); | 384 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); |
189 | 369 | auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor); | 385 | auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor); |
191 | 370 | return s->resolution(); | 386 | *value = s->resolution(); |
192 | 387 | |||
193 | 388 | return U_STATUS_SUCCESS; | ||
194 | 371 | } | 389 | } |
195 | 372 | 390 | ||
196 | 373 | void | 391 | void |
197 | @@ -400,12 +418,18 @@ | |||
198 | 400 | return ev->value->get_timestamp(); | 418 | return ev->value->get_timestamp(); |
199 | 401 | } | 419 | } |
200 | 402 | 420 | ||
202 | 403 | float | 421 | UStatus |
203 | 404 | uas_light_event_get_light( | 422 | uas_light_event_get_light( |
205 | 405 | UASLightEvent* event) | 423 | UASLightEvent* event, |
206 | 424 | float* value) | ||
207 | 406 | { | 425 | { |
208 | 426 | if (event == NULL || value == NULL) | ||
209 | 427 | return U_STATUS_ERROR; | ||
210 | 428 | |||
211 | 407 | auto ev = static_cast<Holder<ubuntu::application::sensors::LightEvent::Ptr>*>(event); | 429 | auto ev = static_cast<Holder<ubuntu::application::sensors::LightEvent::Ptr>*>(event); |
213 | 408 | return ev->value->get_light(); | 430 | *value = ev->value->get_light(); |
214 | 431 | |||
215 | 432 | return U_STATUS_SUCCESS; | ||
216 | 409 | } | 433 | } |
217 | 410 | 434 | ||
218 | 411 | /* | 435 | /* |
219 | @@ -464,40 +488,49 @@ | |||
220 | 464 | return toHz(s->min_delay()); | 488 | return toHz(s->min_delay()); |
221 | 465 | } | 489 | } |
222 | 466 | 490 | ||
224 | 467 | float | 491 | UStatus |
225 | 468 | ua_sensors_accelerometer_get_min_value( | 492 | ua_sensors_accelerometer_get_min_value( |
227 | 469 | UASensorsAccelerometer* sensor) | 493 | UASensorsAccelerometer* sensor, |
228 | 494 | float* value) | ||
229 | 470 | { | 495 | { |
232 | 471 | if (sensor == NULL) | 496 | if (sensor == NULL || value == NULL) |
233 | 472 | return -1; | 497 | return U_STATUS_ERROR; |
234 | 473 | 498 | ||
235 | 474 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); | 499 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); |
236 | 475 | auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor); | 500 | auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor); |
238 | 476 | return s->min_value(); | 501 | *value = s->min_value(); |
239 | 502 | |||
240 | 503 | return U_STATUS_SUCCESS; | ||
241 | 477 | } | 504 | } |
242 | 478 | 505 | ||
244 | 479 | float | 506 | UStatus |
245 | 480 | ua_sensors_accelerometer_get_max_value( | 507 | ua_sensors_accelerometer_get_max_value( |
247 | 481 | UASensorsAccelerometer* sensor) | 508 | UASensorsAccelerometer* sensor, |
248 | 509 | float* value) | ||
249 | 482 | { | 510 | { |
252 | 483 | if (sensor == NULL) | 511 | if (sensor == NULL || value == NULL) |
253 | 484 | return -1; | 512 | return U_STATUS_ERROR; |
254 | 485 | 513 | ||
255 | 486 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); | 514 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); |
256 | 487 | auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor); | 515 | auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor); |
258 | 488 | return s->max_value(); | 516 | *value = s->max_value(); |
259 | 517 | |||
260 | 518 | return U_STATUS_SUCCESS; | ||
261 | 489 | } | 519 | } |
262 | 490 | 520 | ||
264 | 491 | float | 521 | UStatus |
265 | 492 | ua_sensors_accelerometer_get_resolution( | 522 | ua_sensors_accelerometer_get_resolution( |
267 | 493 | UASensorsAccelerometer* sensor) | 523 | UASensorsAccelerometer* sensor, |
268 | 524 | float* value) | ||
269 | 494 | { | 525 | { |
272 | 495 | if (sensor == NULL) | 526 | if (sensor == NULL || value == NULL) |
273 | 496 | return -1; | 527 | return U_STATUS_ERROR; |
274 | 497 | 528 | ||
275 | 498 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); | 529 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); |
276 | 499 | auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor); | 530 | auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor); |
278 | 500 | return s->resolution(); | 531 | *value = s->resolution(); |
279 | 532 | |||
280 | 533 | return U_STATUS_SUCCESS; | ||
281 | 501 | } | 534 | } |
282 | 502 | 535 | ||
283 | 503 | void | 536 | void |
284 | @@ -529,26 +562,44 @@ | |||
285 | 529 | return ev->value->get_timestamp(); | 562 | return ev->value->get_timestamp(); |
286 | 530 | } | 563 | } |
287 | 531 | 564 | ||
289 | 532 | float | 565 | UStatus |
290 | 533 | uas_accelerometer_event_get_acceleration_x( | 566 | uas_accelerometer_event_get_acceleration_x( |
292 | 534 | UASAccelerometerEvent* event) | 567 | UASAccelerometerEvent* event, |
293 | 568 | float* value) | ||
294 | 535 | { | 569 | { |
295 | 570 | if (event == NULL || value == NULL) | ||
296 | 571 | return U_STATUS_ERROR; | ||
297 | 572 | |||
298 | 536 | auto ev = static_cast<Holder<ubuntu::application::sensors::AccelerometerEvent::Ptr>*>(event); | 573 | auto ev = static_cast<Holder<ubuntu::application::sensors::AccelerometerEvent::Ptr>*>(event); |
300 | 537 | return ev->value->get_x(); | 574 | *value = ev->value->get_x(); |
301 | 575 | |||
302 | 576 | return U_STATUS_SUCCESS; | ||
303 | 538 | } | 577 | } |
304 | 539 | 578 | ||
306 | 540 | float | 579 | UStatus |
307 | 541 | uas_accelerometer_event_get_acceleration_y( | 580 | uas_accelerometer_event_get_acceleration_y( |
309 | 542 | UASAccelerometerEvent* event) | 581 | UASAccelerometerEvent* event, |
310 | 582 | float* value) | ||
311 | 543 | { | 583 | { |
312 | 584 | if (event == NULL || value == NULL) | ||
313 | 585 | return U_STATUS_ERROR; | ||
314 | 586 | |||
315 | 544 | auto ev = static_cast<Holder<ubuntu::application::sensors::AccelerometerEvent::Ptr>*>(event); | 587 | auto ev = static_cast<Holder<ubuntu::application::sensors::AccelerometerEvent::Ptr>*>(event); |
317 | 545 | return ev->value->get_y(); | 588 | *value = ev->value->get_y(); |
318 | 589 | |||
319 | 590 | return U_STATUS_SUCCESS; | ||
320 | 546 | } | 591 | } |
321 | 547 | 592 | ||
323 | 548 | float | 593 | UStatus |
324 | 549 | uas_accelerometer_event_get_acceleration_z( | 594 | uas_accelerometer_event_get_acceleration_z( |
326 | 550 | UASAccelerometerEvent* event) | 595 | UASAccelerometerEvent* event, |
327 | 596 | float* value) | ||
328 | 551 | { | 597 | { |
329 | 598 | if (event == NULL || value == NULL) | ||
330 | 599 | return U_STATUS_ERROR; | ||
331 | 600 | |||
332 | 552 | auto ev = static_cast<Holder<ubuntu::application::sensors::AccelerometerEvent::Ptr>*>(event); | 601 | auto ev = static_cast<Holder<ubuntu::application::sensors::AccelerometerEvent::Ptr>*>(event); |
334 | 553 | return ev->value->get_z(); | 602 | *value = ev->value->get_z(); |
335 | 603 | |||
336 | 604 | return U_STATUS_SUCCESS; | ||
337 | 554 | } | 605 | } |
338 | 555 | 606 | ||
339 | === modified file 'android/hybris/Android.mk' | |||
340 | --- android/hybris/Android.mk 2014-01-22 05:28:18 +0000 | |||
341 | +++ android/hybris/Android.mk 2014-05-02 12:23:55 +0000 | |||
342 | @@ -25,6 +25,7 @@ | |||
343 | 25 | ubuntu_application_api_for_hybris.cpp \ | 25 | ubuntu_application_api_for_hybris.cpp \ |
344 | 26 | ubuntu_application_gps_for_hybris.cpp \ | 26 | ubuntu_application_gps_for_hybris.cpp \ |
345 | 27 | ubuntu_application_sensors_for_hybris.cpp \ | 27 | ubuntu_application_sensors_for_hybris.cpp \ |
346 | 28 | ubuntu_hardware_alarms_for_hybris.cpp \ | ||
347 | 28 | ../default/default_ubuntu_application_sensor.cpp \ | 29 | ../default/default_ubuntu_application_sensor.cpp \ |
348 | 29 | ../default/default_ubuntu_application_ui.cpp \ | 30 | ../default/default_ubuntu_application_ui.cpp \ |
349 | 30 | ../default/default_ubuntu_application.cpp \ | 31 | ../default/default_ubuntu_application.cpp \ |
350 | @@ -65,8 +66,6 @@ | |||
351 | 65 | LOCAL_SHARED_LIBRARIES := \ | 66 | LOCAL_SHARED_LIBRARIES := \ |
352 | 66 | libandroidfw \ | 67 | libandroidfw \ |
353 | 67 | libutils \ | 68 | libutils \ |
354 | 68 | libEGL \ | ||
355 | 69 | libGLESv2 \ | ||
356 | 70 | libubuntu_application_api | 69 | libubuntu_application_api |
357 | 71 | 70 | ||
358 | 72 | include $(BUILD_EXECUTABLE) | 71 | include $(BUILD_EXECUTABLE) |
359 | @@ -211,6 +210,29 @@ | |||
360 | 211 | 210 | ||
361 | 212 | include $(CLEAR_VARS) | 211 | include $(CLEAR_VARS) |
362 | 213 | 212 | ||
363 | 213 | LOCAL_CFLAGS += -std=gnu++0x | ||
364 | 214 | |||
365 | 215 | LOCAL_C_INCLUDES := \ | ||
366 | 216 | $(UPAPI_PATH)/include \ | ||
367 | 217 | $(UPAPI_PATH)/android/include | ||
368 | 218 | |||
369 | 219 | LOCAL_SRC_FILES:= \ | ||
370 | 220 | test_alarms_api.cpp \ | ||
371 | 221 | |||
372 | 222 | LOCAL_MODULE:= direct_ubuntu_hardware_alarm_api_test | ||
373 | 223 | LOCAL_MODULE_TAGS := optional | ||
374 | 224 | |||
375 | 225 | LOCAL_SHARED_LIBRARIES := \ | ||
376 | 226 | libandroidfw \ | ||
377 | 227 | libutils \ | ||
378 | 228 | libEGL \ | ||
379 | 229 | libGLESv2 \ | ||
380 | 230 | libubuntu_application_api | ||
381 | 231 | |||
382 | 232 | include $(BUILD_EXECUTABLE) | ||
383 | 233 | |||
384 | 234 | include $(CLEAR_VARS) | ||
385 | 235 | |||
386 | 214 | LOCAL_CFLAGS += \ | 236 | LOCAL_CFLAGS += \ |
387 | 215 | -DANDROID_VERSION_MAJOR=$(ANDROID_VERSION_MAJOR) \ | 237 | -DANDROID_VERSION_MAJOR=$(ANDROID_VERSION_MAJOR) \ |
388 | 216 | -DANDROID_VERSION_MINOR=$(ANDROID_VERSION_MINOR) \ | 238 | -DANDROID_VERSION_MINOR=$(ANDROID_VERSION_MINOR) \ |
389 | 217 | 239 | ||
390 | === added file 'android/hybris/test_alarms_api.cpp' | |||
391 | --- android/hybris/test_alarms_api.cpp 1970-01-01 00:00:00 +0000 | |||
392 | +++ android/hybris/test_alarms_api.cpp 2014-05-02 12:23:55 +0000 | |||
393 | @@ -0,0 +1,62 @@ | |||
394 | 1 | /* | ||
395 | 2 | * Copyright © 2013 Canonical Ltd. | ||
396 | 3 | * | ||
397 | 4 | * This program is free software: you can redistribute it and/or modify | ||
398 | 5 | * it under the terms of the GNU General Public License version 3 as | ||
399 | 6 | * published by the Free Software Foundation. | ||
400 | 7 | * | ||
401 | 8 | * This program is distributed in the hope that it will be useful, | ||
402 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
403 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
404 | 11 | * GNU General Public License for more details. | ||
405 | 12 | * | ||
406 | 13 | * You should have received a copy of the GNU General Public License | ||
407 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
408 | 15 | * | ||
409 | 16 | * Authored by: Thomas Voß <thomas.voss@canonicalcom> | ||
410 | 17 | */ | ||
411 | 18 | |||
412 | 19 | #include <ubuntu/hardware/alarm.h> | ||
413 | 20 | |||
414 | 21 | #include <cstdio> | ||
415 | 22 | #include <ctime> | ||
416 | 23 | |||
417 | 24 | int main(int argc, char** argv) | ||
418 | 25 | { | ||
419 | 26 | UHardwareAlarm alarm = u_hardware_alarm_create(); | ||
420 | 27 | |||
421 | 28 | if (!alarm) | ||
422 | 29 | { | ||
423 | 30 | printf("Error creating handle to hardware alarms.\n"); | ||
424 | 31 | return 1; | ||
425 | 32 | } | ||
426 | 33 | |||
427 | 34 | // Alarm in two seconds. | ||
428 | 35 | timespec ts { 2, 0 }; | ||
429 | 36 | |||
430 | 37 | |||
431 | 38 | UStatus rc = u_hardware_alarm_set_relative_to_with_behavior( | ||
432 | 39 | alarm, | ||
433 | 40 | U_HARDWARE_ALARM_TIME_REFERENCE_NOW, | ||
434 | 41 | U_HARDWARE_ALARM_SLEEP_BEHAVIOR_WAKEUP_DEVICE, | ||
435 | 42 | &ts); | ||
436 | 43 | |||
437 | 44 | if (rc != U_STATUS_SUCCESS) | ||
438 | 45 | { | ||
439 | 46 | printf("Problem setting hardware alarm.\n"); | ||
440 | 47 | return 1; | ||
441 | 48 | } | ||
442 | 49 | |||
443 | 50 | UHardwareAlarmWaitResult wait_result; | ||
444 | 51 | rc = u_hardware_alarm_wait_for_next_alarm(alarm, &wait_result); | ||
445 | 52 | |||
446 | 53 | if (rc != U_STATUS_SUCCESS) | ||
447 | 54 | { | ||
448 | 55 | printf("Problem waiting for hardware alarm to go off.\n"); | ||
449 | 56 | return 1; | ||
450 | 57 | } | ||
451 | 58 | |||
452 | 59 | printf("Successfully created and waited for a hw alarm.\n"); | ||
453 | 60 | |||
454 | 61 | return 0; | ||
455 | 62 | } | ||
456 | 0 | 63 | ||
457 | === modified file 'android/hybris/test_sensors_c_api.cpp' | |||
458 | --- android/hybris/test_sensors_c_api.cpp 2013-05-30 02:03:42 +0000 | |||
459 | +++ android/hybris/test_sensors_c_api.cpp 2014-05-02 12:23:55 +0000 | |||
460 | @@ -27,10 +27,13 @@ | |||
461 | 27 | void on_new_accelerometer_event(UASAccelerometerEvent* event, void* context) | 27 | void on_new_accelerometer_event(UASAccelerometerEvent* event, void* context) |
462 | 28 | { | 28 | { |
463 | 29 | printf("%s \n", __PRETTY_FUNCTION__); | 29 | printf("%s \n", __PRETTY_FUNCTION__); |
464 | 30 | float x; uas_accelerometer_event_get_acceleration_x(event, &x); | ||
465 | 31 | float y; uas_accelerometer_event_get_acceleration_x(event, &y); | ||
466 | 32 | float z; uas_accelerometer_event_get_acceleration_x(event, &z); | ||
467 | 30 | printf("\ttime: %llu\n", uas_accelerometer_event_get_timestamp(event)); | 33 | printf("\ttime: %llu\n", uas_accelerometer_event_get_timestamp(event)); |
471 | 31 | printf("\tx: %f\n", uas_accelerometer_event_get_acceleration_x(event)); | 34 | printf("\tx: %f\n", x); |
472 | 32 | printf("\ty: %f\n", uas_accelerometer_event_get_acceleration_y(event)); | 35 | printf("\ty: %f\n", y); |
473 | 33 | printf("\tz: %f\n", uas_accelerometer_event_get_acceleration_z(event)); | 36 | printf("\tz: %f\n", z); |
474 | 34 | } | 37 | } |
475 | 35 | 38 | ||
476 | 36 | void on_new_proximity_event(UASProximityEvent* event, void* context) | 39 | void on_new_proximity_event(UASProximityEvent* event, void* context) |
477 | @@ -57,7 +60,8 @@ | |||
478 | 57 | { | 60 | { |
479 | 58 | printf("%s \n", __PRETTY_FUNCTION__); | 61 | printf("%s \n", __PRETTY_FUNCTION__); |
480 | 59 | printf("\ttime: %llu\n", uas_light_event_get_timestamp(event)); | 62 | printf("\ttime: %llu\n", uas_light_event_get_timestamp(event)); |
482 | 60 | printf("\tlight: %f\n", uas_light_event_get_light(event)); | 63 | float light; uas_light_event_get_light(event, &light); |
483 | 64 | printf("\tlight: %f\n", light); | ||
484 | 61 | } | 65 | } |
485 | 62 | 66 | ||
486 | 63 | int main(int argc, char** argv) | 67 | int main(int argc, char** argv) |
487 | 64 | 68 | ||
488 | === added file 'android/hybris/ubuntu_hardware_alarms_for_hybris.cpp' | |||
489 | --- android/hybris/ubuntu_hardware_alarms_for_hybris.cpp 1970-01-01 00:00:00 +0000 | |||
490 | +++ android/hybris/ubuntu_hardware_alarms_for_hybris.cpp 2014-05-02 12:23:55 +0000 | |||
491 | @@ -0,0 +1,197 @@ | |||
492 | 1 | /* | ||
493 | 2 | * Copyright © 2013 Canonical Ltd. | ||
494 | 3 | * | ||
495 | 4 | * This program is free software: you can redistribute it and/or modify | ||
496 | 5 | * it under the terms of the GNU Lesser General Public License version 3 as | ||
497 | 6 | * published by the Free Software Foundation. | ||
498 | 7 | * | ||
499 | 8 | * This program is distributed in the hope that it will be useful, | ||
500 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
501 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
502 | 11 | * GNU Lesser General Public License for more details. | ||
503 | 12 | * | ||
504 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
505 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
506 | 15 | * | ||
507 | 16 | * Authored by: Thomas Voß <thomas.voss@canonical.com> | ||
508 | 17 | */ | ||
509 | 18 | |||
510 | 19 | #include <ubuntu/hardware/alarm.h> | ||
511 | 20 | |||
512 | 21 | #include <cstdio> | ||
513 | 22 | #include <cstdlib> | ||
514 | 23 | #include <string.h> | ||
515 | 24 | |||
516 | 25 | #include <errno.h> | ||
517 | 26 | #include <fcntl.h> | ||
518 | 27 | |||
519 | 28 | #include <linux/ioctl.h> | ||
520 | 29 | #include <linux/android_alarm.h> | ||
521 | 30 | |||
522 | 31 | #include <utils/Log.h> | ||
523 | 32 | |||
524 | 33 | class UbuntuHardwareAlarm | ||
525 | 34 | { | ||
526 | 35 | public: | ||
527 | 36 | static UbuntuHardwareAlarm& instance() | ||
528 | 37 | { | ||
529 | 38 | static UbuntuHardwareAlarm ha; | ||
530 | 39 | return ha; | ||
531 | 40 | } | ||
532 | 41 | |||
533 | 42 | int wait_for() | ||
534 | 43 | { | ||
535 | 44 | int result{-1}; | ||
536 | 45 | |||
537 | 46 | do | ||
538 | 47 | { | ||
539 | 48 | result = ::ioctl(fd, ANDROID_ALARM_WAIT); | ||
540 | 49 | } while (result < 0 && errno == EINTR); | ||
541 | 50 | |||
542 | 51 | if (result < 0) | ||
543 | 52 | ALOGE("Waiting for hw alarm failed with: %s", strerror(errno)); | ||
544 | 53 | |||
545 | 54 | return result; | ||
546 | 55 | } | ||
547 | 56 | |||
548 | 57 | bool set(UHardwareAlarmTimeReference time_reference, | ||
549 | 58 | UHardwareAlarmSleepBehavior behavior, | ||
550 | 59 | const struct timespec *ts) | ||
551 | 60 | { | ||
552 | 61 | int type = 0; | ||
553 | 62 | |||
554 | 63 | if (time_reference == U_HARDWARE_ALARM_TIME_REFERENCE_NOW) | ||
555 | 64 | switch(behavior) | ||
556 | 65 | { | ||
557 | 66 | case U_HARDWARE_ALARM_SLEEP_BEHAVIOR_WAKEUP_DEVICE: | ||
558 | 67 | type = ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK; | ||
559 | 68 | break; | ||
560 | 69 | case U_HARDWARE_ALARM_SLEEP_BEHAVIOR_KEEP_DEVICE_ASLEEP: | ||
561 | 70 | type = ANDROID_ALARM_ELAPSED_REALTIME_MASK; | ||
562 | 71 | break; | ||
563 | 72 | } | ||
564 | 73 | else if (time_reference == U_HARDWARE_ALARM_TIME_REFERENCE_BOOT) | ||
565 | 74 | switch(behavior) | ||
566 | 75 | { | ||
567 | 76 | case U_HARDWARE_ALARM_SLEEP_BEHAVIOR_WAKEUP_DEVICE: | ||
568 | 77 | type = ANDROID_ALARM_RTC_WAKEUP_MASK; | ||
569 | 78 | break; | ||
570 | 79 | case U_HARDWARE_ALARM_SLEEP_BEHAVIOR_KEEP_DEVICE_ASLEEP: | ||
571 | 80 | type = ANDROID_ALARM_RTC_MASK; | ||
572 | 81 | break; | ||
573 | 82 | } | ||
574 | 83 | |||
575 | 84 | int result = ::ioctl(fd, ANDROID_ALARM_SET(type), ts); | ||
576 | 85 | |||
577 | 86 | if (result < 0) | ||
578 | 87 | ALOGE("Unable to set alarm: %s", strerror(errno)); | ||
579 | 88 | |||
580 | 89 | return not (result < 0); | ||
581 | 90 | } | ||
582 | 91 | |||
583 | 92 | bool is_valid() const | ||
584 | 93 | { | ||
585 | 94 | return valid; | ||
586 | 95 | } | ||
587 | 96 | |||
588 | 97 | private: | ||
589 | 98 | UbuntuHardwareAlarm() : fd(open("/dev/alarm", O_RDWR)), | ||
590 | 99 | valid(true) | ||
591 | 100 | { | ||
592 | 101 | if (fd == -1) | ||
593 | 102 | { | ||
594 | 103 | ALOGE("Could not open /dev/alarm: %s", strerror(errno)); | ||
595 | 104 | valid = false; | ||
596 | 105 | } | ||
597 | 106 | } | ||
598 | 107 | |||
599 | 108 | ~UbuntuHardwareAlarm() | ||
600 | 109 | { | ||
601 | 110 | // No need to check if fd is valid here. | ||
602 | 111 | // Ctor would have thrown if fd was invalid. | ||
603 | 112 | ::close(fd); | ||
604 | 113 | } | ||
605 | 114 | |||
606 | 115 | int fd; | ||
607 | 116 | bool valid; | ||
608 | 117 | }; | ||
609 | 118 | |||
610 | 119 | UHardwareAlarm | ||
611 | 120 | u_hardware_alarm_create() | ||
612 | 121 | { | ||
613 | 122 | auto result = &UbuntuHardwareAlarm::instance(); | ||
614 | 123 | |||
615 | 124 | if (result) | ||
616 | 125 | if (result->is_valid()) | ||
617 | 126 | return result; | ||
618 | 127 | |||
619 | 128 | return NULL; | ||
620 | 129 | } | ||
621 | 130 | |||
622 | 131 | void | ||
623 | 132 | u_hardware_alarm_ref( | ||
624 | 133 | UHardwareAlarm alarm) | ||
625 | 134 | { | ||
626 | 135 | // Considering a singleton pattern here, just voiding the argument. | ||
627 | 136 | (void) alarm; | ||
628 | 137 | } | ||
629 | 138 | |||
630 | 139 | void | ||
631 | 140 | u_hardware_alarm_unref( | ||
632 | 141 | UHardwareAlarm alarm) | ||
633 | 142 | { | ||
634 | 143 | // Considering a singleton pattern here, just voiding the argument. | ||
635 | 144 | (void) alarm; | ||
636 | 145 | } | ||
637 | 146 | |||
638 | 147 | UStatus | ||
639 | 148 | u_hardware_alarm_set_timezone( | ||
640 | 149 | UHardwareAlarm alarm, | ||
641 | 150 | const struct timezone *tz) | ||
642 | 151 | { | ||
643 | 152 | int result = settimeofday(NULL, tz); | ||
644 | 153 | |||
645 | 154 | if (result < 0) | ||
646 | 155 | return U_STATUS_ERROR; | ||
647 | 156 | |||
648 | 157 | return U_STATUS_SUCCESS; | ||
649 | 158 | } | ||
650 | 159 | |||
651 | 160 | UStatus | ||
652 | 161 | u_hardware_alarm_set_relative_to_with_behavior( | ||
653 | 162 | UHardwareAlarm alarm, | ||
654 | 163 | UHardwareAlarmTimeReference time_reference, | ||
655 | 164 | UHardwareAlarmSleepBehavior behavior, | ||
656 | 165 | const struct timespec *ts) | ||
657 | 166 | { | ||
658 | 167 | return alarm->set(time_reference, behavior, ts) ? | ||
659 | 168 | U_STATUS_SUCCESS : | ||
660 | 169 | U_STATUS_ERROR; | ||
661 | 170 | |||
662 | 171 | } | ||
663 | 172 | |||
664 | 173 | UStatus | ||
665 | 174 | u_hardware_alarm_wait_for_next_alarm( | ||
666 | 175 | UHardwareAlarm alarm, | ||
667 | 176 | UHardwareAlarmWaitResult *result) | ||
668 | 177 | { | ||
669 | 178 | int rc = alarm->wait_for(); | ||
670 | 179 | |||
671 | 180 | if (rc < 0) | ||
672 | 181 | return U_STATUS_ERROR; | ||
673 | 182 | |||
674 | 183 | if ((rc & ANDROID_ALARM_RTC_MASK) || | ||
675 | 184 | (rc & ANDROID_ALARM_RTC_WAKEUP_MASK)) | ||
676 | 185 | result->reference = U_HARDWARE_ALARM_TIME_REFERENCE_BOOT; | ||
677 | 186 | else if ((rc & ANDROID_ALARM_ELAPSED_REALTIME_MASK) || | ||
678 | 187 | (rc & ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK)) | ||
679 | 188 | result->reference = U_HARDWARE_ALARM_TIME_REFERENCE_NOW; | ||
680 | 189 | |||
681 | 190 | if ((rc & ANDROID_ALARM_RTC_WAKEUP_MASK) || | ||
682 | 191 | (rc & ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK)) | ||
683 | 192 | result->sleep_behavior = U_HARDWARE_ALARM_SLEEP_BEHAVIOR_WAKEUP_DEVICE; | ||
684 | 193 | else | ||
685 | 194 | result->sleep_behavior = U_HARDWARE_ALARM_SLEEP_BEHAVIOR_KEEP_DEVICE_ASLEEP; | ||
686 | 195 | |||
687 | 196 | return U_STATUS_SUCCESS; | ||
688 | 197 | } | ||
689 | 0 | 198 | ||
690 | === modified file 'data/CMakeLists.txt' | |||
691 | --- data/CMakeLists.txt 2013-06-13 12:04:14 +0000 | |||
692 | +++ data/CMakeLists.txt 2014-05-02 12:23:55 +0000 | |||
693 | @@ -2,7 +2,11 @@ | |||
694 | 2 | ubuntu-platform-api.pc.in ubuntu-platform-api.pc @ONLY | 2 | ubuntu-platform-api.pc.in ubuntu-platform-api.pc @ONLY |
695 | 3 | ) | 3 | ) |
696 | 4 | 4 | ||
697 | 5 | configure_file( | ||
698 | 6 | ubuntu-platform-hardware-api.pc.in ubuntu-platform-hardware-api.pc @ONLY | ||
699 | 7 | ) | ||
700 | 8 | |||
701 | 5 | install( | 9 | install( |
703 | 6 | FILES ${CMAKE_CURRENT_BINARY_DIR}/ubuntu-platform-api.pc | 10 | FILES ${CMAKE_CURRENT_BINARY_DIR}/ubuntu-platform-api.pc ${CMAKE_CURRENT_BINARY_DIR}/ubuntu-platform-hardware-api.pc |
704 | 7 | DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig | 11 | DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig |
705 | 8 | ) | ||
706 | 9 | \ No newline at end of file | 12 | \ No newline at end of file |
707 | 13 | ) | ||
708 | 10 | 14 | ||
709 | === added file 'data/ubuntu-platform-hardware-api.pc.in' | |||
710 | --- data/ubuntu-platform-hardware-api.pc.in 1970-01-01 00:00:00 +0000 | |||
711 | +++ data/ubuntu-platform-hardware-api.pc.in 2014-05-02 12:23:55 +0000 | |||
712 | @@ -0,0 +1,10 @@ | |||
713 | 1 | prefix=@CMAKE_INSTALL_PREFIX@ | ||
714 | 2 | exec_prefix=${prefix} | ||
715 | 3 | libdir=${prefix}/@LIB_INSTALL_DIR@ | ||
716 | 4 | includedir=${exec_prefix}/include | ||
717 | 5 | |||
718 | 6 | Name: ubuntu_platform_hardware_api | ||
719 | 7 | Description: Ubuntu's platform hardware abstraction layer. | ||
720 | 8 | Version: @UBUNTU_PLATFORM_API_VERSION_MAJOR@.@UBUNTU_PLATFORM_API_VERSION_MINOR@.@UBUNTU_PLATFORM_API_VERSION_PATCH@ | ||
721 | 9 | Libs: -L${libdir} -lubuntu_platform_hardware_api | ||
722 | 10 | Cflags: -I${includedir}/ubuntu | ||
723 | 0 | 11 | ||
724 | === modified file 'debian/control' | |||
725 | --- debian/control 2014-04-15 20:23:07 +0000 | |||
726 | +++ debian/control 2014-05-02 12:23:55 +0000 | |||
727 | @@ -7,8 +7,6 @@ | |||
728 | 7 | doxygen, | 7 | doxygen, |
729 | 8 | graphviz, | 8 | graphviz, |
730 | 9 | libgles2-mesa-dev, | 9 | libgles2-mesa-dev, |
731 | 10 | gcc-4.7, | ||
732 | 11 | g++-4.7, | ||
733 | 12 | libhybris-common-dev, | 10 | libhybris-common-dev, |
734 | 13 | pkg-config, | 11 | pkg-config, |
735 | 14 | libmirclient-dev (>= 0.1.8), | 12 | libmirclient-dev (>= 0.1.8), |
736 | @@ -55,7 +53,7 @@ | |||
737 | 55 | should build depend on the libplatform-hardware-api-dev package instead, which | 53 | should build depend on the libplatform-hardware-api-dev package instead, which |
738 | 56 | will pull this package as well. | 54 | will pull this package as well. |
739 | 57 | 55 | ||
741 | 58 | Package: libplatform-api1-dev | 56 | Package: libplatform-api-dev |
742 | 59 | Section: libdevel | 57 | Section: libdevel |
743 | 60 | Architecture: any | 58 | Architecture: any |
744 | 61 | Pre-Depends: ${misc:Pre-Depends}, | 59 | Pre-Depends: ${misc:Pre-Depends}, |
745 | @@ -63,36 +61,36 @@ | |||
746 | 63 | Depends: ${misc:Depends}, | 61 | Depends: ${misc:Depends}, |
747 | 64 | libgles2-mesa-dev, | 62 | libgles2-mesa-dev, |
748 | 65 | libplatform-api-headers (= ${binary:Version}), | 63 | libplatform-api-headers (= ${binary:Version}), |
752 | 66 | libubuntu-application-api1 | libplatform-api1, | 64 | libubuntu-application-api2, |
750 | 67 | libubuntu-application-api-mirserver1 (= ${binary:Version}), | ||
751 | 68 | libubuntu-application-api-mirclient1 (= ${binary:Version}), | ||
753 | 69 | ${misc:Depends}, | 65 | ${misc:Depends}, |
754 | 70 | Suggests: libplatform-api1-doc, | 66 | Suggests: libplatform-api1-doc, |
755 | 71 | Description: Platform API for system level capabilities (development) | 67 | Description: Platform API for system level capabilities (development) |
756 | 72 | This package provides the development library and headers (via | 68 | This package provides the development library and headers (via |
757 | 73 | dependency) for the Platform API. | 69 | dependency) for the Platform API. |
758 | 74 | 70 | ||
760 | 75 | Package: libubuntu-application-api-mirserver1 | 71 | Package: libubuntu-application-api-touch2 |
761 | 76 | Section: libs | 72 | Section: libs |
762 | 77 | Pre-Depends: ${misc:Pre-Depends}, | 73 | Pre-Depends: ${misc:Pre-Depends}, |
763 | 78 | Multi-Arch: same | 74 | Multi-Arch: same |
764 | 79 | Architecture: any | 75 | Architecture: any |
765 | 80 | Depends: ${misc:Depends}, | 76 | Depends: ${misc:Depends}, |
766 | 81 | ${shlibs:Depends}, | 77 | ${shlibs:Depends}, |
770 | 82 | Description: Implementation of the Platform API for a Mir server | 78 | libubuntu-application-api2 |
771 | 83 | This package provides the implementation of the Platform API to | 79 | Description: Implementation of the Ubuntu Platform API for Touch |
772 | 84 | provide a server instance of Mir. | 80 | This package provides the implementation of the Ubuntu Platform API |
773 | 81 | for Ubuntu Touch clients. | ||
774 | 85 | 82 | ||
776 | 86 | Package: libubuntu-application-api-mirclient1 | 83 | Package: libubuntu-application-api-desktop2 |
777 | 87 | Section: libs | 84 | Section: libs |
778 | 88 | Pre-Depends: ${misc:Pre-Depends}, | 85 | Pre-Depends: ${misc:Pre-Depends}, |
779 | 89 | Multi-Arch: same | 86 | Multi-Arch: same |
780 | 90 | Architecture: any | 87 | Architecture: any |
781 | 91 | Depends: ${misc:Depends}, | 88 | Depends: ${misc:Depends}, |
782 | 92 | ${shlibs:Depends}, | 89 | ${shlibs:Depends}, |
786 | 93 | Description: Implementation of the Platform API for a Mir client | 90 | libubuntu-application-api2 |
787 | 94 | This package provides the implementation of the Platform API to | 91 | Description: Implementation of the Ubuntu Platform API for a Desktop |
788 | 95 | allow a client to connect to a Mir server. | 92 | This package provides the implementation of the Ubuntu Platform API |
789 | 93 | for Ubuntu Desktop clients. | ||
790 | 96 | 94 | ||
791 | 97 | Package: libplatform-hardware-api1-dev | 95 | Package: libplatform-hardware-api1-dev |
792 | 98 | Section: libdevel | 96 | Section: libdevel |
793 | @@ -108,11 +106,11 @@ | |||
794 | 108 | This package provides the development library and headers (via | 106 | This package provides the development library and headers (via |
795 | 109 | dependency) for the hw-access portions of the Platform API. | 107 | dependency) for the hw-access portions of the Platform API. |
796 | 110 | 108 | ||
798 | 111 | Package: libplatform-api1-doc | 109 | Package: libplatform-api2-doc |
799 | 112 | Section: doc | 110 | Section: doc |
800 | 113 | Architecture: all | 111 | Architecture: all |
801 | 114 | Depends: ${misc:Depends}, | 112 | Depends: ${misc:Depends}, |
803 | 115 | libplatform-api1-dev, | 113 | libplatform-api2-dev, |
804 | 116 | Description: Platform API for system level capabilities (development) | 114 | Description: Platform API for system level capabilities (development) |
805 | 117 | This package provides the developer documentation for the Platform API. | 115 | This package provides the developer documentation for the Platform API. |
806 | 118 | 116 | ||
807 | @@ -131,7 +129,7 @@ | |||
808 | 131 | The produced library should be used via libhybris, to communicate with the | 129 | The produced library should be used via libhybris, to communicate with the |
809 | 132 | Android userspace, which is where the device drivers live. | 130 | Android userspace, which is where the device drivers live. |
810 | 133 | 131 | ||
812 | 134 | Package: libubuntu-application-api1 | 132 | Package: libubuntu-application-api2 |
813 | 135 | Section: libs | 133 | Section: libs |
814 | 136 | Architecture: any | 134 | Architecture: any |
815 | 137 | Replaces: libplatform-api1-hybris (<< 0.18.3) | 135 | Replaces: libplatform-api1-hybris (<< 0.18.3) |
816 | @@ -146,7 +144,7 @@ | |||
817 | 146 | The produced library should be used via libhybris, to communicate with the | 144 | The produced library should be used via libhybris, to communicate with the |
818 | 147 | Android userspace, which is where the Ubuntu Application Manager lives. | 145 | Android userspace, which is where the Ubuntu Application Manager lives. |
819 | 148 | 146 | ||
821 | 149 | Package: libubuntu-application-api-test1 | 147 | Package: libubuntu-application-api-test2 |
822 | 150 | Section: libs | 148 | Section: libs |
823 | 151 | Architecture: any | 149 | Architecture: any |
824 | 152 | Pre-Depends: ${misc:Pre-Depends}, | 150 | Pre-Depends: ${misc:Pre-Depends}, |
825 | @@ -162,33 +160,14 @@ | |||
826 | 162 | . | 160 | . |
827 | 163 | For now this provides simulated sensors. | 161 | For now this provides simulated sensors. |
828 | 164 | 162 | ||
856 | 165 | Package: libplatform-api1-hybris-tests | 163 | #Package: libplatform-api1-hybris-tests |
857 | 166 | Architecture: any | 164 | #Architecture: any |
858 | 167 | Depends: ${misc:Depends}, | 165 | #Depends: ${misc:Depends}, |
859 | 168 | ${shlibs:Depends}, | 166 | # ${shlibs:Depends}, |
860 | 169 | libubuntu-application-api1 (= ${binary:Version}), | 167 | # libubuntu-application-api1 (= ${binary:Version}), |
861 | 170 | Description: Hybris implementation of the Platform API (tests) | 168 | #Description: Hybris implementation of the Platform API (tests) |
862 | 171 | This package provides the test cases for the hybris implementation | 169 | # This package provides the test cases for the hybris implementation |
863 | 172 | of the Platform API. | 170 | # of the Platform API. |
837 | 173 | |||
838 | 174 | Package: libubuntu-platform-api1-dev | ||
839 | 175 | Section: oldlibs | ||
840 | 176 | Architecture: all | ||
841 | 177 | Depends: ${misc:Depends}, | ||
842 | 178 | libplatform-api1-dev (= ${binary:Version}), | ||
843 | 179 | Description: dummy transitional package for libplatform-api1-dev | ||
844 | 180 | This is dummy transitional package, please use libplatform-api1-dev instead. | ||
845 | 181 | . | ||
846 | 182 | This package can be safely removed. | ||
847 | 183 | |||
848 | 184 | Package: libplatform-api1-hybris | ||
849 | 185 | Section: oldlibs | ||
850 | 186 | Architecture: all | ||
851 | 187 | Depends: libubuntu-application-api1, | ||
852 | 188 | ${misc:Depends}, | ||
853 | 189 | Description: dummy transitional package for libplatform-api1-hybris | ||
854 | 190 | This is a dummy transitional package, please use libubuntu-application-api1 | ||
855 | 191 | instead. | ||
864 | 192 | 171 | ||
865 | 193 | Package: libplatform-hardware-api1-hybris | 172 | Package: libplatform-hardware-api1-hybris |
866 | 194 | Section: oldlibs | 173 | Section: oldlibs |
867 | 195 | 174 | ||
868 | === removed file 'debian/libplatform-api1-dev.install' | |||
869 | --- debian/libplatform-api1-dev.install 2013-08-23 13:53:42 +0000 | |||
870 | +++ debian/libplatform-api1-dev.install 1970-01-01 00:00:00 +0000 | |||
871 | @@ -1,4 +0,0 @@ | |||
872 | 1 | usr/lib/*/libubuntu_application_api.so | ||
873 | 2 | usr/lib/*/libubuntu_application_api_mirclient.so | ||
874 | 3 | usr/lib/*/libubuntu_application_api_mirserver.so | ||
875 | 4 | usr/lib/*/pkgconfig/ubuntu-platform-api.pc | ||
876 | 5 | 0 | ||
877 | === removed file 'debian/libplatform-api1-doc.doc-base' | |||
878 | --- debian/libplatform-api1-doc.doc-base 2013-07-05 16:34:47 +0000 | |||
879 | +++ debian/libplatform-api1-doc.doc-base 1970-01-01 00:00:00 +0000 | |||
880 | @@ -1,8 +0,0 @@ | |||
881 | 1 | Document: ubuntu-platform-api | ||
882 | 2 | Title: Ubuntu Platform API Reference Documentation | ||
883 | 3 | Author: Thomas Voß | ||
884 | 4 | Abstract: This is the reference documentation for the Ubuntu Platform API | ||
885 | 5 | Section: Debian | ||
886 | 6 | Format: HTML | ||
887 | 7 | Index: /usr/share/doc/ubuntu-platform-api/html/index.html | ||
888 | 8 | Files: /usr/share/doc/ubuntu-platform-api/html/*.html | ||
889 | 9 | 0 | ||
890 | === removed file 'debian/libplatform-api1-doc.install' | |||
891 | --- debian/libplatform-api1-doc.install 2013-07-05 13:50:50 +0000 | |||
892 | +++ debian/libplatform-api1-doc.install 1970-01-01 00:00:00 +0000 | |||
893 | @@ -1,1 +0,0 @@ | |||
894 | 1 | usr/share/doc/ubuntu-platform-api | ||
895 | 2 | \ No newline at end of file | 0 | \ No newline at end of file |
896 | 3 | 1 | ||
897 | === removed file 'debian/libplatform-api1-hybris-tests.install' | |||
898 | --- debian/libplatform-api1-hybris-tests.install 2013-08-17 05:22:31 +0000 | |||
899 | +++ debian/libplatform-api1-hybris-tests.install 1970-01-01 00:00:00 +0000 | |||
900 | @@ -1,6 +0,0 @@ | |||
901 | 1 | usr/bin/test_android_gps_api | ||
902 | 2 | usr/bin/test_android_sensors_api | ||
903 | 3 | usr/bin/test_android_ubuntu_app_api | ||
904 | 4 | usr/bin/test_android_ubuntu_app_api_multiple_surfaces | ||
905 | 5 | usr/bin/test_android_ubuntu_session_api | ||
906 | 6 | usr/bin/test_ubuntu_app_api_location_service | ||
907 | 7 | \ No newline at end of file | 0 | \ No newline at end of file |
908 | 8 | 1 | ||
909 | === modified file 'debian/libplatform-hardware-api1-dev.install' | |||
910 | --- debian/libplatform-hardware-api1-dev.install 2013-07-08 10:39:36 +0000 | |||
911 | +++ debian/libplatform-hardware-api1-dev.install 2014-05-02 12:23:55 +0000 | |||
912 | @@ -1,2 +1,2 @@ | |||
913 | 1 | usr/lib/*/libubuntu_platform_hardware_api.so | 1 | usr/lib/*/libubuntu_platform_hardware_api.so |
915 | 2 | 2 | usr/lib/*/pkgconfig/ubuntu-platform-hardware-api.pc | |
916 | 3 | 3 | ||
917 | === removed file 'debian/libubuntu-application-api-mirclient1.install' | |||
918 | --- debian/libubuntu-application-api-mirclient1.install 2013-08-08 17:41:19 +0000 | |||
919 | +++ debian/libubuntu-application-api-mirclient1.install 1970-01-01 00:00:00 +0000 | |||
920 | @@ -1,1 +0,0 @@ | |||
921 | 1 | usr/lib/*/libubuntu_application_api_mirclient.so.* | ||
922 | 2 | 0 | ||
923 | === removed file 'debian/libubuntu-application-api-mirclient1.symbols' | |||
924 | --- debian/libubuntu-application-api-mirclient1.symbols 2013-09-23 05:39:42 +0000 | |||
925 | +++ debian/libubuntu-application-api-mirclient1.symbols 1970-01-01 00:00:00 +0000 | |||
926 | @@ -1,126 +0,0 @@ | |||
927 | 1 | libubuntu_application_api_mirclient.so.1 libubuntu-application-api-mirclient1 #MINVER# | ||
928 | 2 | u_application_description_destroy@Base 0.18.3+13.10.20130813 | ||
929 | 3 | u_application_description_get_application_id@Base 0.18.3+13.10.20130813 | ||
930 | 4 | u_application_description_get_application_lifecycle_delegate@Base 0.18.3+13.10.20130813 | ||
931 | 5 | u_application_description_new@Base 0.18.3+13.10.20130813 | ||
932 | 6 | u_application_description_set_application_id@Base 0.18.3+13.10.20130813 | ||
933 | 7 | u_application_description_set_application_lifecycle_delegate@Base 0.18.3+13.10.20130813 | ||
934 | 8 | u_application_id_compare@Base 0.18.3+13.10.20130813 | ||
935 | 9 | u_application_id_destroy@Base 0.18.3+13.10.20130813 | ||
936 | 10 | u_application_id_new_from_stringn@Base 0.18.3+13.10.20130813 | ||
937 | 11 | u_application_instance_destroy@Base 0.18.3+13.10.20130813 | ||
938 | 12 | u_application_instance_new_from_description_with_options@Base 0.18.3+13.10.20130813 | ||
939 | 13 | u_application_instance_ref@Base 0.18.3+13.10.20130813 | ||
940 | 14 | u_application_instance_run@Base 0.18.3+13.10.20130813 | ||
941 | 15 | u_application_instance_unref@Base 0.18.3+13.10.20130813 | ||
942 | 16 | u_application_lifecycle_delegate_destroy@Base 0.18.3+13.10.20130813 | ||
943 | 17 | u_application_lifecycle_delegate_get_application_about_to_stop_cb@Base 0.18.3+13.10.20130813 | ||
944 | 18 | u_application_lifecycle_delegate_get_application_resumed_cb@Base 0.18.3+13.10.20130813 | ||
945 | 19 | u_application_lifecycle_delegate_get_context@Base 0.18.3+13.10.20130813 | ||
946 | 20 | u_application_lifecycle_delegate_new@Base 0.18.3+13.10.20130813 | ||
947 | 21 | u_application_lifecycle_delegate_ref@Base 0.18.3+13.10.20130813 | ||
948 | 22 | u_application_lifecycle_delegate_set_application_about_to_stop_cb@Base 0.18.3+13.10.20130813 | ||
949 | 23 | u_application_lifecycle_delegate_set_application_resumed_cb@Base 0.18.3+13.10.20130813 | ||
950 | 24 | u_application_lifecycle_delegate_set_context@Base 0.18.3+13.10.20130813 | ||
951 | 25 | u_application_lifecycle_delegate_unref@Base 0.18.3+13.10.20130813 | ||
952 | 26 | u_application_options_destroy@Base 0.18.3+13.10.20130813 | ||
953 | 27 | u_application_options_get_form_factor@Base 0.18.3+13.10.20130813 | ||
954 | 28 | u_application_options_get_operation_mode@Base 0.18.3+13.10.20130813 | ||
955 | 29 | u_application_options_get_stage@Base 0.18.3+13.10.20130813 | ||
956 | 30 | u_application_options_new_from_cmd_line@Base 0.18.3+13.10.20130813 | ||
957 | 31 | ua_sensors_accelerometer_disable@Base 0.18.3+13.10.20130813 | ||
958 | 32 | ua_sensors_accelerometer_enable@Base 0.18.3+13.10.20130813 | ||
959 | 33 | ua_sensors_accelerometer_get_max_value@Base 0.18.3+13.10.20130813 | ||
960 | 34 | ua_sensors_accelerometer_get_min_delay@Base 0.18.3+13.10.20130813 | ||
961 | 35 | ua_sensors_accelerometer_get_min_value@Base 0.18.3+13.10.20130813 | ||
962 | 36 | ua_sensors_accelerometer_get_resolution@Base 0.18.3+13.10.20130813 | ||
963 | 37 | ua_sensors_accelerometer_new@Base 0.18.3+13.10.20130813 | ||
964 | 38 | ua_sensors_accelerometer_set_reading_cb@Base 0.18.3+13.10.20130813 | ||
965 | 39 | ua_sensors_light_disable@Base 0.18.3+13.10.20130813 | ||
966 | 40 | ua_sensors_light_enable@Base 0.18.3+13.10.20130813 | ||
967 | 41 | ua_sensors_light_get_max_value@Base 0.18.3+13.10.20130813 | ||
968 | 42 | ua_sensors_light_get_min_delay@Base 0.18.3+13.10.20130813 | ||
969 | 43 | ua_sensors_light_get_min_value@Base 0.18.3+13.10.20130813 | ||
970 | 44 | ua_sensors_light_get_resolution@Base 0.18.3+13.10.20130813 | ||
971 | 45 | ua_sensors_light_new@Base 0.18.3+13.10.20130813 | ||
972 | 46 | ua_sensors_light_set_reading_cb@Base 0.18.3+13.10.20130813 | ||
973 | 47 | ua_sensors_proximity_disable@Base 0.18.3+13.10.20130813 | ||
974 | 48 | ua_sensors_proximity_enable@Base 0.18.3+13.10.20130813 | ||
975 | 49 | ua_sensors_proximity_get_max_value@Base 0.18.3+13.10.20130813 | ||
976 | 50 | ua_sensors_proximity_get_min_delay@Base 0.18.3+13.10.20130813 | ||
977 | 51 | ua_sensors_proximity_get_min_value@Base 0.18.3+13.10.20130813 | ||
978 | 52 | ua_sensors_proximity_get_resolution@Base 0.18.3+13.10.20130813 | ||
979 | 53 | ua_sensors_proximity_new@Base 0.18.3+13.10.20130813 | ||
980 | 54 | ua_sensors_proximity_set_reading_cb@Base 0.18.3+13.10.20130813 | ||
981 | 55 | ua_ui_display_destroy@Base 0.18.3+13.10.20130813 | ||
982 | 56 | ua_ui_display_get_native_type@Base 0.18.3+13.10.20130813 | ||
983 | 57 | ua_ui_display_new_with_index@Base 0.18.3+13.10.20130813 | ||
984 | 58 | ua_ui_display_query_horizontal_res@Base 0.18.3+13.10.20130813 | ||
985 | 59 | ua_ui_display_query_vertical_res@Base 0.18.3+13.10.20130813 | ||
986 | 60 | ua_ui_get_clipboard_content@Base 0.18.3+13.10.20130813 | ||
987 | 61 | ua_ui_session_new_with_properties@Base 0.18.3+13.10.20130813 | ||
988 | 62 | ua_ui_session_properties_new@Base 0.18.3+13.10.20130813 | ||
989 | 63 | ua_ui_session_properties_set_remote_pid@Base 0.18.3+13.10.20130813 | ||
990 | 64 | ua_ui_session_properties_set_type@Base 0.18.3+13.10.20130813 | ||
991 | 65 | ua_ui_set_clipboard_content@Base 0.18.3+13.10.20130813 | ||
992 | 66 | ua_ui_window_destroy@Base 0.18.3+13.10.20130813 | ||
993 | 67 | ua_ui_window_get_native_type@Base 0.18.3+13.10.20130813 | ||
994 | 68 | ua_ui_window_hide@Base 0.18.3+13.10.20130813 | ||
995 | 69 | ua_ui_window_move@Base 0.18.3+13.10.20130813 | ||
996 | 70 | ua_ui_window_new_for_application_with_properties@Base 0.18.3+13.10.20130813 | ||
997 | 71 | ua_ui_window_properties_destroy@Base 0.18.3+13.10.20130813 | ||
998 | 72 | ua_ui_window_properties_get_title@Base 0.18.3+13.10.20130813 | ||
999 | 73 | ua_ui_window_properties_new_for_normal_window@Base 0.18.3+13.10.20130813 | ||
1000 | 74 | ua_ui_window_properties_set_input_cb_and_ctx@Base 0.18.3+13.10.20130813 | ||
1001 | 75 | ua_ui_window_properties_set_role@Base 0.18.3+13.10.20130813 | ||
1002 | 76 | ua_ui_window_properties_set_titlen@Base 0.18.3+13.10.20130813 | ||
1003 | 77 | ua_ui_window_request_fullscreen@Base 0.18.3+13.10.20130813 | ||
1004 | 78 | ua_ui_window_resize@Base 0.18.3+13.10.20130813 | ||
1005 | 79 | ua_ui_window_show@Base 0.18.3+13.10.20130813 | ||
1006 | 80 | uas_accelerometer_event_get_acceleration_x@Base 0.18.3+13.10.20130813 | ||
1007 | 81 | uas_accelerometer_event_get_acceleration_y@Base 0.18.3+13.10.20130813 | ||
1008 | 82 | uas_accelerometer_event_get_acceleration_z@Base 0.18.3+13.10.20130813 | ||
1009 | 83 | uas_accelerometer_event_get_timestamp@Base 0.18.3+13.10.20130813 | ||
1010 | 84 | uas_light_event_get_light@Base 0.18.3+13.10.20130813 | ||
1011 | 85 | uas_light_event_get_timestamp@Base 0.18.3+13.10.20130813 | ||
1012 | 86 | uas_proximity_event_get_distance@Base 0.18.3+13.10.20130813 | ||
1013 | 87 | uas_proximity_event_get_timestamp@Base 0.18.3+13.10.20130813 | ||
1014 | 88 | ua_location_heading_update_get_heading_in_degree@Base 0.19+13.10.20130919.3 | ||
1015 | 89 | ua_location_heading_update_get_timestamp@Base 0.19+13.10.20130919.3 | ||
1016 | 90 | ua_location_heading_update_ref@Base 0.19+13.10.20130919.3 | ||
1017 | 91 | ua_location_heading_update_unref@Base 0.19+13.10.20130919.3 | ||
1018 | 92 | ua_location_position_update_get_altitude_in_meter@Base 0.19+13.10.20130919.3 | ||
1019 | 93 | ua_location_position_update_get_latitude_in_degree@Base 0.19+13.10.20130919.3 | ||
1020 | 94 | ua_location_position_update_get_longitude_in_degree@Base 0.19+13.10.20130919.3 | ||
1021 | 95 | ua_location_position_update_get_timestamp@Base 0.19+13.10.20130919.3 | ||
1022 | 96 | ua_location_position_update_has_altitude@Base 0.19+13.10.20130919.3 | ||
1023 | 97 | ua_location_position_update_ref@Base 0.19+13.10.20130919.3 | ||
1024 | 98 | ua_location_position_update_unref@Base 0.19+13.10.20130919.3 | ||
1025 | 99 | ua_location_service_controller_disable_gps@Base 0.19+13.10.20130919.3 | ||
1026 | 100 | ua_location_service_controller_disable_service@Base 0.19+13.10.20130919.3 | ||
1027 | 101 | ua_location_service_controller_enable_gps@Base 0.19+13.10.20130919.3 | ||
1028 | 102 | ua_location_service_controller_enable_service@Base 0.19+13.10.20130919.3 | ||
1029 | 103 | ua_location_service_controller_query_status@Base 0.19+13.10.20130919.3 | ||
1030 | 104 | ua_location_service_controller_ref@Base 0.19+13.10.20130919.3 | ||
1031 | 105 | ua_location_service_controller_set_status_changed_handler@Base 0.19+13.10.20130919.3 | ||
1032 | 106 | ua_location_service_controller_unref@Base 0.19+13.10.20130919.3 | ||
1033 | 107 | ua_location_service_create_controller@Base 0.19+13.10.20130919.3 | ||
1034 | 108 | ua_location_service_create_session_for_high_accuracy@Base 0.19+13.10.20130919.3 | ||
1035 | 109 | ua_location_service_create_session_for_low_accuracy@Base 0.19+13.10.20130919.3 | ||
1036 | 110 | ua_location_service_session_ref@Base 0.19+13.10.20130919.3 | ||
1037 | 111 | ua_location_service_session_set_heading_updates_handler@Base 0.19+13.10.20130919.3 | ||
1038 | 112 | ua_location_service_session_set_position_updates_handler@Base 0.19+13.10.20130919.3 | ||
1039 | 113 | ua_location_service_session_set_velocity_updates_handler@Base 0.19+13.10.20130919.3 | ||
1040 | 114 | ua_location_service_session_start_heading_updates@Base 0.19+13.10.20130919.3 | ||
1041 | 115 | ua_location_service_session_start_position_updates@Base 0.19+13.10.20130919.3 | ||
1042 | 116 | ua_location_service_session_start_velocity_updates@Base 0.19+13.10.20130919.3 | ||
1043 | 117 | ua_location_service_session_stop_heading_updates@Base 0.19+13.10.20130919.3 | ||
1044 | 118 | ua_location_service_session_stop_position_updates@Base 0.19+13.10.20130919.3 | ||
1045 | 119 | ua_location_service_session_stop_velocity_updates@Base 0.19+13.10.20130919.3 | ||
1046 | 120 | ua_location_service_session_unref@Base 0.19+13.10.20130919.3 | ||
1047 | 121 | ua_location_velocity_update_get_timestamp@Base 0.19+13.10.20130919.3 | ||
1048 | 122 | ua_location_velocity_update_get_velocity_in_meters_per_second@Base 0.19+13.10.20130919.3 | ||
1049 | 123 | ua_location_velocity_update_ref@Base 0.19+13.10.20130919.3 | ||
1050 | 124 | ua_location_velocity_update_unref@Base 0.19+13.10.20130919.3 | ||
1051 | 125 | ua_url_dispatcher_session@Base 0.19+13.10.20130919.3 | ||
1052 | 126 | ua_url_dispatcher_session_open@Base 0.19+13.10.20130919.3 | ||
1053 | 127 | \ No newline at end of file | 0 | \ No newline at end of file |
1054 | 128 | 1 | ||
1055 | === removed file 'debian/libubuntu-application-api-mirserver1.install' | |||
1056 | --- debian/libubuntu-application-api-mirserver1.install 2013-08-08 17:41:19 +0000 | |||
1057 | +++ debian/libubuntu-application-api-mirserver1.install 1970-01-01 00:00:00 +0000 | |||
1058 | @@ -1,1 +0,0 @@ | |||
1059 | 1 | usr/lib/*/libubuntu_application_api_mirserver.so.* | ||
1060 | 2 | 0 | ||
1061 | === removed file 'debian/libubuntu-application-api-mirserver1.symbols' | |||
1062 | --- debian/libubuntu-application-api-mirserver1.symbols 2013-09-23 05:39:42 +0000 | |||
1063 | +++ debian/libubuntu-application-api-mirserver1.symbols 1970-01-01 00:00:00 +0000 | |||
1064 | @@ -1,128 +0,0 @@ | |||
1065 | 1 | libubuntu_application_api_mirserver.so.1 libubuntu-application-api-mirserver1 #MINVER# | ||
1066 | 2 | u_application_description_destroy@Base 0.18.3+13.10.20130813 | ||
1067 | 3 | u_application_description_get_application_id@Base 0.18.3+13.10.20130813 | ||
1068 | 4 | u_application_description_get_application_lifecycle_delegate@Base 0.18.3+13.10.20130813 | ||
1069 | 5 | u_application_description_new@Base 0.18.3+13.10.20130813 | ||
1070 | 6 | u_application_description_set_application_id@Base 0.18.3+13.10.20130813 | ||
1071 | 7 | u_application_description_set_application_lifecycle_delegate@Base 0.18.3+13.10.20130813 | ||
1072 | 8 | u_application_id_compare@Base 0.18.3+13.10.20130813 | ||
1073 | 9 | u_application_id_destroy@Base 0.18.3+13.10.20130813 | ||
1074 | 10 | u_application_id_new_from_stringn@Base 0.18.3+13.10.20130813 | ||
1075 | 11 | u_application_instance_destroy@Base 0.18.3+13.10.20130813 | ||
1076 | 12 | u_application_instance_new_from_description_with_options@Base 0.18.3+13.10.20130813 | ||
1077 | 13 | u_application_instance_ref@Base 0.18.3+13.10.20130813 | ||
1078 | 14 | u_application_instance_run@Base 0.18.3+13.10.20130813 | ||
1079 | 15 | u_application_instance_unref@Base 0.18.3+13.10.20130813 | ||
1080 | 16 | u_application_lifecycle_delegate_destroy@Base 0.18.3+13.10.20130813 | ||
1081 | 17 | u_application_lifecycle_delegate_get_application_about_to_stop_cb@Base 0.18.3+13.10.20130813 | ||
1082 | 18 | u_application_lifecycle_delegate_get_application_resumed_cb@Base 0.18.3+13.10.20130813 | ||
1083 | 19 | u_application_lifecycle_delegate_get_context@Base 0.18.3+13.10.20130813 | ||
1084 | 20 | u_application_lifecycle_delegate_new@Base 0.18.3+13.10.20130813 | ||
1085 | 21 | u_application_lifecycle_delegate_ref@Base 0.18.3+13.10.20130813 | ||
1086 | 22 | u_application_lifecycle_delegate_set_application_about_to_stop_cb@Base 0.18.3+13.10.20130813 | ||
1087 | 23 | u_application_lifecycle_delegate_set_application_resumed_cb@Base 0.18.3+13.10.20130813 | ||
1088 | 24 | u_application_lifecycle_delegate_set_context@Base 0.18.3+13.10.20130813 | ||
1089 | 25 | u_application_lifecycle_delegate_unref@Base 0.18.3+13.10.20130813 | ||
1090 | 26 | u_application_options_destroy@Base 0.18.3+13.10.20130813 | ||
1091 | 27 | u_application_options_get_form_factor@Base 0.18.3+13.10.20130813 | ||
1092 | 28 | u_application_options_get_operation_mode@Base 0.18.3+13.10.20130813 | ||
1093 | 29 | u_application_options_get_stage@Base 0.18.3+13.10.20130813 | ||
1094 | 30 | u_application_options_new_from_cmd_line@Base 0.18.3+13.10.20130813 | ||
1095 | 31 | ua_sensors_accelerometer_disable@Base 0.18.3+13.10.20130813 | ||
1096 | 32 | ua_sensors_accelerometer_enable@Base 0.18.3+13.10.20130813 | ||
1097 | 33 | ua_sensors_accelerometer_get_max_value@Base 0.18.3+13.10.20130813 | ||
1098 | 34 | ua_sensors_accelerometer_get_min_delay@Base 0.18.3+13.10.20130813 | ||
1099 | 35 | ua_sensors_accelerometer_get_min_value@Base 0.18.3+13.10.20130813 | ||
1100 | 36 | ua_sensors_accelerometer_get_resolution@Base 0.18.3+13.10.20130813 | ||
1101 | 37 | ua_sensors_accelerometer_new@Base 0.18.3+13.10.20130813 | ||
1102 | 38 | ua_sensors_accelerometer_set_reading_cb@Base 0.18.3+13.10.20130813 | ||
1103 | 39 | ua_sensors_light_disable@Base 0.18.3+13.10.20130813 | ||
1104 | 40 | ua_sensors_light_enable@Base 0.18.3+13.10.20130813 | ||
1105 | 41 | ua_sensors_light_get_max_value@Base 0.18.3+13.10.20130813 | ||
1106 | 42 | ua_sensors_light_get_min_delay@Base 0.18.3+13.10.20130813 | ||
1107 | 43 | ua_sensors_light_get_min_value@Base 0.18.3+13.10.20130813 | ||
1108 | 44 | ua_sensors_light_get_resolution@Base 0.18.3+13.10.20130813 | ||
1109 | 45 | ua_sensors_light_new@Base 0.18.3+13.10.20130813 | ||
1110 | 46 | ua_sensors_light_set_reading_cb@Base 0.18.3+13.10.20130813 | ||
1111 | 47 | ua_sensors_proximity_disable@Base 0.18.3+13.10.20130813 | ||
1112 | 48 | ua_sensors_proximity_enable@Base 0.18.3+13.10.20130813 | ||
1113 | 49 | ua_sensors_proximity_get_max_value@Base 0.18.3+13.10.20130813 | ||
1114 | 50 | ua_sensors_proximity_get_min_delay@Base 0.18.3+13.10.20130813 | ||
1115 | 51 | ua_sensors_proximity_get_min_value@Base 0.18.3+13.10.20130813 | ||
1116 | 52 | ua_sensors_proximity_get_resolution@Base 0.18.3+13.10.20130813 | ||
1117 | 53 | ua_sensors_proximity_new@Base 0.18.3+13.10.20130813 | ||
1118 | 54 | ua_sensors_proximity_set_reading_cb@Base 0.18.3+13.10.20130813 | ||
1119 | 55 | ua_ui_display_destroy@Base 0.18.3+13.10.20130813 | ||
1120 | 56 | ua_ui_display_get_native_type@Base 0.18.3+13.10.20130813 | ||
1121 | 57 | ua_ui_display_new_with_index@Base 0.18.3+13.10.20130813 | ||
1122 | 58 | ua_ui_display_query_horizontal_res@Base 0.18.3+13.10.20130813 | ||
1123 | 59 | ua_ui_display_query_vertical_res@Base 0.18.3+13.10.20130813 | ||
1124 | 60 | ua_ui_get_clipboard_content@Base 0.18.3+13.10.20130813 | ||
1125 | 61 | ua_ui_mirserver_finish@Base 0.18.3+13.10.20130823 | ||
1126 | 62 | ua_ui_mirserver_init@Base 0.18.3+13.10.20130823 | ||
1127 | 63 | ua_ui_session_new_with_properties@Base 0.18.3+13.10.20130813 | ||
1128 | 64 | ua_ui_session_properties_new@Base 0.18.3+13.10.20130813 | ||
1129 | 65 | ua_ui_session_properties_set_remote_pid@Base 0.18.3+13.10.20130813 | ||
1130 | 66 | ua_ui_session_properties_set_type@Base 0.18.3+13.10.20130813 | ||
1131 | 67 | ua_ui_set_clipboard_content@Base 0.18.3+13.10.20130813 | ||
1132 | 68 | ua_ui_window_destroy@Base 0.18.3+13.10.20130813 | ||
1133 | 69 | ua_ui_window_get_native_type@Base 0.18.3+13.10.20130813 | ||
1134 | 70 | ua_ui_window_hide@Base 0.18.3+13.10.20130813 | ||
1135 | 71 | ua_ui_window_move@Base 0.18.3+13.10.20130813 | ||
1136 | 72 | ua_ui_window_new_for_application_with_properties@Base 0.18.3+13.10.20130813 | ||
1137 | 73 | ua_ui_window_properties_destroy@Base 0.18.3+13.10.20130813 | ||
1138 | 74 | ua_ui_window_properties_get_title@Base 0.18.3+13.10.20130813 | ||
1139 | 75 | ua_ui_window_properties_new_for_normal_window@Base 0.18.3+13.10.20130813 | ||
1140 | 76 | ua_ui_window_properties_set_input_cb_and_ctx@Base 0.18.3+13.10.20130813 | ||
1141 | 77 | ua_ui_window_properties_set_role@Base 0.18.3+13.10.20130813 | ||
1142 | 78 | ua_ui_window_properties_set_titlen@Base 0.18.3+13.10.20130813 | ||
1143 | 79 | ua_ui_window_request_fullscreen@Base 0.18.3+13.10.20130813 | ||
1144 | 80 | ua_ui_window_resize@Base 0.18.3+13.10.20130813 | ||
1145 | 81 | ua_ui_window_show@Base 0.18.3+13.10.20130813 | ||
1146 | 82 | uas_accelerometer_event_get_acceleration_x@Base 0.18.3+13.10.20130813 | ||
1147 | 83 | uas_accelerometer_event_get_acceleration_y@Base 0.18.3+13.10.20130813 | ||
1148 | 84 | uas_accelerometer_event_get_acceleration_z@Base 0.18.3+13.10.20130813 | ||
1149 | 85 | uas_accelerometer_event_get_timestamp@Base 0.18.3+13.10.20130813 | ||
1150 | 86 | uas_light_event_get_light@Base 0.18.3+13.10.20130813 | ||
1151 | 87 | uas_light_event_get_timestamp@Base 0.18.3+13.10.20130813 | ||
1152 | 88 | uas_proximity_event_get_distance@Base 0.18.3+13.10.20130813 | ||
1153 | 89 | uas_proximity_event_get_timestamp@Base 0.18.3+13.10.20130813 | ||
1154 | 90 | ua_location_heading_update_get_heading_in_degree@Base 0.19+13.10.20130919.3 | ||
1155 | 91 | ua_location_heading_update_get_timestamp@Base 0.19+13.10.20130919.3 | ||
1156 | 92 | ua_location_heading_update_ref@Base 0.19+13.10.20130919.3 | ||
1157 | 93 | ua_location_heading_update_unref@Base 0.19+13.10.20130919.3 | ||
1158 | 94 | ua_location_position_update_get_altitude_in_meter@Base 0.19+13.10.20130919.3 | ||
1159 | 95 | ua_location_position_update_get_latitude_in_degree@Base 0.19+13.10.20130919.3 | ||
1160 | 96 | ua_location_position_update_get_longitude_in_degree@Base 0.19+13.10.20130919.3 | ||
1161 | 97 | ua_location_position_update_get_timestamp@Base 0.19+13.10.20130919.3 | ||
1162 | 98 | ua_location_position_update_has_altitude@Base 0.19+13.10.20130919.3 | ||
1163 | 99 | ua_location_position_update_ref@Base 0.19+13.10.20130919.3 | ||
1164 | 100 | ua_location_position_update_unref@Base 0.19+13.10.20130919.3 | ||
1165 | 101 | ua_location_service_controller_disable_gps@Base 0.19+13.10.20130919.3 | ||
1166 | 102 | ua_location_service_controller_disable_service@Base 0.19+13.10.20130919.3 | ||
1167 | 103 | ua_location_service_controller_enable_gps@Base 0.19+13.10.20130919.3 | ||
1168 | 104 | ua_location_service_controller_enable_service@Base 0.19+13.10.20130919.3 | ||
1169 | 105 | ua_location_service_controller_query_status@Base 0.19+13.10.20130919.3 | ||
1170 | 106 | ua_location_service_controller_ref@Base 0.19+13.10.20130919.3 | ||
1171 | 107 | ua_location_service_controller_set_status_changed_handler@Base 0.19+13.10.20130919.3 | ||
1172 | 108 | ua_location_service_controller_unref@Base 0.19+13.10.20130919.3 | ||
1173 | 109 | ua_location_service_create_controller@Base 0.19+13.10.20130919.3 | ||
1174 | 110 | ua_location_service_create_session_for_high_accuracy@Base 0.19+13.10.20130919.3 | ||
1175 | 111 | ua_location_service_create_session_for_low_accuracy@Base 0.19+13.10.20130919.3 | ||
1176 | 112 | ua_location_service_session_ref@Base 0.19+13.10.20130919.3 | ||
1177 | 113 | ua_location_service_session_set_heading_updates_handler@Base 0.19+13.10.20130919.3 | ||
1178 | 114 | ua_location_service_session_set_position_updates_handler@Base 0.19+13.10.20130919.3 | ||
1179 | 115 | ua_location_service_session_set_velocity_updates_handler@Base 0.19+13.10.20130919.3 | ||
1180 | 116 | ua_location_service_session_start_heading_updates@Base 0.19+13.10.20130919.3 | ||
1181 | 117 | ua_location_service_session_start_position_updates@Base 0.19+13.10.20130919.3 | ||
1182 | 118 | ua_location_service_session_start_velocity_updates@Base 0.19+13.10.20130919.3 | ||
1183 | 119 | ua_location_service_session_stop_heading_updates@Base 0.19+13.10.20130919.3 | ||
1184 | 120 | ua_location_service_session_stop_position_updates@Base 0.19+13.10.20130919.3 | ||
1185 | 121 | ua_location_service_session_stop_velocity_updates@Base 0.19+13.10.20130919.3 | ||
1186 | 122 | ua_location_service_session_unref@Base 0.19+13.10.20130919.3 | ||
1187 | 123 | ua_location_velocity_update_get_timestamp@Base 0.19+13.10.20130919.3 | ||
1188 | 124 | ua_location_velocity_update_get_velocity_in_meters_per_second@Base 0.19+13.10.20130919.3 | ||
1189 | 125 | ua_location_velocity_update_ref@Base 0.19+13.10.20130919.3 | ||
1190 | 126 | ua_location_velocity_update_unref@Base 0.19+13.10.20130919.3 | ||
1191 | 127 | ua_url_dispatcher_session@Base 0.19+13.10.20130919.3 | ||
1192 | 128 | ua_url_dispatcher_session_open@Base 0.19+13.10.20130919.3 | ||
1193 | 129 | \ No newline at end of file | 0 | \ No newline at end of file |
1194 | 130 | 1 | ||
1195 | === removed file 'debian/libubuntu-application-api-test1.docs' | |||
1196 | --- debian/libubuntu-application-api-test1.docs 2014-01-08 15:17:41 +0000 | |||
1197 | +++ debian/libubuntu-application-api-test1.docs 1970-01-01 00:00:00 +0000 | |||
1198 | @@ -1,1 +0,0 @@ | |||
1199 | 1 | src/ubuntu/testbackend/README.md | ||
1200 | 2 | 0 | ||
1201 | === removed file 'debian/libubuntu-application-api-test1.install' | |||
1202 | --- debian/libubuntu-application-api-test1.install 2014-01-08 15:17:41 +0000 | |||
1203 | +++ debian/libubuntu-application-api-test1.install 1970-01-01 00:00:00 +0000 | |||
1204 | @@ -1,1 +0,0 @@ | |||
1205 | 1 | usr/lib/*/libubuntu_application_api_test.so.* | ||
1206 | 2 | 0 | ||
1207 | === removed file 'debian/libubuntu-application-api1.install' | |||
1208 | --- debian/libubuntu-application-api1.install 2013-07-16 21:20:58 +0000 | |||
1209 | +++ debian/libubuntu-application-api1.install 1970-01-01 00:00:00 +0000 | |||
1210 | @@ -1,1 +0,0 @@ | |||
1211 | 1 | usr/lib/*/libubuntu_application_api.so.* | ||
1212 | 2 | 0 | ||
1213 | === removed file 'debian/libubuntu-application-api1.symbols' | |||
1214 | --- debian/libubuntu-application-api1.symbols 2013-08-26 18:07:34 +0000 | |||
1215 | +++ debian/libubuntu-application-api1.symbols 1970-01-01 00:00:00 +0000 | |||
1216 | @@ -1,130 +0,0 @@ | |||
1217 | 1 | libubuntu_application_api.so.1 libubuntu-application-api1 #MINVER# | ||
1218 | 2 | u_application_description_destroy@Base 0.18.1daily13.06.21 | ||
1219 | 3 | u_application_description_new@Base 0.18.1daily13.06.21 | ||
1220 | 4 | u_application_description_set_application_id@Base 0.18.1daily13.06.21 | ||
1221 | 5 | u_application_description_set_application_lifecycle_delegate@Base 0.18.1daily13.06.21 | ||
1222 | 6 | u_application_id_compare@Base 0.18.1daily13.06.21 | ||
1223 | 7 | u_application_id_destroy@Base 0.18.1daily13.06.21 | ||
1224 | 8 | u_application_id_new_from_stringn@Base 0.18.1daily13.06.21 | ||
1225 | 9 | u_application_instance_new_from_description_with_options@Base 0.18.1daily13.06.21 | ||
1226 | 10 | u_application_lifecycle_delegate_new@Base 0.18.1daily13.06.21 | ||
1227 | 11 | u_application_lifecycle_delegate_ref@Base 0.18.1daily13.06.21 | ||
1228 | 12 | u_application_lifecycle_delegate_set_application_about_to_stop_cb@Base 0.18.1daily13.06.21 | ||
1229 | 13 | u_application_lifecycle_delegate_set_application_resumed_cb@Base 0.18.1daily13.06.21 | ||
1230 | 14 | u_application_lifecycle_delegate_set_context@Base 0.18.1daily13.06.21 | ||
1231 | 15 | u_application_lifecycle_delegate_unref@Base 0.18.1daily13.06.21 | ||
1232 | 16 | u_application_options_destroy@Base 0.18.1daily13.06.21 | ||
1233 | 17 | u_application_options_get_form_factor@Base 0.18.1daily13.06.21 | ||
1234 | 18 | u_application_options_get_stage@Base 0.18.1daily13.06.21 | ||
1235 | 19 | u_application_options_new_from_cmd_line@Base 0.18.1daily13.06.21 | ||
1236 | 20 | ua_location_heading_update_get_timestamp@Base 0.18.3+13.10.20130807 | ||
1237 | 21 | ua_location_heading_update_ref@Base 0.18.3+13.10.20130807 | ||
1238 | 22 | ua_location_heading_update_unref@Base 0.18.3+13.10.20130807 | ||
1239 | 23 | ua_location_heading_update_get_heading_in_degree@Base 0.18.3+13.10.20130815.1 | ||
1240 | 24 | ua_location_position_update_get_altitude_in_meter@Base 0.18.3+13.10.20130807 | ||
1241 | 25 | ua_location_position_update_get_latitude_in_degree@Base 0.18.3+13.10.20130807 | ||
1242 | 26 | ua_location_position_update_get_longitude_in_degree@Base 0.18.3+13.10.20130807 | ||
1243 | 27 | ua_location_position_update_get_timestamp@Base 0.18.3+13.10.20130807 | ||
1244 | 28 | ua_location_position_update_has_altitude@Base 0.18.3+13.10.20130807 | ||
1245 | 29 | ua_location_position_update_ref@Base 0.18.3+13.10.20130807 | ||
1246 | 30 | ua_location_position_update_unref@Base 0.18.3+13.10.20130807 | ||
1247 | 31 | ua_location_service_create_session_for_high_accuracy@Base 0.18.3+13.10.20130807 | ||
1248 | 32 | ua_location_service_create_session_for_low_accuracy@Base 0.18.3+13.10.20130807 | ||
1249 | 33 | ua_location_service_create_controller@Base 0.18.3+13.10.20130826.3 | ||
1250 | 34 | ua_location_service_session_ref@Base 0.18.3+13.10.20130807 | ||
1251 | 35 | ua_location_service_session_set_heading_updates_handler@Base 0.18.3+13.10.20130807 | ||
1252 | 36 | ua_location_service_session_set_position_updates_handler@Base 0.18.3+13.10.20130807 | ||
1253 | 37 | ua_location_service_session_set_velocity_updates_handler@Base 0.18.3+13.10.20130807 | ||
1254 | 38 | ua_location_service_session_start_heading_updates@Base 0.18.3+13.10.20130807 | ||
1255 | 39 | ua_location_service_session_start_position_updates@Base 0.18.3+13.10.20130807 | ||
1256 | 40 | ua_location_service_session_start_velocity_updates@Base 0.18.3+13.10.20130807 | ||
1257 | 41 | ua_location_service_session_stop_heading_updates@Base 0.18.3+13.10.20130807 | ||
1258 | 42 | ua_location_service_session_stop_position_updates@Base 0.18.3+13.10.20130807 | ||
1259 | 43 | ua_location_service_session_stop_velocity_updates@Base 0.18.3+13.10.20130807 | ||
1260 | 44 | ua_location_service_session_unref@Base 0.18.3+13.10.20130807 | ||
1261 | 45 | ua_location_velocity_update_get_timestamp@Base 0.18.3+13.10.20130807 | ||
1262 | 46 | ua_location_velocity_update_get_velocity_in_meters_per_second@Base 0.18.3+13.10.20130807 | ||
1263 | 47 | ua_location_velocity_update_ref@Base 0.18.3+13.10.20130807 | ||
1264 | 48 | ua_location_velocity_update_unref@Base 0.18.3+13.10.20130807 | ||
1265 | 49 | ua_sensors_accelerometer_disable@Base 0.18.1daily13.06.21 | ||
1266 | 50 | ua_sensors_accelerometer_enable@Base 0.18.1daily13.06.21 | ||
1267 | 51 | ua_sensors_accelerometer_get_max_value@Base 0.18.1daily13.06.21 | ||
1268 | 52 | ua_sensors_accelerometer_get_min_delay@Base 0.18.1daily13.06.21 | ||
1269 | 53 | ua_sensors_accelerometer_get_min_value@Base 0.18.1daily13.06.21 | ||
1270 | 54 | ua_sensors_accelerometer_get_resolution@Base 0.18.1daily13.06.21 | ||
1271 | 55 | ua_sensors_accelerometer_new@Base 0.18.1daily13.06.21 | ||
1272 | 56 | ua_sensors_accelerometer_set_reading_cb@Base 0.18.1daily13.06.21 | ||
1273 | 57 | ua_sensors_light_enable@Base 0.18.1daily13.06.21 | ||
1274 | 58 | ua_sensors_light_disable@Base 0.18.2+13.10.20130708 | ||
1275 | 59 | ua_sensors_light_get_max_value@Base 0.18.1daily13.06.21 | ||
1276 | 60 | ua_sensors_light_get_min_delay@Base 0.18.1daily13.06.21 | ||
1277 | 61 | ua_sensors_light_get_min_value@Base 0.18.1daily13.06.21 | ||
1278 | 62 | ua_sensors_light_get_resolution@Base 0.18.1daily13.06.21 | ||
1279 | 63 | ua_sensors_light_new@Base 0.18.1daily13.06.21 | ||
1280 | 64 | ua_sensors_light_set_reading_cb@Base 0.18.1daily13.06.21 | ||
1281 | 65 | ua_sensors_proximity_disable@Base 0.18.1daily13.06.21 | ||
1282 | 66 | ua_sensors_proximity_enable@Base 0.18.1daily13.06.21 | ||
1283 | 67 | ua_sensors_proximity_get_max_value@Base 0.18.1daily13.06.21 | ||
1284 | 68 | ua_sensors_proximity_get_min_delay@Base 0.18.1daily13.06.21 | ||
1285 | 69 | ua_sensors_proximity_get_min_value@Base 0.18.1daily13.06.21 | ||
1286 | 70 | ua_sensors_proximity_get_resolution@Base 0.18.1daily13.06.21 | ||
1287 | 71 | ua_sensors_proximity_new@Base 0.18.1daily13.06.21 | ||
1288 | 72 | ua_sensors_proximity_set_reading_cb@Base 0.18.1daily13.06.21 | ||
1289 | 73 | ua_ui_display_destroy@Base 0.18.1daily13.06.21 | ||
1290 | 74 | ua_ui_display_get_native_type@Base 0.18.1daily13.06.21 | ||
1291 | 75 | ua_ui_display_new_with_index@Base 0.18.1daily13.06.21 | ||
1292 | 76 | ua_ui_display_query_horizontal_res@Base 0.18.1daily13.06.21 | ||
1293 | 77 | ua_ui_display_query_vertical_res@Base 0.18.1daily13.06.21 | ||
1294 | 78 | ua_ui_get_clipboard_content@Base 0.18.1daily13.06.21 | ||
1295 | 79 | ua_ui_session_new_with_properties@Base 0.18.1daily13.06.21 | ||
1296 | 80 | ua_ui_session_properties_new@Base 0.18.1daily13.06.21 | ||
1297 | 81 | ua_ui_session_properties_set_remote_pid@Base 0.18.1daily13.06.21 | ||
1298 | 82 | ua_ui_session_properties_set_type@Base 0.18.1daily13.06.21 | ||
1299 | 83 | ua_ui_set_clipboard_content@Base 0.18.1daily13.06.21 | ||
1300 | 84 | ua_ui_window_destroy@Base 0.18.1daily13.06.21 | ||
1301 | 85 | ua_ui_window_get_native_type@Base 0.18.1daily13.06.21 | ||
1302 | 86 | ua_ui_window_hide@Base 0.18.1daily13.06.21 | ||
1303 | 87 | ua_ui_window_move@Base 0.18.1daily13.06.21 | ||
1304 | 88 | ua_ui_window_new_for_application_with_properties@Base 0.18.1daily13.06.21 | ||
1305 | 89 | ua_ui_window_properties_destroy@Base 0.18.1daily13.06.21 | ||
1306 | 90 | ua_ui_window_properties_get_title@Base 0.18.1daily13.06.21 | ||
1307 | 91 | ua_ui_window_properties_new_for_normal_window@Base 0.18.1daily13.06.21 | ||
1308 | 92 | ua_ui_window_properties_set_input_cb_and_ctx@Base 0.18.1daily13.06.21 | ||
1309 | 93 | ua_ui_window_properties_set_role@Base 0.18.1daily13.06.21 | ||
1310 | 94 | ua_ui_window_properties_set_titlen@Base 0.18.1daily13.06.21 | ||
1311 | 95 | ua_ui_window_request_fullscreen@Base 0.18.1daily13.06.21 | ||
1312 | 96 | ua_ui_window_resize@Base 0.18.1daily13.06.21 | ||
1313 | 97 | ua_ui_window_show@Base 0.18.1daily13.06.21 | ||
1314 | 98 | ua_url_dispatcher_session@Base 0.18.3+13.10.20130823-0ubuntu1 | ||
1315 | 99 | ua_url_dispatcher_session_open@Base 0.18.3+13.10.20130823-0ubuntu1 | ||
1316 | 100 | uas_accelerometer_event_get_acceleration_x@Base 0.18.1daily13.06.21 | ||
1317 | 101 | uas_accelerometer_event_get_acceleration_y@Base 0.18.1daily13.06.21 | ||
1318 | 102 | uas_accelerometer_event_get_acceleration_z@Base 0.18.1daily13.06.21 | ||
1319 | 103 | uas_accelerometer_event_get_timestamp@Base 0.18.1daily13.06.21 | ||
1320 | 104 | uas_light_event_get_light@Base 0.18.1daily13.06.21 | ||
1321 | 105 | uas_light_event_get_timestamp@Base 0.18.1daily13.06.21 | ||
1322 | 106 | uas_proximity_event_get_distance@Base 0.18.1daily13.06.21 | ||
1323 | 107 | uas_proximity_event_get_timestamp@Base 0.18.1daily13.06.21 | ||
1324 | 108 | ubuntu_ui_install_task_controller@Base 0.18.1daily13.06.21 | ||
1325 | 109 | ubuntu_ui_report_notification_invisible@Base 0.18.1daily13.06.21 | ||
1326 | 110 | ubuntu_ui_report_notification_visible@Base 0.18.1daily13.06.21 | ||
1327 | 111 | ubuntu_ui_report_osk_invisible@Base 0.18.1daily13.06.21 | ||
1328 | 112 | ubuntu_ui_report_osk_visible@Base 0.18.1daily13.06.21 | ||
1329 | 113 | ubuntu_ui_session_focus_running_session_with_id@Base 0.18.1daily13.06.21 | ||
1330 | 114 | ubuntu_ui_session_install_session_lifecycle_observer@Base 0.18.1daily13.06.21 | ||
1331 | 115 | ubuntu_ui_session_properties_get_application_instance_id@Base 0.18.1daily13.06.21 | ||
1332 | 116 | ubuntu_ui_session_properties_get_application_stage_hint@Base 0.18.1daily13.06.21 | ||
1333 | 117 | ubuntu_ui_session_properties_get_desktop_file_hint@Base 0.18.1daily13.06.21 | ||
1334 | 118 | ubuntu_ui_session_snapshot_running_session_with_id@Base 0.18.1daily13.06.21 | ||
1335 | 119 | ubuntu_ui_session_trigger_switch_to_well_known_application@Base 0.18.1daily13.06.21 | ||
1336 | 120 | ubuntu_ui_session_unfocus_running_sessions@Base 0.18.1daily13.06.21 | ||
1337 | 121 | ubuntu_ui_set_surface_trap@Base 0.18.1daily13.06.21 | ||
1338 | 122 | ubuntu_ui_unset_surface_trap@Base 0.18.1daily13.06.21 | ||
1339 | 123 | ua_location_service_controller_disable_gps@Base 0.18.3+13.10.20130826 | ||
1340 | 124 | ua_location_service_controller_disable_service@Base 0.18.3+13.10.20130826 | ||
1341 | 125 | ua_location_service_controller_enable_gps@Base 0.18.3+13.10.20130826 | ||
1342 | 126 | ua_location_service_controller_enable_service@Base 0.18.3+13.10.20130826 | ||
1343 | 127 | ua_location_service_controller_query_status@Base 0.18.3+13.10.20130826 | ||
1344 | 128 | ua_location_service_controller_ref@Base 0.18.3+13.10.20130826 | ||
1345 | 129 | ua_location_service_controller_set_status_changed_handler@Base 0.18.3+13.10.20130826 | ||
1346 | 130 | ua_location_service_controller_unref@Base 0.18.3+13.10.20130826 | ||
1347 | 131 | 0 | ||
1348 | === modified file 'debian/rules' (properties changed: +x to -x) | |||
1349 | --- debian/rules 2014-01-31 13:35:28 +0000 | |||
1350 | +++ debian/rules 2014-05-02 12:23:55 +0000 | |||
1351 | @@ -2,14 +2,11 @@ | |||
1352 | 2 | 2 | ||
1353 | 3 | DPKG_GENSYMBOLS_CHECK_LEVEL = 4 | 3 | DPKG_GENSYMBOLS_CHECK_LEVEL = 4 |
1354 | 4 | 4 | ||
1355 | 5 | export C=gcc-4.7 | ||
1356 | 6 | export CXX=g++-4.7 | ||
1357 | 7 | |||
1358 | 8 | %: | 5 | %: |
1359 | 9 | dh $@ | 6 | dh $@ |
1360 | 10 | 7 | ||
1361 | 11 | override_dh_auto_configure: | 8 | override_dh_auto_configure: |
1363 | 12 | dh_auto_configure -- -DENABLE_MIRCLIENT_IMPLEMENTATION=true -DENABLE_MIRSERVER_IMPLEMENTATION=true | 9 | dh_auto_configure |
1364 | 13 | 10 | ||
1365 | 14 | override_dh_install: | 11 | override_dh_install: |
1366 | 15 | dh_install --fail-missing | 12 | dh_install --fail-missing |
1367 | 16 | 13 | ||
1368 | === modified file 'doc/Doxyfile.in' | |||
1369 | --- doc/Doxyfile.in 2013-07-05 09:13:31 +0000 | |||
1370 | +++ doc/Doxyfile.in 2014-05-02 12:23:55 +0000 | |||
1371 | @@ -1684,7 +1684,7 @@ | |||
1372 | 1684 | # explicitly to a value larger than 0 to get control over the balance | 1684 | # explicitly to a value larger than 0 to get control over the balance |
1373 | 1685 | # between CPU load and processing speed. | 1685 | # between CPU load and processing speed. |
1374 | 1686 | 1686 | ||
1376 | 1687 | DOT_NUM_THREADS = 0 | 1687 | DOT_NUM_THREADS = 1 |
1377 | 1688 | 1688 | ||
1378 | 1689 | # By default doxygen will use the Helvetica font for all dot files that | 1689 | # By default doxygen will use the Helvetica font for all dot files that |
1379 | 1690 | # doxygen generates. When you want a differently looking font you can specify | 1690 | # doxygen generates. When you want a differently looking font you can specify |
1380 | 1691 | 1691 | ||
1381 | === modified file 'include/ubuntu/application/sensors/accelerometer.h' | |||
1382 | --- include/ubuntu/application/sensors/accelerometer.h 2013-08-22 06:32:14 +0000 | |||
1383 | +++ include/ubuntu/application/sensors/accelerometer.h 2014-05-02 12:23:55 +0000 | |||
1384 | @@ -85,9 +85,10 @@ | |||
1385 | 85 | * \returns The minimum value that can be reported by the sensor. | 85 | * \returns The minimum value that can be reported by the sensor. |
1386 | 86 | * \param[in] sensor The sensor instance to be queried. | 86 | * \param[in] sensor The sensor instance to be queried. |
1387 | 87 | */ | 87 | */ |
1389 | 88 | UBUNTU_DLL_PUBLIC float | 88 | UBUNTU_DLL_PUBLIC UStatus |
1390 | 89 | ua_sensors_accelerometer_get_min_value( | 89 | ua_sensors_accelerometer_get_min_value( |
1392 | 90 | UASensorsAccelerometer* sensor); | 90 | UASensorsAccelerometer* sensor, |
1393 | 91 | float* value); | ||
1394 | 91 | 92 | ||
1395 | 92 | /** | 93 | /** |
1396 | 93 | * \brief Queries the maximum value that can be reported by the sensor. | 94 | * \brief Queries the maximum value that can be reported by the sensor. |
1397 | @@ -95,9 +96,10 @@ | |||
1398 | 95 | * \returns The maximum value that can be reported by the sensor. | 96 | * \returns The maximum value that can be reported by the sensor. |
1399 | 96 | * \param[in] sensor The sensor instance to be queried. | 97 | * \param[in] sensor The sensor instance to be queried. |
1400 | 97 | */ | 98 | */ |
1402 | 98 | UBUNTU_DLL_PUBLIC float | 99 | UBUNTU_DLL_PUBLIC UStatus |
1403 | 99 | ua_sensors_accelerometer_get_max_value( | 100 | ua_sensors_accelerometer_get_max_value( |
1405 | 100 | UASensorsAccelerometer* sensor); | 101 | UASensorsAccelerometer* sensor, |
1406 | 102 | float* value); | ||
1407 | 101 | 103 | ||
1408 | 102 | /** | 104 | /** |
1409 | 103 | * \brief Queries the numeric resolution supported by the sensor | 105 | * \brief Queries the numeric resolution supported by the sensor |
1410 | @@ -105,9 +107,10 @@ | |||
1411 | 105 | * \returns The numeric resolution supported by the sensor. | 107 | * \returns The numeric resolution supported by the sensor. |
1412 | 106 | * \param[in] sensor The sensor instance to be queried. | 108 | * \param[in] sensor The sensor instance to be queried. |
1413 | 107 | */ | 109 | */ |
1415 | 108 | UBUNTU_DLL_PUBLIC float | 110 | UBUNTU_DLL_PUBLIC UStatus |
1416 | 109 | ua_sensors_accelerometer_get_resolution( | 111 | ua_sensors_accelerometer_get_resolution( |
1418 | 110 | UASensorsAccelerometer* sensor); | 112 | UASensorsAccelerometer* sensor, |
1419 | 113 | float* value); | ||
1420 | 111 | 114 | ||
1421 | 112 | /** | 115 | /** |
1422 | 113 | * \brief Set the callback to be invoked whenever a new sensor reading is available. | 116 | * \brief Set the callback to be invoked whenever a new sensor reading is available. |
1423 | 114 | 117 | ||
1424 | === modified file 'include/ubuntu/application/sensors/event/accelerometer.h' | |||
1425 | --- include/ubuntu/application/sensors/event/accelerometer.h 2013-08-22 06:32:14 +0000 | |||
1426 | +++ include/ubuntu/application/sensors/event/accelerometer.h 2014-05-02 12:23:55 +0000 | |||
1427 | @@ -49,9 +49,10 @@ | |||
1428 | 49 | * \returns The acceleration in x-axis direction. | 49 | * \returns The acceleration in x-axis direction. |
1429 | 50 | * \param[in] event The reading to be queried. | 50 | * \param[in] event The reading to be queried. |
1430 | 51 | */ | 51 | */ |
1432 | 52 | UBUNTU_DLL_PUBLIC float | 52 | UBUNTU_DLL_PUBLIC UStatus |
1433 | 53 | uas_accelerometer_event_get_acceleration_x( | 53 | uas_accelerometer_event_get_acceleration_x( |
1435 | 54 | UASAccelerometerEvent* event); | 54 | UASAccelerometerEvent* event, |
1436 | 55 | float* value); | ||
1437 | 55 | 56 | ||
1438 | 56 | /** | 57 | /** |
1439 | 57 | * \brief Query the acceleration in y-axis direction. | 58 | * \brief Query the acceleration in y-axis direction. |
1440 | @@ -59,9 +60,10 @@ | |||
1441 | 59 | * \returns The acceleration in y-axis direction. | 60 | * \returns The acceleration in y-axis direction. |
1442 | 60 | * \param[in] event The reading to be queried. | 61 | * \param[in] event The reading to be queried. |
1443 | 61 | */ | 62 | */ |
1445 | 62 | UBUNTU_DLL_PUBLIC float | 63 | UBUNTU_DLL_PUBLIC UStatus |
1446 | 63 | uas_accelerometer_event_get_acceleration_y( | 64 | uas_accelerometer_event_get_acceleration_y( |
1448 | 64 | UASAccelerometerEvent* event); | 65 | UASAccelerometerEvent* event, |
1449 | 66 | float* value); | ||
1450 | 65 | 67 | ||
1451 | 66 | /** | 68 | /** |
1452 | 67 | * \brief Query the acceleration in z-axis direction. | 69 | * \brief Query the acceleration in z-axis direction. |
1453 | @@ -69,9 +71,10 @@ | |||
1454 | 69 | * \returns The acceleration in z-axis direction. | 71 | * \returns The acceleration in z-axis direction. |
1455 | 70 | * \param[in] event The reading to be queried. | 72 | * \param[in] event The reading to be queried. |
1456 | 71 | */ | 73 | */ |
1458 | 72 | UBUNTU_DLL_PUBLIC float | 74 | UBUNTU_DLL_PUBLIC UStatus |
1459 | 73 | uas_accelerometer_event_get_acceleration_z( | 75 | uas_accelerometer_event_get_acceleration_z( |
1461 | 74 | UASAccelerometerEvent* event); | 76 | UASAccelerometerEvent* event, |
1462 | 77 | float* value); | ||
1463 | 75 | 78 | ||
1464 | 76 | #ifdef __cplusplus | 79 | #ifdef __cplusplus |
1465 | 77 | } | 80 | } |
1466 | 78 | 81 | ||
1467 | === modified file 'include/ubuntu/application/sensors/event/light.h' | |||
1468 | --- include/ubuntu/application/sensors/event/light.h 2013-08-22 06:32:14 +0000 | |||
1469 | +++ include/ubuntu/application/sensors/event/light.h 2014-05-02 12:23:55 +0000 | |||
1470 | @@ -49,9 +49,10 @@ | |||
1471 | 49 | * \returns The ambient light level. | 49 | * \returns The ambient light level. |
1472 | 50 | * \param[in] event The reading to be queried. | 50 | * \param[in] event The reading to be queried. |
1473 | 51 | */ | 51 | */ |
1475 | 52 | UBUNTU_DLL_PUBLIC float | 52 | UBUNTU_DLL_PUBLIC UStatus |
1476 | 53 | uas_light_event_get_light( | 53 | uas_light_event_get_light( |
1478 | 54 | UASLightEvent* event); | 54 | UASLightEvent* event, |
1479 | 55 | float* value); | ||
1480 | 55 | 56 | ||
1481 | 56 | #ifdef __cplusplus | 57 | #ifdef __cplusplus |
1482 | 57 | } | 58 | } |
1483 | 58 | 59 | ||
1484 | === modified file 'include/ubuntu/application/sensors/light.h' | |||
1485 | --- include/ubuntu/application/sensors/light.h 2013-08-22 06:32:14 +0000 | |||
1486 | +++ include/ubuntu/application/sensors/light.h 2014-05-02 12:23:55 +0000 | |||
1487 | @@ -85,9 +85,10 @@ | |||
1488 | 85 | * \returns The minimum value that can be reported by the sensor. | 85 | * \returns The minimum value that can be reported by the sensor. |
1489 | 86 | * \param[in] sensor The sensor instance to be queried. | 86 | * \param[in] sensor The sensor instance to be queried. |
1490 | 87 | */ | 87 | */ |
1492 | 88 | UBUNTU_DLL_PUBLIC float | 88 | UBUNTU_DLL_PUBLIC UStatus |
1493 | 89 | ua_sensors_light_get_min_value( | 89 | ua_sensors_light_get_min_value( |
1495 | 90 | UASensorsLight* sensor); | 90 | UASensorsLight* sensor, |
1496 | 91 | float* value); | ||
1497 | 91 | 92 | ||
1498 | 92 | /** | 93 | /** |
1499 | 93 | * \brief Queries the maximum value that can be reported by the sensor. | 94 | * \brief Queries the maximum value that can be reported by the sensor. |
1500 | @@ -95,9 +96,10 @@ | |||
1501 | 95 | * \returns The maximum value that can be reported by the sensor. | 96 | * \returns The maximum value that can be reported by the sensor. |
1502 | 96 | * \param[in] sensor The sensor instance to be queried. | 97 | * \param[in] sensor The sensor instance to be queried. |
1503 | 97 | */ | 98 | */ |
1505 | 98 | UBUNTU_DLL_PUBLIC float | 99 | UBUNTU_DLL_PUBLIC UStatus |
1506 | 99 | ua_sensors_light_get_max_value( | 100 | ua_sensors_light_get_max_value( |
1508 | 100 | UASensorsLight* sensor); | 101 | UASensorsLight* sensor, |
1509 | 102 | float* value); | ||
1510 | 101 | 103 | ||
1511 | 102 | /** | 104 | /** |
1512 | 103 | * \brief Queries the numeric resolution supported by the sensor | 105 | * \brief Queries the numeric resolution supported by the sensor |
1513 | @@ -105,9 +107,10 @@ | |||
1514 | 105 | * \returns The numeric resolution supported by the sensor. | 107 | * \returns The numeric resolution supported by the sensor. |
1515 | 106 | * \param[in] sensor The sensor instance to be queried. | 108 | * \param[in] sensor The sensor instance to be queried. |
1516 | 107 | */ | 109 | */ |
1518 | 108 | UBUNTU_DLL_PUBLIC float | 110 | UBUNTU_DLL_PUBLIC UStatus |
1519 | 109 | ua_sensors_light_get_resolution( | 111 | ua_sensors_light_get_resolution( |
1521 | 110 | UASensorsLight* sensor); | 112 | UASensorsLight* sensor, |
1522 | 113 | float* value); | ||
1523 | 111 | 114 | ||
1524 | 112 | /** | 115 | /** |
1525 | 113 | * \brief Set the callback to be invoked whenever a new sensor reading is available. | 116 | * \brief Set the callback to be invoked whenever a new sensor reading is available. |
1526 | 114 | 117 | ||
1527 | === modified file 'include/ubuntu/application/sensors/proximity.h' | |||
1528 | --- include/ubuntu/application/sensors/proximity.h 2013-08-22 06:32:14 +0000 | |||
1529 | +++ include/ubuntu/application/sensors/proximity.h 2014-05-02 12:23:55 +0000 | |||
1530 | @@ -85,9 +85,10 @@ | |||
1531 | 85 | * \returns The minimum value that can be reported by the sensor. | 85 | * \returns The minimum value that can be reported by the sensor. |
1532 | 86 | * \param[in] sensor The sensor instance to be queried. | 86 | * \param[in] sensor The sensor instance to be queried. |
1533 | 87 | */ | 87 | */ |
1535 | 88 | UBUNTU_DLL_PUBLIC float | 88 | UBUNTU_DLL_PUBLIC UStatus |
1536 | 89 | ua_sensors_proximity_get_min_value( | 89 | ua_sensors_proximity_get_min_value( |
1538 | 90 | UASensorsProximity* sensor); | 90 | UASensorsProximity* sensor, |
1539 | 91 | float* value); | ||
1540 | 91 | 92 | ||
1541 | 92 | /** | 93 | /** |
1542 | 93 | * \brief Queries the maximum value that can be reported by the sensor. | 94 | * \brief Queries the maximum value that can be reported by the sensor. |
1543 | @@ -95,9 +96,10 @@ | |||
1544 | 95 | * \returns The maximum value that can be reported by the sensor. | 96 | * \returns The maximum value that can be reported by the sensor. |
1545 | 96 | * \param[in] sensor The sensor instance to be queried. | 97 | * \param[in] sensor The sensor instance to be queried. |
1546 | 97 | */ | 98 | */ |
1548 | 98 | UBUNTU_DLL_PUBLIC float | 99 | UBUNTU_DLL_PUBLIC UStatus |
1549 | 99 | ua_sensors_proximity_get_max_value( | 100 | ua_sensors_proximity_get_max_value( |
1551 | 100 | UASensorsProximity* sensor); | 101 | UASensorsProximity* sensor, |
1552 | 102 | float* value); | ||
1553 | 101 | 103 | ||
1554 | 102 | /** | 104 | /** |
1555 | 103 | * \brief Queries the numeric resolution supported by the sensor | 105 | * \brief Queries the numeric resolution supported by the sensor |
1556 | @@ -105,9 +107,10 @@ | |||
1557 | 105 | * \returns The numeric resolution supported by the sensor. | 107 | * \returns The numeric resolution supported by the sensor. |
1558 | 106 | * \param[in] sensor The sensor instance to be queried. | 108 | * \param[in] sensor The sensor instance to be queried. |
1559 | 107 | */ | 109 | */ |
1561 | 108 | UBUNTU_DLL_PUBLIC float | 110 | UBUNTU_DLL_PUBLIC UStatus |
1562 | 109 | ua_sensors_proximity_get_resolution( | 111 | ua_sensors_proximity_get_resolution( |
1564 | 110 | UASensorsProximity* sensor); | 112 | UASensorsProximity* sensor, |
1565 | 113 | float* value); | ||
1566 | 111 | 114 | ||
1567 | 112 | /** | 115 | /** |
1568 | 113 | * \brief Set the callback to be invoked whenever a new sensor reading is available. | 116 | * \brief Set the callback to be invoked whenever a new sensor reading is available. |
1569 | 114 | 117 | ||
1570 | === modified file 'include/ubuntu/application/sensors/ubuntu_application_sensors.h' | |||
1571 | --- include/ubuntu/application/sensors/ubuntu_application_sensors.h 2013-08-22 07:17:47 +0000 | |||
1572 | +++ include/ubuntu/application/sensors/ubuntu_application_sensors.h 2014-05-02 12:23:55 +0000 | |||
1573 | @@ -18,6 +18,7 @@ | |||
1574 | 18 | #ifndef UBUNTU_APPLICATION_SENSORS_C_API_H_ | 18 | #ifndef UBUNTU_APPLICATION_SENSORS_C_API_H_ |
1575 | 19 | #define UBUNTU_APPLICATION_SENSORS_C_API_H_ | 19 | #define UBUNTU_APPLICATION_SENSORS_C_API_H_ |
1576 | 20 | 20 | ||
1577 | 21 | #include <ubuntu/status.h> | ||
1578 | 21 | #include <ubuntu/visibility.h> | 22 | #include <ubuntu/visibility.h> |
1579 | 22 | 23 | ||
1580 | 23 | #include <stdint.h> | 24 | #include <stdint.h> |
1581 | @@ -139,15 +140,17 @@ | |||
1582 | 139 | /** Returns the minimum valid value for the sensor_type. | 140 | /** Returns the minimum valid value for the sensor_type. |
1583 | 140 | * \ingroup sensor_access | 141 | * \ingroup sensor_access |
1584 | 141 | */ | 142 | */ |
1586 | 142 | UBUNTU_DLL_PUBLIC float ubuntu_sensor_get_sensor_min_value(ubuntu_sensor_type sensor_type); | 143 | UBUNTU_DLL_PUBLIC UStatus ubuntu_sensor_get_sensor_min_value(ubuntu_sensor_type sensor_type, float* value); |
1587 | 144 | |||
1588 | 143 | /** Returns the maximum valid value for the sensor_type. | 145 | /** Returns the maximum valid value for the sensor_type. |
1589 | 144 | * \ingroup sensor_access | 146 | * \ingroup sensor_access |
1590 | 145 | */ | 147 | */ |
1592 | 146 | UBUNTU_DLL_PUBLIC float ubuntu_sensor_get_sensor_max_value(ubuntu_sensor_type sensor_type); | 148 | UBUNTU_DLL_PUBLIC UStatus ubuntu_sensor_get_sensor_max_value(ubuntu_sensor_type sensor_type, float* value); |
1593 | 149 | |||
1594 | 147 | /** Returns the resolution of valid values for the sensor_type. | 150 | /** Returns the resolution of valid values for the sensor_type. |
1595 | 148 | * \ingroup sensor_access | 151 | * \ingroup sensor_access |
1596 | 149 | */ | 152 | */ |
1598 | 150 | UBUNTU_DLL_PUBLIC float ubuntu_sensor_get_sensor_resolution(ubuntu_sensor_type sensor_type); | 153 | UBUNTU_DLL_PUBLIC UStatus ubuntu_sensor_get_sensor_resolution(ubuntu_sensor_type sensor_type, float* value); |
1599 | 151 | 154 | ||
1600 | 152 | /** \example test_sensors_api.cpp */ | 155 | /** \example test_sensors_api.cpp */ |
1601 | 153 | #ifdef __cplusplus | 156 | #ifdef __cplusplus |
1602 | 154 | 157 | ||
1603 | === modified file 'include/ubuntu/hardware/CMakeLists.txt' | |||
1604 | --- include/ubuntu/hardware/CMakeLists.txt 2013-07-18 09:08:17 +0000 | |||
1605 | +++ include/ubuntu/hardware/CMakeLists.txt 2014-05-02 12:23:55 +0000 | |||
1606 | @@ -1,9 +1,10 @@ | |||
1607 | 1 | set( | 1 | set( |
1608 | 2 | UBUNTU_HARDWARE_HEADERS | 2 | UBUNTU_HARDWARE_HEADERS |
1609 | 3 | alarm.h | ||
1610 | 3 | gps.h | 4 | gps.h |
1611 | 4 | ) | 5 | ) |
1612 | 5 | 6 | ||
1613 | 6 | install( | 7 | install( |
1614 | 7 | FILES ${UBUNTU_HARDWARE_HEADERS} | 8 | FILES ${UBUNTU_HARDWARE_HEADERS} |
1615 | 8 | DESTINATION include/ubuntu/hardware | 9 | DESTINATION include/ubuntu/hardware |
1616 | 9 | ) | ||
1617 | 10 | \ No newline at end of file | 10 | \ No newline at end of file |
1618 | 11 | ) | ||
1619 | 11 | 12 | ||
1620 | === added file 'include/ubuntu/hardware/alarm.h' | |||
1621 | --- include/ubuntu/hardware/alarm.h 1970-01-01 00:00:00 +0000 | |||
1622 | +++ include/ubuntu/hardware/alarm.h 2014-05-02 12:23:55 +0000 | |||
1623 | @@ -0,0 +1,98 @@ | |||
1624 | 1 | /* | ||
1625 | 2 | * Copyright © 2014 Canonical Ltd. | ||
1626 | 3 | * | ||
1627 | 4 | * This program is free software: you can redistribute it and/or modify | ||
1628 | 5 | * it under the terms of the GNU Lesser General Public License version 3 as | ||
1629 | 6 | * published by the Free Software Foundation. | ||
1630 | 7 | * | ||
1631 | 8 | * This program is distributed in the hope that it will be useful, | ||
1632 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
1633 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
1634 | 11 | * GNU Lesser General Public License for more details. | ||
1635 | 12 | * | ||
1636 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
1637 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
1638 | 15 | * | ||
1639 | 16 | * Authored by: Thomas Voß <thomas.voss@canonical.com> | ||
1640 | 17 | */ | ||
1641 | 18 | #ifndef UBUNTU_HARDWARE_ALARM_H_ | ||
1642 | 19 | #define UBUNTU_HARDWARE_ALARM_H_ | ||
1643 | 20 | |||
1644 | 21 | #include <ubuntu/status.h> | ||
1645 | 22 | #include <ubuntu/visibility.h> | ||
1646 | 23 | |||
1647 | 24 | #ifdef __cplusplus | ||
1648 | 25 | extern "C" { | ||
1649 | 26 | #endif | ||
1650 | 27 | |||
1651 | 28 | /** The time reference that alarms are setup to. */ | ||
1652 | 29 | typedef enum | ||
1653 | 30 | { | ||
1654 | 31 | U_HARDWARE_ALARM_TIME_REFERENCE_BOOT, /**< Relative to the device's boot time, including sleep. */ | ||
1655 | 32 | U_HARDWARE_ALARM_TIME_REFERENCE_NOW /**< Relative from now on. */ | ||
1656 | 33 | } UbuntuHardwareAlarmTimeReference; | ||
1657 | 34 | |||
1658 | 35 | typedef UbuntuHardwareAlarmTimeReference UHardwareAlarmTimeReference; | ||
1659 | 36 | |||
1660 | 37 | /** Describes if an alarm is able to wakup the device from sleep. */ | ||
1661 | 38 | typedef enum | ||
1662 | 39 | { | ||
1663 | 40 | /** Alarm will wakeup the device from sleep. */ | ||
1664 | 41 | U_HARDWARE_ALARM_SLEEP_BEHAVIOR_WAKEUP_DEVICE, | ||
1665 | 42 | /** Alarm will not wakeup the device and will be delivered on the next wakeup of the device */ | ||
1666 | 43 | U_HARDWARE_ALARM_SLEEP_BEHAVIOR_KEEP_DEVICE_ASLEEP | ||
1667 | 44 | } UbuntuHardwareAlarmSleepBehavior; | ||
1668 | 45 | |||
1669 | 46 | typedef UbuntuHardwareAlarmSleepBehavior UHardwareAlarmSleepBehavior; | ||
1670 | 47 | |||
1671 | 48 | /** Bundles the time reference and sleep/wakeup behavior when waiting for an alarm to happen. */ | ||
1672 | 49 | typedef struct | ||
1673 | 50 | { | ||
1674 | 51 | UHardwareAlarmTimeReference reference; | ||
1675 | 52 | UHardwareAlarmSleepBehavior sleep_behavior; | ||
1676 | 53 | } UbuntuHardwareAlarmWaitResult; | ||
1677 | 54 | |||
1678 | 55 | typedef UbuntuHardwareAlarmWaitResult UHardwareAlarmWaitResult; | ||
1679 | 56 | |||
1680 | 57 | /** Opaque type modelling access to the kernel/hw-level alarm capabilities. */ | ||
1681 | 58 | typedef struct UbuntuHardwareAlarm* UHardwareAlarm; | ||
1682 | 59 | |||
1683 | 60 | /** Creates an instance and/or increments its refcount. */ | ||
1684 | 61 | UBUNTU_DLL_PUBLIC UHardwareAlarm | ||
1685 | 62 | u_hardware_alarm_create(); | ||
1686 | 63 | |||
1687 | 64 | /** Increments the instance's ref count. */ | ||
1688 | 65 | UBUNTU_DLL_PUBLIC void | ||
1689 | 66 | u_hardware_alarm_ref( | ||
1690 | 67 | UHardwareAlarm alarm); | ||
1691 | 68 | |||
1692 | 69 | /** Decrements the instance's ref count. */ | ||
1693 | 70 | UBUNTU_DLL_PUBLIC void | ||
1694 | 71 | u_hardware_alarm_unref( | ||
1695 | 72 | UHardwareAlarm alarm); | ||
1696 | 73 | |||
1697 | 74 | /** Reports a timezone change to kernel and HW. */ | ||
1698 | 75 | UBUNTU_DLL_PUBLIC UStatus | ||
1699 | 76 | u_hardware_alarm_set_timezone( | ||
1700 | 77 | UHardwareAlarm alarm, | ||
1701 | 78 | const struct timezone *tz); | ||
1702 | 79 | |||
1703 | 80 | /** Sets and arms a timer. */ | ||
1704 | 81 | UBUNTU_DLL_PUBLIC UStatus | ||
1705 | 82 | u_hardware_alarm_set_relative_to_with_behavior( | ||
1706 | 83 | UHardwareAlarm alarm, | ||
1707 | 84 | UHardwareAlarmTimeReference time_reference, | ||
1708 | 85 | UHardwareAlarmSleepBehavior behavior, | ||
1709 | 86 | const struct timespec *ts); | ||
1710 | 87 | |||
1711 | 88 | /** Blocks until the next alarm occurs. */ | ||
1712 | 89 | UBUNTU_DLL_PUBLIC UStatus | ||
1713 | 90 | u_hardware_alarm_wait_for_next_alarm( | ||
1714 | 91 | UHardwareAlarm alarm, | ||
1715 | 92 | UHardwareAlarmWaitResult *result); | ||
1716 | 93 | |||
1717 | 94 | #ifdef __cplusplus | ||
1718 | 95 | } | ||
1719 | 96 | #endif | ||
1720 | 97 | |||
1721 | 98 | #endif | ||
1722 | 0 | 99 | ||
1723 | === modified file 'src/ubuntu/CMakeLists.txt' | |||
1724 | --- src/ubuntu/CMakeLists.txt 2013-12-02 17:03:45 +0000 | |||
1725 | +++ src/ubuntu/CMakeLists.txt 2014-05-02 12:23:55 +0000 | |||
1726 | @@ -1,10 +1,3 @@ | |||
1727 | 1 | include_directories( | ||
1728 | 2 | ${CMAKE_CURRENT_SOURCE_DIR} | ||
1729 | 3 | ) | ||
1730 | 4 | |||
1731 | 5 | add_subdirectory(application) | ||
1732 | 6 | add_subdirectory(testbackend) | ||
1733 | 7 | |||
1734 | 8 | set( | 1 | set( |
1735 | 9 | UBUNTU_APPLICATION_API_LINK_LIBRARIES | 2 | UBUNTU_APPLICATION_API_LINK_LIBRARIES |
1736 | 10 | 3 | ||
1737 | @@ -12,18 +5,42 @@ | |||
1738 | 12 | ubuntu_application_url_dispatcher | 5 | ubuntu_application_url_dispatcher |
1739 | 13 | ) | 6 | ) |
1740 | 14 | 7 | ||
1756 | 15 | if(ENABLE_HYBRIS_IMPLEMENTATION) | 8 | add_subdirectory(common) |
1757 | 16 | add_subdirectory(hybris/) | 9 | add_subdirectory(desktop) |
1758 | 17 | endif() | 10 | add_subdirectory(touch) |
1759 | 18 | 11 | add_subdirectory(testbackend) | |
1760 | 19 | if(ENABLE_MIRSERVER_IMPLEMENTATION OR ENABLE_MIRCLIENT_IMPLEMENTATION) | 12 | |
1761 | 20 | add_subdirectory(mircommon/) | 13 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC") |
1762 | 21 | endif() | 14 | |
1763 | 22 | 15 | add_library( | |
1764 | 23 | if(ENABLE_MIRSERVER_IMPLEMENTATION) | 16 | ubuntu_application_api SHARED |
1765 | 24 | add_subdirectory(mirserver/) | 17 | |
1766 | 25 | endif() | 18 | ubuntu_application_api.cpp |
1767 | 26 | 19 | ) | |
1768 | 27 | if(ENABLE_MIRCLIENT_IMPLEMENTATION) | 20 | |
1769 | 28 | add_subdirectory(mirclient/) | 21 | include_directories( |
1770 | 29 | endif() | 22 | ${CMAKE_BINARY_DIR}/include |
1771 | 23 | ) | ||
1772 | 24 | |||
1773 | 25 | target_link_libraries( | ||
1774 | 26 | ubuntu_application_api | ||
1775 | 27 | |||
1776 | 28 | dl | ||
1777 | 29 | #${Hybris} | ||
1778 | 30 | ) | ||
1779 | 31 | |||
1780 | 32 | set_target_properties( | ||
1781 | 33 | ubuntu_application_api | ||
1782 | 34 | PROPERTIES | ||
1783 | 35 | VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH} | ||
1784 | 36 | SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR} | ||
1785 | 37 | ) | ||
1786 | 38 | |||
1787 | 39 | install( | ||
1788 | 40 | TARGETS ubuntu_application_api | ||
1789 | 41 | ${INSTALL_TARGETS_DEFAULT_ARGS} | ||
1790 | 42 | ) | ||
1791 | 43 | |||
1792 | 44 | #if(ENABLE_MIRCLIENT_IMPLEMENTATION) | ||
1793 | 45 | # add_subdirectory(mirclient/) | ||
1794 | 46 | #endif() | ||
1795 | 30 | 47 | ||
1796 | === added directory 'src/ubuntu/common' | |||
1797 | === added file 'src/ubuntu/common/CMakeLists.txt' | |||
1798 | --- src/ubuntu/common/CMakeLists.txt 1970-01-01 00:00:00 +0000 | |||
1799 | +++ src/ubuntu/common/CMakeLists.txt 2014-05-02 12:23:55 +0000 | |||
1800 | @@ -0,0 +1,8 @@ | |||
1801 | 1 | include_directories( | ||
1802 | 2 | ${CMAKE_CURRENT_SOURCE_DIR} | ||
1803 | 3 | ) | ||
1804 | 4 | |||
1805 | 5 | add_subdirectory(application) | ||
1806 | 6 | add_subdirectory(mircommon) | ||
1807 | 7 | add_subdirectory(mirclient) | ||
1808 | 8 | add_subdirectory(mirserver) | ||
1809 | 0 | 9 | ||
1810 | === renamed directory 'src/ubuntu/application' => 'src/ubuntu/common/application' | |||
1811 | === renamed directory 'src/ubuntu/mirclient' => 'src/ubuntu/common/mirclient' | |||
1812 | === modified file 'src/ubuntu/common/mirclient/CMakeLists.txt' | |||
1813 | --- src/ubuntu/mirclient/CMakeLists.txt 2014-02-07 14:32:44 +0000 | |||
1814 | +++ src/ubuntu/common/mirclient/CMakeLists.txt 2014-05-02 12:23:55 +0000 | |||
1815 | @@ -13,11 +13,6 @@ | |||
1816 | 13 | 13 | ||
1817 | 14 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC") | 14 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC") |
1818 | 15 | 15 | ||
1819 | 16 | add_library( | ||
1820 | 17 | ubuntu_application_api_mirclient SHARED | ||
1821 | 18 | ${SOURCES} | ||
1822 | 19 | ) | ||
1823 | 20 | |||
1824 | 21 | include_directories( | 16 | include_directories( |
1825 | 22 | ${CMAKE_BINARY_DIR}/include | 17 | ${CMAKE_BINARY_DIR}/include |
1826 | 23 | ${MIRCLIENT_INCLUDE_DIRS} | 18 | ${MIRCLIENT_INCLUDE_DIRS} |
1827 | @@ -25,18 +20,17 @@ | |||
1828 | 25 | ${CMAKE_CURRENT_BINARY_DIR} | 20 | ${CMAKE_CURRENT_BINARY_DIR} |
1829 | 26 | ) | 21 | ) |
1830 | 27 | 22 | ||
1831 | 23 | add_library( | ||
1832 | 24 | ubuntu_application_api_mirclient STATIC | ||
1833 | 25 | ${SOURCES} | ||
1834 | 26 | ) | ||
1835 | 27 | |||
1836 | 28 | SET(MIRCOMMON_LINK -Wl,--whole-archive ubuntu_application_api_mircommon -Wl,--no-whole-archive) | ||
1837 | 29 | |||
1838 | 28 | target_link_libraries( | 30 | target_link_libraries( |
1839 | 29 | ubuntu_application_api_mirclient | 31 | ubuntu_application_api_mirclient |
1840 | 32 | |||
1841 | 30 | ${MIRCLIENT_LDFLAGS} ${MIRCLIENT_LIBRARIES} | 33 | ${MIRCLIENT_LDFLAGS} ${MIRCLIENT_LIBRARIES} |
1842 | 31 | -Wl,--whole-archive ubuntu_application_api_mircommon ${UBUNTU_APPLICATION_API_LINK_LIBRARIES} -Wl,--no-whole-archive | ||
1843 | 32 | ${PROTOBUF_LIBRARIES} | 34 | ${PROTOBUF_LIBRARIES} |
1854 | 33 | ) | 35 | # ${MIRCOMMON_LINK} |
1855 | 34 | 36 | ) | |
1846 | 35 | set_target_properties( | ||
1847 | 36 | ubuntu_application_api_mirclient | ||
1848 | 37 | PROPERTIES | ||
1849 | 38 | VERSION 1.0 | ||
1850 | 39 | SOVERSION 1 | ||
1851 | 40 | ) | ||
1852 | 41 | |||
1853 | 42 | install(TARGETS ubuntu_application_api_mirclient ${INSTALL_TARGETS_DEFAULT_ARGS}) | ||
1856 | 43 | 37 | ||
1857 | === modified file 'src/ubuntu/common/mirclient/ubuntu_application_api_mirclient.cpp' | |||
1858 | --- src/ubuntu/mirclient/ubuntu_application_api_mirclient.cpp 2014-02-07 14:32:44 +0000 | |||
1859 | +++ src/ubuntu/common/mirclient/ubuntu_application_api_mirclient.cpp 2014-05-02 12:23:55 +0000 | |||
1860 | @@ -86,6 +86,15 @@ | |||
1861 | 86 | extern "C" | 86 | extern "C" |
1862 | 87 | { | 87 | { |
1863 | 88 | 88 | ||
1864 | 89 | void u_application_init(void *args) | ||
1865 | 90 | { | ||
1866 | 91 | (void) args; | ||
1867 | 92 | } | ||
1868 | 93 | |||
1869 | 94 | void u_application_finish() | ||
1870 | 95 | { | ||
1871 | 96 | } | ||
1872 | 97 | |||
1873 | 89 | // TODO<papi>: Eliminate global instance by adding Instance to some functions (i.e. display queries) | 98 | // TODO<papi>: Eliminate global instance by adding Instance to some functions (i.e. display queries) |
1874 | 90 | // TODO: We can't take ownership of description and options until we get rid of the global instance | 99 | // TODO: We can't take ownership of description and options until we get rid of the global instance |
1875 | 91 | // so we leak them. | 100 | // so we leak them. |
1876 | 92 | 101 | ||
1877 | === renamed directory 'src/ubuntu/mircommon' => 'src/ubuntu/common/mircommon' | |||
1878 | === modified file 'src/ubuntu/common/mircommon/CMakeLists.txt' | |||
1879 | --- src/ubuntu/mircommon/CMakeLists.txt 2014-02-17 22:40:09 +0000 | |||
1880 | +++ src/ubuntu/common/mircommon/CMakeLists.txt 2014-05-02 12:23:55 +0000 | |||
1881 | @@ -7,19 +7,6 @@ | |||
1882 | 7 | lifecycle_delegate_mir.cpp | 7 | lifecycle_delegate_mir.cpp |
1883 | 8 | ) | 8 | ) |
1884 | 9 | 9 | ||
1885 | 10 | if(ENABLE_HYBRIS_IMPLEMENTATION) | ||
1886 | 11 | list(APPEND SOURCES | ||
1887 | 12 | ../hybris/ubuntu_application_sensors_hybris.cpp | ||
1888 | 13 | ) | ||
1889 | 14 | list(APPEND LINK_LIBRARIES | ||
1890 | 15 | ${Hybris} | ||
1891 | 16 | ) | ||
1892 | 17 | else() | ||
1893 | 18 | list(APPEND SOURCES | ||
1894 | 19 | ubuntu_application_sensors_desktop.cpp | ||
1895 | 20 | ) | ||
1896 | 21 | endif() | ||
1897 | 22 | |||
1898 | 23 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC --std=c++11") | 10 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC --std=c++11") |
1899 | 24 | 11 | ||
1900 | 25 | include_directories( | 12 | include_directories( |
1901 | @@ -34,6 +21,5 @@ | |||
1902 | 34 | target_link_libraries( | 21 | target_link_libraries( |
1903 | 35 | ubuntu_application_api_mircommon | 22 | ubuntu_application_api_mircommon |
1904 | 36 | 23 | ||
1905 | 37 | ${UBUNTU_APPLICATION_API_LINK_LIBRARIES} | ||
1906 | 38 | ${LINK_LIBRARIES} | 24 | ${LINK_LIBRARIES} |
1907 | 39 | ) | 25 | ) |
1908 | 40 | 26 | ||
1909 | === modified file 'src/ubuntu/common/mircommon/ubuntu_application_sensors_desktop.cpp' | |||
1910 | --- src/ubuntu/mircommon/ubuntu_application_sensors_desktop.cpp 2013-06-05 23:47:51 +0000 | |||
1911 | +++ src/ubuntu/common/mircommon/ubuntu_application_sensors_desktop.cpp 2014-05-02 12:23:55 +0000 | |||
1912 | @@ -46,19 +46,34 @@ | |||
1913 | 46 | return 0; | 46 | return 0; |
1914 | 47 | } | 47 | } |
1915 | 48 | 48 | ||
1929 | 49 | float ua_sensors_accelerometer_get_min_value(UASensorsAccelerometer*) | 49 | UStatus ua_sensors_accelerometer_get_min_value(UASensorsAccelerometer*, float* value) |
1930 | 50 | { | 50 | { |
1931 | 51 | return 0.0; | 51 | if (!value) |
1932 | 52 | } | 52 | return U_STATUS_ERROR; |
1933 | 53 | 53 | ||
1934 | 54 | float ua_sensors_accelerometer_get_max_value(UASensorsAccelerometer*) | 54 | *value = 0.f; |
1935 | 55 | { | 55 | |
1936 | 56 | return 0.0; | 56 | return U_STATUS_SUCCESS; |
1937 | 57 | } | 57 | } |
1938 | 58 | 58 | ||
1939 | 59 | float ua_sensors_accelerometer_get_resolution(UASensorsAccelerometer*) | 59 | UStatus ua_sensors_accelerometer_get_max_value(UASensorsAccelerometer*, float* value) |
1940 | 60 | { | 60 | { |
1941 | 61 | return 0.0; | 61 | if (!value) |
1942 | 62 | return U_STATUS_ERROR; | ||
1943 | 63 | |||
1944 | 64 | *value = 0.f; | ||
1945 | 65 | |||
1946 | 66 | return U_STATUS_SUCCESS; | ||
1947 | 67 | } | ||
1948 | 68 | |||
1949 | 69 | UStatus ua_sensors_accelerometer_get_resolution(UASensorsAccelerometer*, float* value) | ||
1950 | 70 | { | ||
1951 | 71 | if (!value) | ||
1952 | 72 | return U_STATUS_ERROR; | ||
1953 | 73 | |||
1954 | 74 | *value = 0.f; | ||
1955 | 75 | |||
1956 | 76 | return U_STATUS_SUCCESS; | ||
1957 | 62 | } | 77 | } |
1958 | 63 | 78 | ||
1959 | 64 | void ua_sensors_accelerometer_set_reading_cb(UASensorsAccelerometer*, on_accelerometer_event_cb, void*) | 79 | void ua_sensors_accelerometer_set_reading_cb(UASensorsAccelerometer*, on_accelerometer_event_cb, void*) |
1960 | @@ -71,19 +86,34 @@ | |||
1961 | 71 | return 0; | 86 | return 0; |
1962 | 72 | } | 87 | } |
1963 | 73 | 88 | ||
1977 | 74 | float uas_accelerometer_event_get_acceleration_x(UASAccelerometerEvent*) | 89 | UStatus uas_accelerometer_event_get_acceleration_x(UASAccelerometerEvent*, float* value) |
1978 | 75 | { | 90 | { |
1979 | 76 | return 0.0; | 91 | if (!value) |
1980 | 77 | } | 92 | return U_STATUS_ERROR; |
1981 | 78 | 93 | ||
1982 | 79 | float uas_accelerometer_event_get_acceleration_y(UASAccelerometerEvent*) | 94 | *value = 0.f; |
1983 | 80 | { | 95 | |
1984 | 81 | return 0.0; | 96 | return U_STATUS_SUCCESS; |
1985 | 82 | } | 97 | } |
1986 | 83 | 98 | ||
1987 | 84 | float uas_accelerometer_event_get_acceleration_z(UASAccelerometerEvent*) | 99 | UStatus uas_accelerometer_event_get_acceleration_y(UASAccelerometerEvent*, float* value) |
1988 | 85 | { | 100 | { |
1989 | 86 | return 0.0; | 101 | if (!value) |
1990 | 102 | return U_STATUS_ERROR; | ||
1991 | 103 | |||
1992 | 104 | *value = 0.f; | ||
1993 | 105 | |||
1994 | 106 | return U_STATUS_SUCCESS; | ||
1995 | 107 | } | ||
1996 | 108 | |||
1997 | 109 | UStatus uas_accelerometer_event_get_acceleration_z(UASAccelerometerEvent*, float* value) | ||
1998 | 110 | { | ||
1999 | 111 | if (!value) | ||
2000 | 112 | return U_STATUS_ERROR; | ||
2001 | 113 | |||
2002 | 114 | *value = 0.f; | ||
2003 | 115 | |||
2004 | 116 | return U_STATUS_SUCCESS; | ||
2005 | 87 | } | 117 | } |
2006 | 88 | 118 | ||
2007 | 89 | // Proximity Sensor | 119 | // Proximity Sensor |
2008 | @@ -107,19 +137,34 @@ | |||
2009 | 107 | return 0; | 137 | return 0; |
2010 | 108 | } | 138 | } |
2011 | 109 | 139 | ||
2025 | 110 | float ua_sensors_proximity_get_min_value(UASensorsProximity*) | 140 | UStatus ua_sensors_proximity_get_min_value(UASensorsProximity*, float* value) |
2026 | 111 | { | 141 | { |
2027 | 112 | return 0.0; | 142 | if (!value) |
2028 | 113 | } | 143 | return U_STATUS_ERROR; |
2029 | 114 | 144 | ||
2030 | 115 | float ua_sensors_proximity_get_max_value(UASensorsProximity*) | 145 | *value = 0.f; |
2031 | 116 | { | 146 | |
2032 | 117 | return 0.0; | 147 | return U_STATUS_SUCCESS; |
2033 | 118 | } | 148 | } |
2034 | 119 | 149 | ||
2035 | 120 | float ua_sensors_proximity_get_resolution(UASensorsProximity*) | 150 | UStatus ua_sensors_proximity_get_max_value(UASensorsProximity*, float* value) |
2036 | 121 | { | 151 | { |
2037 | 122 | return 0.0; | 152 | if (!value) |
2038 | 153 | return U_STATUS_ERROR; | ||
2039 | 154 | |||
2040 | 155 | *value = 0.f; | ||
2041 | 156 | |||
2042 | 157 | return U_STATUS_SUCCESS; | ||
2043 | 158 | } | ||
2044 | 159 | |||
2045 | 160 | UStatus ua_sensors_proximity_get_resolution(UASensorsProximity*, float* value) | ||
2046 | 161 | { | ||
2047 | 162 | if (!value) | ||
2048 | 163 | return U_STATUS_ERROR; | ||
2049 | 164 | |||
2050 | 165 | *value = 0.f; | ||
2051 | 166 | |||
2052 | 167 | return U_STATUS_SUCCESS; | ||
2053 | 123 | } | 168 | } |
2054 | 124 | 169 | ||
2055 | 125 | void ua_sensors_proximity_set_reading_cb(UASensorsProximity*, on_proximity_event_cb, void*) | 170 | void ua_sensors_proximity_set_reading_cb(UASensorsProximity*, on_proximity_event_cb, void*) |
2056 | @@ -159,19 +204,34 @@ | |||
2057 | 159 | return 0; | 204 | return 0; |
2058 | 160 | } | 205 | } |
2059 | 161 | 206 | ||
2073 | 162 | float ua_sensors_light_get_min_value(UASensorsLight*) | 207 | UStatus ua_sensors_light_get_min_value(UASensorsLight*, float* value) |
2074 | 163 | { | 208 | { |
2075 | 164 | return 0.0; | 209 | if (!value) |
2076 | 165 | } | 210 | return U_STATUS_ERROR; |
2077 | 166 | 211 | ||
2078 | 167 | float ua_sensors_light_get_max_value(UASensorsLight*) | 212 | *value = 0.f; |
2079 | 168 | { | 213 | |
2080 | 169 | return 0.0; | 214 | return U_STATUS_SUCCESS; |
2081 | 170 | } | 215 | } |
2082 | 171 | 216 | ||
2083 | 172 | float ua_sensors_light_get_resolution(UASensorsLight*) | 217 | UStatus ua_sensors_light_get_max_value(UASensorsLight*, float* value) |
2084 | 173 | { | 218 | { |
2085 | 174 | return 0.0; | 219 | if (!value) |
2086 | 220 | return U_STATUS_ERROR; | ||
2087 | 221 | |||
2088 | 222 | *value = 0.f; | ||
2089 | 223 | |||
2090 | 224 | return U_STATUS_SUCCESS; | ||
2091 | 225 | } | ||
2092 | 226 | |||
2093 | 227 | UStatus ua_sensors_light_get_resolution(UASensorsLight*, float* value) | ||
2094 | 228 | { | ||
2095 | 229 | if (!value) | ||
2096 | 230 | return U_STATUS_ERROR; | ||
2097 | 231 | |||
2098 | 232 | *value = 0.f; | ||
2099 | 233 | |||
2100 | 234 | return U_STATUS_SUCCESS; | ||
2101 | 175 | } | 235 | } |
2102 | 176 | 236 | ||
2103 | 177 | void ua_sensors_light_set_reading_cb(UASensorsLight*, on_light_event_cb, void*) | 237 | void ua_sensors_light_set_reading_cb(UASensorsLight*, on_light_event_cb, void*) |
2104 | @@ -184,7 +244,12 @@ | |||
2105 | 184 | return 0; | 244 | return 0; |
2106 | 185 | } | 245 | } |
2107 | 186 | 246 | ||
2109 | 187 | float uas_light_event_get_light(UASLightEvent*) | 247 | UStatus uas_light_event_get_light(UASLightEvent*, float* value) |
2110 | 188 | { | 248 | { |
2112 | 189 | return 0.0; | 249 | if (!value) |
2113 | 250 | return U_STATUS_ERROR; | ||
2114 | 251 | |||
2115 | 252 | *value = 0.f; | ||
2116 | 253 | |||
2117 | 254 | return U_STATUS_SUCCESS; | ||
2118 | 190 | } | 255 | } |
2119 | 191 | 256 | ||
2120 | === renamed directory 'src/ubuntu/mirserver' => 'src/ubuntu/common/mirserver' | |||
2121 | === modified file 'src/ubuntu/common/mirserver/CMakeLists.txt' | |||
2122 | --- src/ubuntu/mirserver/CMakeLists.txt 2014-01-09 18:47:45 +0000 | |||
2123 | +++ src/ubuntu/common/mirserver/CMakeLists.txt 2014-05-02 12:23:55 +0000 | |||
2124 | @@ -7,30 +7,23 @@ | |||
2125 | 7 | 7 | ||
2126 | 8 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC") | 8 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC") |
2127 | 9 | 9 | ||
2128 | 10 | add_library( | ||
2129 | 11 | ubuntu_application_api_mirserver SHARED | ||
2130 | 12 | ${SOURCES} | ||
2131 | 13 | ) | ||
2132 | 14 | |||
2133 | 15 | include_directories( | 10 | include_directories( |
2134 | 16 | ${CMAKE_BINARY_DIR}/include | 11 | ${CMAKE_BINARY_DIR}/include |
2135 | 17 | ${MIRSERVER_INCLUDE_DIRS} | 12 | ${MIRSERVER_INCLUDE_DIRS} |
2136 | 18 | ) | 13 | ) |
2137 | 19 | 14 | ||
2138 | 15 | add_library( | ||
2139 | 16 | ubuntu_application_api_mirserver STATIC | ||
2140 | 17 | ${SOURCES} | ||
2141 | 18 | ) | ||
2142 | 19 | |||
2143 | 20 | #ubuntu_application_api_d_sensors | ||
2144 | 21 | |||
2145 | 20 | target_link_libraries( | 22 | target_link_libraries( |
2146 | 21 | ubuntu_application_api_mirserver | 23 | ubuntu_application_api_mirserver |
2161 | 22 | ${MIRSERVER_LDFLAGS} ${MIRSERVER_LIBRARIES} | 24 | |
2162 | 23 | -Wl,--whole-archive ubuntu_application_api_mircommon ${UBUNTU_APPLICATION_API_LINK_LIBRARIES} | 25 | ${MIRSERVER_LDFLAGS} ${MIRSERVER_LIBRARIES} |
2163 | 24 | -Wl,--no-whole-archive | 26 | # ${MIRCOMMON_LINK} |
2164 | 25 | ) | 27 | ) |
2165 | 26 | 28 | ||
2152 | 27 | |||
2153 | 28 | set_target_properties( | ||
2154 | 29 | ubuntu_application_api_mirserver | ||
2155 | 30 | PROPERTIES | ||
2156 | 31 | VERSION 1.0 | ||
2157 | 32 | SOVERSION 1 | ||
2158 | 33 | ) | ||
2159 | 34 | |||
2160 | 35 | install(TARGETS ubuntu_application_api_mirserver ${INSTALL_TARGETS_DEFAULT_ARGS}) | ||
2166 | 36 | install(FILES ubuntu_application_api_mirserver_priv.h DESTINATION include/ubuntu/application) | 29 | install(FILES ubuntu_application_api_mirserver_priv.h DESTINATION include/ubuntu/application) |
2167 | 37 | 30 | ||
2168 | === modified file 'src/ubuntu/common/mirserver/ubuntu_application_api_mirserver.cpp' | |||
2169 | --- src/ubuntu/mirserver/ubuntu_application_api_mirserver.cpp 2014-04-15 20:23:07 +0000 | |||
2170 | +++ src/ubuntu/common/mirserver/ubuntu_application_api_mirserver.cpp 2014-05-02 12:23:55 +0000 | |||
2171 | @@ -77,19 +77,28 @@ | |||
2172 | 77 | 77 | ||
2173 | 78 | extern "C" | 78 | extern "C" |
2174 | 79 | { | 79 | { |
2176 | 80 | void ua_ui_mirserver_init(mir::DefaultServerConfiguration& config) | 80 | void u_application_init(void *args) |
2177 | 81 | { | 81 | { |
2178 | 82 | mir::DefaultServerConfiguration* config = static_cast<mir::DefaultServerConfiguration*>(args); | ||
2179 | 82 | auto context = global_mirserver_context(); | 83 | auto context = global_mirserver_context(); |
2180 | 83 | 84 | ||
2181 | 85 | <<<<<<< TREE | ||
2182 | 84 | context->display = config.the_display(); | 86 | context->display = config.the_display(); |
2183 | 85 | context->buffer_allocator = config.the_buffer_allocator(); | 87 | context->buffer_allocator = config.the_buffer_allocator(); |
2184 | 86 | context->surface_coordinator = config.the_surface_coordinator(); | 88 | context->surface_coordinator = config.the_surface_coordinator(); |
2185 | 87 | context->session_listener = config.the_session_listener(); | 89 | context->session_listener = config.the_session_listener(); |
2186 | 90 | ======= | ||
2187 | 91 | context->display = config->the_display(); | ||
2188 | 92 | context->buffer_allocator = config->the_buffer_allocator(); | ||
2189 | 93 | context->surface_coordinator = config->the_surface_coordinator(); | ||
2190 | 94 | context->placement_strategy = config->the_shell_placement_strategy(); | ||
2191 | 95 | context->session_listener = config->the_shell_session_listener(); | ||
2192 | 96 | >>>>>>> MERGE-SOURCE | ||
2193 | 88 | context->input_platform = mir::input::receiver::InputPlatform::create(); | 97 | context->input_platform = mir::input::receiver::InputPlatform::create(); |
2195 | 89 | context->egl_client = config.the_graphics_platform()->create_internal_client(); | 98 | context->egl_client = config->the_graphics_platform()->create_internal_client(); |
2196 | 90 | } | 99 | } |
2197 | 91 | 100 | ||
2199 | 92 | void ua_ui_mirserver_finish() | 101 | void u_application_finish() |
2200 | 93 | { | 102 | { |
2201 | 94 | auto context = global_mirserver_context(); | 103 | auto context = global_mirserver_context(); |
2202 | 95 | 104 | ||
2203 | 96 | 105 | ||
2204 | === added directory 'src/ubuntu/desktop' | |||
2205 | === added file 'src/ubuntu/desktop/CMakeLists.txt' | |||
2206 | --- src/ubuntu/desktop/CMakeLists.txt 1970-01-01 00:00:00 +0000 | |||
2207 | +++ src/ubuntu/desktop/CMakeLists.txt 2014-05-02 12:23:55 +0000 | |||
2208 | @@ -0,0 +1,62 @@ | |||
2209 | 1 | add_library( | ||
2210 | 2 | ubuntu_application_api_desktop_mirclient MODULE | ||
2211 | 3 | |||
2212 | 4 | module_version.h | ||
2213 | 5 | ) | ||
2214 | 6 | |||
2215 | 7 | add_library( | ||
2216 | 8 | ubuntu_application_api_desktop_mirserver MODULE | ||
2217 | 9 | |||
2218 | 10 | module_version.h | ||
2219 | 11 | ) | ||
2220 | 12 | |||
2221 | 13 | target_link_libraries( | ||
2222 | 14 | ubuntu_application_api_desktop_mirclient | ||
2223 | 15 | |||
2224 | 16 | "-Wl,--whole-archive" | ||
2225 | 17 | ubuntu_application_api_mirclient | ||
2226 | 18 | ubuntu_application_api_mircommon | ||
2227 | 19 | #TODO: ubuntu_application_api_d_sensors | ||
2228 | 20 | ${UBUNTU_APPLICATION_API_LINK_LIBRARIES} | ||
2229 | 21 | "-Wl,--no-whole-archive" | ||
2230 | 22 | #TODO: Alarms | ||
2231 | 23 | ) | ||
2232 | 24 | |||
2233 | 25 | target_link_libraries( | ||
2234 | 26 | ubuntu_application_api_desktop_mirserver | ||
2235 | 27 | |||
2236 | 28 | "-Wl,--whole-archive" | ||
2237 | 29 | ubuntu_application_api_mirserver | ||
2238 | 30 | ubuntu_application_api_mircommon | ||
2239 | 31 | #TODO: ubuntu_application_api_d_sensors | ||
2240 | 32 | ${UBUNTU_APPLICATION_API_LINK_LIBRARIES} | ||
2241 | 33 | "-Wl,--no-whole-archive" | ||
2242 | 34 | #TODO: Alarms | ||
2243 | 35 | ) | ||
2244 | 36 | |||
2245 | 37 | set_target_properties( | ||
2246 | 38 | ubuntu_application_api_desktop_mirclient | ||
2247 | 39 | PROPERTIES | ||
2248 | 40 | VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH} | ||
2249 | 41 | SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR} | ||
2250 | 42 | ) | ||
2251 | 43 | |||
2252 | 44 | set_target_properties( | ||
2253 | 45 | ubuntu_application_api_desktop_mirserver | ||
2254 | 46 | PROPERTIES | ||
2255 | 47 | VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH} | ||
2256 | 48 | SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR} | ||
2257 | 49 | ) | ||
2258 | 50 | install( | ||
2259 | 51 | TARGETS ubuntu_application_api_desktop_mirclient | ||
2260 | 52 | # this is not a development library to compile against, users should always | ||
2261 | 53 | # specify the SONAME; so don't build a *.so | ||
2262 | 54 | LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP | ||
2263 | 55 | ) | ||
2264 | 56 | |||
2265 | 57 | install( | ||
2266 | 58 | TARGETS ubuntu_application_api_desktop_mirserver | ||
2267 | 59 | # this is not a development library to compile against, users should always | ||
2268 | 60 | # specify the SONAME; so don't build a *.so | ||
2269 | 61 | LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP | ||
2270 | 62 | ) | ||
2271 | 0 | 63 | ||
2272 | === added directory 'src/ubuntu/hardware' | |||
2273 | === modified file 'src/ubuntu/testbackend/ubuntu_application_sensors.cpp' | |||
2274 | --- src/ubuntu/testbackend/ubuntu_application_sensors.cpp 2013-12-12 14:40:21 +0000 | |||
2275 | +++ src/ubuntu/testbackend/ubuntu_application_sensors.cpp 2014-05-02 12:23:55 +0000 | |||
2276 | @@ -375,22 +375,34 @@ | |||
2277 | 375 | return static_cast<TestSensor*>(s)->min_delay; | 375 | return static_cast<TestSensor*>(s)->min_delay; |
2278 | 376 | } | 376 | } |
2279 | 377 | 377 | ||
2296 | 378 | float ua_sensors_accelerometer_get_min_value(UASensorsAccelerometer* s) __SF_FN_ATTR; | 378 | UStatus ua_sensors_accelerometer_get_min_value(UASensorsAccelerometer* s, float* value) |
2297 | 379 | float ua_sensors_accelerometer_get_min_value(UASensorsAccelerometer* s) | 379 | { |
2298 | 380 | { | 380 | if (!value) |
2299 | 381 | return static_cast<TestSensor*>(s)->min_value; | 381 | return U_STATUS_ERROR; |
2300 | 382 | } | 382 | |
2301 | 383 | 383 | *value = static_cast<TestSensor*>(s)->min_value; | |
2302 | 384 | float ua_sensors_accelerometer_get_max_value(UASensorsAccelerometer* s) __SF_FN_ATTR; | 384 | |
2303 | 385 | float ua_sensors_accelerometer_get_max_value(UASensorsAccelerometer* s) | 385 | return U_STATUS_SUCCESS; |
2304 | 386 | { | 386 | } |
2305 | 387 | return static_cast<TestSensor*>(s)->max_value; | 387 | |
2306 | 388 | } | 388 | UStatus ua_sensors_accelerometer_get_max_value(UASensorsAccelerometer* s, float* value) |
2307 | 389 | 389 | { | |
2308 | 390 | float ua_sensors_accelerometer_get_resolution(UASensorsAccelerometer* s) __SF_FN_ATTR; | 390 | if (!value) |
2309 | 391 | float ua_sensors_accelerometer_get_resolution(UASensorsAccelerometer* s) | 391 | return U_STATUS_ERROR; |
2310 | 392 | { | 392 | |
2311 | 393 | return static_cast<TestSensor*>(s)->resolution; | 393 | *value = static_cast<TestSensor*>(s)->max_value; |
2312 | 394 | |||
2313 | 395 | return U_STATUS_SUCCESS; | ||
2314 | 396 | } | ||
2315 | 397 | |||
2316 | 398 | UStatus ua_sensors_accelerometer_get_resolution(UASensorsAccelerometer* s, float* value) | ||
2317 | 399 | { | ||
2318 | 400 | if (!value) | ||
2319 | 401 | return U_STATUS_ERROR; | ||
2320 | 402 | |||
2321 | 403 | *value = static_cast<TestSensor*>(s)->resolution; | ||
2322 | 404 | |||
2323 | 405 | return U_STATUS_SUCCESS; | ||
2324 | 394 | } | 406 | } |
2325 | 395 | 407 | ||
2326 | 396 | void ua_sensors_accelerometer_set_reading_cb(UASensorsAccelerometer* s, on_accelerometer_event_cb cb, void* ctx) | 408 | void ua_sensors_accelerometer_set_reading_cb(UASensorsAccelerometer* s, on_accelerometer_event_cb cb, void* ctx) |
2327 | @@ -405,22 +417,34 @@ | |||
2328 | 405 | return static_cast<TestSensor*>(e)->timestamp; | 417 | return static_cast<TestSensor*>(e)->timestamp; |
2329 | 406 | } | 418 | } |
2330 | 407 | 419 | ||
2347 | 408 | float uas_accelerometer_event_get_acceleration_x(UASAccelerometerEvent* e) __SF_FN_ATTR; | 420 | UStatus uas_accelerometer_event_get_acceleration_x(UASAccelerometerEvent* e, float* value) |
2348 | 409 | float uas_accelerometer_event_get_acceleration_x(UASAccelerometerEvent* e) | 421 | { |
2349 | 410 | { | 422 | if (!value) |
2350 | 411 | return static_cast<TestSensor*>(e)->x; | 423 | return U_STATUS_ERROR; |
2351 | 412 | } | 424 | |
2352 | 413 | 425 | *value = static_cast<TestSensor*>(e)->x; | |
2353 | 414 | float uas_accelerometer_event_get_acceleration_y(UASAccelerometerEvent* e) __SF_FN_ATTR; | 426 | |
2354 | 415 | float uas_accelerometer_event_get_acceleration_y(UASAccelerometerEvent* e) | 427 | return U_STATUS_SUCCESS; |
2355 | 416 | { | 428 | } |
2356 | 417 | return static_cast<TestSensor*>(e)->y; | 429 | |
2357 | 418 | } | 430 | UStatus uas_accelerometer_event_get_acceleration_y(UASAccelerometerEvent* e, float* value) |
2358 | 419 | 431 | { | |
2359 | 420 | float uas_accelerometer_event_get_acceleration_z(UASAccelerometerEvent* e) __SF_FN_ATTR; | 432 | if (!value) |
2360 | 421 | float uas_accelerometer_event_get_acceleration_z(UASAccelerometerEvent* e) | 433 | return U_STATUS_ERROR; |
2361 | 422 | { | 434 | |
2362 | 423 | return static_cast<TestSensor*>(e)->z; | 435 | *value = static_cast<TestSensor*>(e)->y; |
2363 | 436 | |||
2364 | 437 | return U_STATUS_SUCCESS; | ||
2365 | 438 | } | ||
2366 | 439 | |||
2367 | 440 | UStatus uas_accelerometer_event_get_acceleration_z(UASAccelerometerEvent* e, float* value) | ||
2368 | 441 | { | ||
2369 | 442 | if (!value) | ||
2370 | 443 | return U_STATUS_ERROR; | ||
2371 | 444 | |||
2372 | 445 | *value = static_cast<TestSensor*>(e)->z; | ||
2373 | 446 | |||
2374 | 447 | return U_STATUS_SUCCESS; | ||
2375 | 424 | } | 448 | } |
2376 | 425 | 449 | ||
2377 | 426 | /*************************************** | 450 | /*************************************** |
2378 | @@ -452,22 +476,34 @@ | |||
2379 | 452 | } | 476 | } |
2380 | 453 | 477 | ||
2381 | 454 | // the next three function make no sense in the API, just return zero | 478 | // the next three function make no sense in the API, just return zero |
2398 | 455 | float ua_sensors_proximity_get_min_value(UASensorsProximity*) __SF_FN_ATTR; | 479 | UStatus ua_sensors_proximity_get_min_value(UASensorsProximity*, float* value) |
2399 | 456 | float ua_sensors_proximity_get_min_value(UASensorsProximity*) | 480 | { |
2400 | 457 | { | 481 | if (!value) |
2401 | 458 | return 0.0; | 482 | return U_STATUS_ERROR; |
2402 | 459 | } | 483 | |
2403 | 460 | 484 | *value = 0.f; | |
2404 | 461 | float ua_sensors_proximity_get_max_value(UASensorsProximity*) __SF_FN_ATTR; | 485 | |
2405 | 462 | float ua_sensors_proximity_get_max_value(UASensorsProximity*) | 486 | return U_STATUS_SUCCESS; |
2406 | 463 | { | 487 | } |
2407 | 464 | return 0.0; | 488 | |
2408 | 465 | } | 489 | UStatus ua_sensors_proximity_get_max_value(UASensorsProximity*, float* value) |
2409 | 466 | 490 | { | |
2410 | 467 | float ua_sensors_proximity_get_resolution(UASensorsProximity*) __SF_FN_ATTR; | 491 | if (!value) |
2411 | 468 | float ua_sensors_proximity_get_resolution(UASensorsProximity*) | 492 | return U_STATUS_ERROR; |
2412 | 469 | { | 493 | |
2413 | 470 | return 0.0; | 494 | *value = 0.f; |
2414 | 495 | |||
2415 | 496 | return U_STATUS_SUCCESS; | ||
2416 | 497 | } | ||
2417 | 498 | |||
2418 | 499 | UStatus ua_sensors_proximity_get_resolution(UASensorsProximity*, float* value) | ||
2419 | 500 | { | ||
2420 | 501 | if (!value) | ||
2421 | 502 | return U_STATUS_ERROR; | ||
2422 | 503 | |||
2423 | 504 | *value = 0.f; | ||
2424 | 505 | |||
2425 | 506 | return U_STATUS_SUCCESS; | ||
2426 | 471 | } | 507 | } |
2427 | 472 | 508 | ||
2428 | 473 | void ua_sensors_proximity_set_reading_cb(UASensorsProximity* s, on_proximity_event_cb cb, void* ctx) | 509 | void ua_sensors_proximity_set_reading_cb(UASensorsProximity* s, on_proximity_event_cb cb, void* ctx) |
2429 | @@ -516,22 +552,34 @@ | |||
2430 | 516 | return static_cast<TestSensor*>(s)->min_delay; | 552 | return static_cast<TestSensor*>(s)->min_delay; |
2431 | 517 | } | 553 | } |
2432 | 518 | 554 | ||
2449 | 519 | float ua_sensors_light_get_min_value(UASensorsLight* s) __SF_FN_ATTR; | 555 | UStatus ua_sensors_light_get_min_value(UASensorsLight* s, float* value) |
2450 | 520 | float ua_sensors_light_get_min_value(UASensorsLight* s) | 556 | { |
2451 | 521 | { | 557 | if (!value) |
2452 | 522 | return static_cast<TestSensor*>(s)->min_value; | 558 | return U_STATUS_ERROR; |
2453 | 523 | } | 559 | |
2454 | 524 | 560 | *value = static_cast<TestSensor*>(s)->min_value; | |
2455 | 525 | float ua_sensors_light_get_max_value(UASensorsLight* s) __SF_FN_ATTR; | 561 | |
2456 | 526 | float ua_sensors_light_get_max_value(UASensorsLight* s) | 562 | return U_STATUS_SUCCESS; |
2457 | 527 | { | 563 | } |
2458 | 528 | return static_cast<TestSensor*>(s)->max_value; | 564 | |
2459 | 529 | } | 565 | UStatus ua_sensors_light_get_max_value(UASensorsLight* s, float* value) |
2460 | 530 | 566 | { | |
2461 | 531 | float ua_sensors_light_get_resolution(UASensorsLight* s) __SF_FN_ATTR; | 567 | if (!value) |
2462 | 532 | float ua_sensors_light_get_resolution(UASensorsLight* s) | 568 | return U_STATUS_ERROR; |
2463 | 533 | { | 569 | |
2464 | 534 | return static_cast<TestSensor*>(s)->resolution; | 570 | *value = static_cast<TestSensor*>(s)->max_value; |
2465 | 571 | |||
2466 | 572 | return U_STATUS_SUCCESS; | ||
2467 | 573 | } | ||
2468 | 574 | |||
2469 | 575 | UStatus ua_sensors_light_get_resolution(UASensorsLight* s, float* value) | ||
2470 | 576 | { | ||
2471 | 577 | if (!value) | ||
2472 | 578 | return U_STATUS_ERROR; | ||
2473 | 579 | |||
2474 | 580 | *value = static_cast<TestSensor*>(s)->resolution; | ||
2475 | 581 | |||
2476 | 582 | return U_STATUS_SUCCESS; | ||
2477 | 535 | } | 583 | } |
2478 | 536 | 584 | ||
2479 | 537 | void ua_sensors_light_set_reading_cb(UASensorsLight* s, on_light_event_cb cb, void* ctx) | 585 | void ua_sensors_light_set_reading_cb(UASensorsLight* s, on_light_event_cb cb, void* ctx) |
2480 | @@ -546,8 +594,12 @@ | |||
2481 | 546 | return static_cast<TestSensor*>(e)->timestamp; | 594 | return static_cast<TestSensor*>(e)->timestamp; |
2482 | 547 | } | 595 | } |
2483 | 548 | 596 | ||
2486 | 549 | float uas_light_event_get_light(UASLightEvent* e) __SF_FN_ATTR; | 597 | UStatus uas_light_event_get_light(UASLightEvent* e, float* value) |
2485 | 550 | float uas_light_event_get_light(UASLightEvent* e) | ||
2487 | 551 | { | 598 | { |
2489 | 552 | return static_cast<TestSensor*>(e)->x; | 599 | if (!value) |
2490 | 600 | return U_STATUS_ERROR; | ||
2491 | 601 | |||
2492 | 602 | *value = static_cast<TestSensor*>(e)->x; | ||
2493 | 603 | |||
2494 | 604 | return U_STATUS_SUCCESS; | ||
2495 | 553 | } | 605 | } |
2496 | 554 | 606 | ||
2497 | === added directory 'src/ubuntu/touch' | |||
2498 | === added file 'src/ubuntu/touch/CMakeLists.txt' | |||
2499 | --- src/ubuntu/touch/CMakeLists.txt 1970-01-01 00:00:00 +0000 | |||
2500 | +++ src/ubuntu/touch/CMakeLists.txt 2014-05-02 12:23:55 +0000 | |||
2501 | @@ -0,0 +1,64 @@ | |||
2502 | 1 | add_subdirectory(hybris) | ||
2503 | 2 | |||
2504 | 3 | add_library( | ||
2505 | 4 | ubuntu_application_api_touch_mirclient MODULE | ||
2506 | 5 | |||
2507 | 6 | module_version.h | ||
2508 | 7 | ) | ||
2509 | 8 | |||
2510 | 9 | add_library( | ||
2511 | 10 | ubuntu_application_api_touch_mirserver MODULE | ||
2512 | 11 | |||
2513 | 12 | module_version.h | ||
2514 | 13 | ) | ||
2515 | 14 | |||
2516 | 15 | target_link_libraries( | ||
2517 | 16 | ubuntu_application_api_touch_mirclient | ||
2518 | 17 | |||
2519 | 18 | "-Wl,--whole-archive" | ||
2520 | 19 | ubuntu_application_api_mirclient | ||
2521 | 20 | ubuntu_application_api_mircommon | ||
2522 | 21 | ubuntu_application_api_hybris | ||
2523 | 22 | ${UBUNTU_APPLICATION_API_LINK_LIBRARIES} | ||
2524 | 23 | "-Wl,--no-whole-archive" | ||
2525 | 24 | #TODO: Alarms | ||
2526 | 25 | ) | ||
2527 | 26 | |||
2528 | 27 | target_link_libraries( | ||
2529 | 28 | ubuntu_application_api_touch_mirserver | ||
2530 | 29 | |||
2531 | 30 | "-Wl,--whole-archive" | ||
2532 | 31 | ubuntu_application_api_mirserver | ||
2533 | 32 | ubuntu_application_api_mircommon | ||
2534 | 33 | ubuntu_application_api_hybris | ||
2535 | 34 | ${UBUNTU_APPLICATION_API_LINK_LIBRARIES} | ||
2536 | 35 | "-Wl,--no-whole-archive" | ||
2537 | 36 | #TODO: Alarms | ||
2538 | 37 | ) | ||
2539 | 38 | |||
2540 | 39 | set_target_properties( | ||
2541 | 40 | ubuntu_application_api_touch_mirclient | ||
2542 | 41 | PROPERTIES | ||
2543 | 42 | VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH} | ||
2544 | 43 | SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR} | ||
2545 | 44 | ) | ||
2546 | 45 | |||
2547 | 46 | set_target_properties( | ||
2548 | 47 | ubuntu_application_api_touch_mirserver | ||
2549 | 48 | PROPERTIES | ||
2550 | 49 | VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH} | ||
2551 | 50 | SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR} | ||
2552 | 51 | ) | ||
2553 | 52 | install( | ||
2554 | 53 | TARGETS ubuntu_application_api_touch_mirclient | ||
2555 | 54 | # this is not a development library to compile against, users should always | ||
2556 | 55 | # specify the SONAME; so don't build a *.so | ||
2557 | 56 | LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP | ||
2558 | 57 | ) | ||
2559 | 58 | |||
2560 | 59 | install( | ||
2561 | 60 | TARGETS ubuntu_application_api_touch_mirserver | ||
2562 | 61 | # this is not a development library to compile against, users should always | ||
2563 | 62 | # specify the SONAME; so don't build a *.so | ||
2564 | 63 | LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP | ||
2565 | 64 | ) | ||
2566 | 0 | 65 | ||
2567 | === renamed directory 'src/ubuntu/hybris' => 'src/ubuntu/touch/hybris' | |||
2568 | === modified file 'src/ubuntu/touch/hybris/CMakeLists.txt' | |||
2569 | --- src/ubuntu/hybris/CMakeLists.txt 2014-02-12 07:35:37 +0000 | |||
2570 | +++ src/ubuntu/touch/hybris/CMakeLists.txt 2014-05-02 12:23:55 +0000 | |||
2571 | @@ -1,30 +1,27 @@ | |||
2573 | 1 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11") | 1 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC") |
2574 | 2 | 2 | ||
2575 | 3 | add_library( | 3 | add_library( |
2579 | 4 | ubuntu_application_api SHARED | 4 | ubuntu_application_api_hybris STATIC |
2580 | 5 | 5 | ||
2581 | 6 | ubuntu_application_api_hybris.cpp | 6 | #ubuntu_application_api_hybris.cpp |
2582 | 7 | ubuntu_application_sensors_hybris.cpp | 7 | ubuntu_application_sensors_hybris.cpp |
2583 | 8 | ) | 8 | ) |
2584 | 9 | 9 | ||
2585 | 10 | include_directories( | ||
2586 | 11 | ${CMAKE_BINARY_DIR}/include | ||
2587 | 12 | ) | ||
2588 | 13 | |||
2589 | 14 | target_link_libraries( | ||
2590 | 15 | ubuntu_application_api_hybris | ||
2591 | 16 | |||
2592 | 17 | ${Hybris} | ||
2593 | 18 | ) | ||
2594 | 19 | |||
2595 | 10 | add_library( | 20 | add_library( |
2596 | 11 | ubuntu_platform_hardware_api SHARED | 21 | ubuntu_platform_hardware_api SHARED |
2597 | 12 | ubuntu_platform_hardware_api.cpp | 22 | ubuntu_platform_hardware_api.cpp |
2598 | 13 | ) | 23 | ) |
2599 | 14 | 24 | ||
2600 | 15 | include_directories( | ||
2601 | 16 | ${CMAKE_BINARY_DIR}/include | ||
2602 | 17 | ) | ||
2603 | 18 | |||
2604 | 19 | target_link_libraries( | ||
2605 | 20 | ubuntu_application_api | ||
2606 | 21 | |||
2607 | 22 | "-Wl,--whole-archive" | ||
2608 | 23 | ${UBUNTU_APPLICATION_API_LINK_LIBRARIES} | ||
2609 | 24 | "-Wl,--no-whole-archive" | ||
2610 | 25 | ${Hybris} | ||
2611 | 26 | ) | ||
2612 | 27 | |||
2613 | 28 | target_link_libraries( | 25 | target_link_libraries( |
2614 | 29 | ubuntu_platform_hardware_api | 26 | ubuntu_platform_hardware_api |
2615 | 30 | dl | 27 | dl |
2616 | @@ -32,13 +29,6 @@ | |||
2617 | 32 | ) | 29 | ) |
2618 | 33 | 30 | ||
2619 | 34 | set_target_properties( | 31 | set_target_properties( |
2620 | 35 | ubuntu_application_api | ||
2621 | 36 | PROPERTIES | ||
2622 | 37 | VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH} | ||
2623 | 38 | SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR} | ||
2624 | 39 | ) | ||
2625 | 40 | |||
2626 | 41 | set_target_properties( | ||
2627 | 42 | ubuntu_platform_hardware_api | 32 | ubuntu_platform_hardware_api |
2628 | 43 | PROPERTIES | 33 | PROPERTIES |
2629 | 44 | VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH} | 34 | VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH} |
2630 | @@ -46,13 +36,8 @@ | |||
2631 | 46 | ) | 36 | ) |
2632 | 47 | 37 | ||
2633 | 48 | install( | 38 | install( |
2634 | 49 | TARGETS ubuntu_application_api | ||
2635 | 50 | ${INSTALL_TARGETS_DEFAULT_ARGS} | ||
2636 | 51 | ) | ||
2637 | 52 | |||
2638 | 53 | install( | ||
2639 | 54 | TARGETS ubuntu_platform_hardware_api | 39 | TARGETS ubuntu_platform_hardware_api |
2640 | 55 | ${INSTALL_TARGETS_DEFAULT_ARGS} | 40 | ${INSTALL_TARGETS_DEFAULT_ARGS} |
2641 | 56 | ) | 41 | ) |
2642 | 57 | 42 | ||
2644 | 58 | add_subdirectory(tests/) | 43 | #add_subdirectory(tests/) |
2645 | 59 | 44 | ||
2646 | === modified file 'src/ubuntu/touch/hybris/bridge.h' | |||
2647 | --- src/ubuntu/hybris/bridge.h 2014-02-21 13:07:33 +0000 | |||
2648 | +++ src/ubuntu/touch/hybris/bridge.h 2014-05-02 12:23:55 +0000 | |||
2649 | @@ -53,7 +53,7 @@ | |||
2650 | 53 | static const char* cache = NULL; | 53 | static const char* cache = NULL; |
2651 | 54 | 54 | ||
2652 | 55 | if (cache == NULL) { | 55 | if (cache == NULL) { |
2654 | 56 | cache = secure_getenv("UBUNTU_PLATFORM_API_BACKEND"); | 56 | cache = secure_getenv("UBUNTU_PLATFORM_API_SENSORS_BACKEND"); |
2655 | 57 | if (cache == NULL) | 57 | if (cache == NULL) |
2656 | 58 | cache = "/system/lib/libubuntu_application_api.so"; | 58 | cache = "/system/lib/libubuntu_application_api.so"; |
2657 | 59 | } | 59 | } |
2658 | @@ -143,22 +143,6 @@ | |||
2659 | 143 | DLSYM(&f, #symbol); \ | 143 | DLSYM(&f, #symbol); \ |
2660 | 144 | return f(_1); } | 144 | return f(_1); } |
2661 | 145 | 145 | ||
2662 | 146 | // pcs attribute (calling convention) is only defined on ARM, avoid warning on | ||
2663 | 147 | // other platforms | ||
2664 | 148 | #ifdef __arm__ | ||
2665 | 149 | #define __SF_FN_ATTR __attribute__((pcs("aapcs"))) | ||
2666 | 150 | #else | ||
2667 | 151 | #define __SF_FN_ATTR | ||
2668 | 152 | #endif | ||
2669 | 153 | |||
2670 | 154 | #define IMPLEMENT_SF_FUNCTION1(return_type, symbol, arg1) \ | ||
2671 | 155 | return_type symbol(arg1 _1) \ | ||
2672 | 156 | { \ | ||
2673 | 157 | static return_type (*f)(arg1) __SF_FN_ATTR = NULL; \ | ||
2674 | 158 | DLSYM(&f, #symbol); \ | ||
2675 | 159 | return f(_1); } | ||
2676 | 160 | |||
2677 | 161 | |||
2678 | 162 | #define IMPLEMENT_VOID_FUNCTION1(symbol, arg1) \ | 146 | #define IMPLEMENT_VOID_FUNCTION1(symbol, arg1) \ |
2679 | 163 | void symbol(arg1 _1) \ | 147 | void symbol(arg1 _1) \ |
2680 | 164 | { \ | 148 | { \ |
2681 | 165 | 149 | ||
2682 | === modified file 'src/ubuntu/touch/hybris/tests/CMakeLists.txt' | |||
2683 | --- src/ubuntu/hybris/tests/CMakeLists.txt 2013-08-17 05:22:31 +0000 | |||
2684 | +++ src/ubuntu/touch/hybris/tests/CMakeLists.txt 2014-05-02 12:23:55 +0000 | |||
2685 | @@ -12,18 +12,18 @@ | |||
2686 | 12 | add_executable(test_android_sensors_api test_sensors_api.cpp) | 12 | add_executable(test_android_sensors_api test_sensors_api.cpp) |
2687 | 13 | target_link_libraries(test_android_sensors_api ubuntu_application_api) | 13 | target_link_libraries(test_android_sensors_api ubuntu_application_api) |
2688 | 14 | 14 | ||
2689 | 15 | add_executable(test_android_ubuntu_session_api test_session_c_api.cpp) | ||
2690 | 16 | target_link_libraries(test_android_ubuntu_session_api ubuntu_application_api) | ||
2691 | 17 | |||
2692 | 18 | add_executable(test_ubuntu_app_api_location_service test_location_api.cpp) | 15 | add_executable(test_ubuntu_app_api_location_service test_location_api.cpp) |
2693 | 19 | target_link_libraries(test_ubuntu_app_api_location_service ubuntu_application_api) | 16 | target_link_libraries(test_ubuntu_app_api_location_service ubuntu_application_api) |
2694 | 20 | 17 | ||
2695 | 18 | add_executable(test_hardware_alarms_api test_alarms_api.cpp) | ||
2696 | 19 | target_link_libraries(test_hardware_alarms_api ubuntu_platform_hardware_api) | ||
2697 | 20 | |||
2698 | 21 | install(TARGETS | 21 | install(TARGETS |
2699 | 22 | test_android_ubuntu_app_api | 22 | test_android_ubuntu_app_api |
2700 | 23 | test_android_gps_api | 23 | test_android_gps_api |
2701 | 24 | test_android_ubuntu_app_api_multiple_surfaces | 24 | test_android_ubuntu_app_api_multiple_surfaces |
2702 | 25 | test_android_sensors_api | 25 | test_android_sensors_api |
2703 | 26 | test_android_ubuntu_session_api | ||
2704 | 27 | test_ubuntu_app_api_location_service | 26 | test_ubuntu_app_api_location_service |
2705 | 27 | test_hardware_alarms_api | ||
2706 | 28 | DESTINATION bin | 28 | DESTINATION bin |
2707 | 29 | ) | 29 | ) |
2708 | 30 | 30 | ||
2709 | === added file 'src/ubuntu/touch/hybris/tests/test_alarms_api.cpp' | |||
2710 | --- src/ubuntu/touch/hybris/tests/test_alarms_api.cpp 1970-01-01 00:00:00 +0000 | |||
2711 | +++ src/ubuntu/touch/hybris/tests/test_alarms_api.cpp 2014-05-02 12:23:55 +0000 | |||
2712 | @@ -0,0 +1,62 @@ | |||
2713 | 1 | /* | ||
2714 | 2 | * Copyright © 2013 Canonical Ltd. | ||
2715 | 3 | * | ||
2716 | 4 | * This program is free software: you can redistribute it and/or modify | ||
2717 | 5 | * it under the terms of the GNU General Public License version 3 as | ||
2718 | 6 | * published by the Free Software Foundation. | ||
2719 | 7 | * | ||
2720 | 8 | * This program is distributed in the hope that it will be useful, | ||
2721 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
2722 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
2723 | 11 | * GNU General Public License for more details. | ||
2724 | 12 | * | ||
2725 | 13 | * You should have received a copy of the GNU General Public License | ||
2726 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
2727 | 15 | * | ||
2728 | 16 | * Authored by: Thomas Voß <thomas.voss@canonicalcom> | ||
2729 | 17 | */ | ||
2730 | 18 | |||
2731 | 19 | #include <ubuntu/hardware/alarm.h> | ||
2732 | 20 | |||
2733 | 21 | #include <cstdio> | ||
2734 | 22 | #include <ctime> | ||
2735 | 23 | |||
2736 | 24 | int main(int argc, char** argv) | ||
2737 | 25 | { | ||
2738 | 26 | UHardwareAlarm alarm = u_hardware_alarm_create(); | ||
2739 | 27 | |||
2740 | 28 | if (!alarm) | ||
2741 | 29 | { | ||
2742 | 30 | printf("Error creating handle to hardware alarms.\n"); | ||
2743 | 31 | return 1; | ||
2744 | 32 | } | ||
2745 | 33 | |||
2746 | 34 | // Alarm in two seconds. | ||
2747 | 35 | timespec ts { 2, 0 }; | ||
2748 | 36 | |||
2749 | 37 | |||
2750 | 38 | UStatus rc = u_hardware_alarm_set_relative_to_with_behavior( | ||
2751 | 39 | alarm, | ||
2752 | 40 | U_HARDWARE_ALARM_TIME_REFERENCE_NOW, | ||
2753 | 41 | U_HARDWARE_ALARM_SLEEP_BEHAVIOR_WAKEUP_DEVICE, | ||
2754 | 42 | &ts); | ||
2755 | 43 | |||
2756 | 44 | if (rc != U_STATUS_SUCCESS) | ||
2757 | 45 | { | ||
2758 | 46 | printf("Problem setting hardware alarm.\n"); | ||
2759 | 47 | return 1; | ||
2760 | 48 | } | ||
2761 | 49 | |||
2762 | 50 | UHardwareAlarmWaitResult wait_result; | ||
2763 | 51 | rc = u_hardware_alarm_wait_for_next_alarm(alarm, &wait_result); | ||
2764 | 52 | |||
2765 | 53 | if (rc != U_STATUS_SUCCESS) | ||
2766 | 54 | { | ||
2767 | 55 | printf("Problem waiting for hardware alarm to go off.\n"); | ||
2768 | 56 | return 1; | ||
2769 | 57 | } | ||
2770 | 58 | |||
2771 | 59 | printf("Successfully created and waited for a hw alarm.\n"); | ||
2772 | 60 | |||
2773 | 61 | return 0; | ||
2774 | 62 | } | ||
2775 | 0 | 63 | ||
2776 | === modified file 'src/ubuntu/touch/hybris/tests/test_sensors_api.cpp' | |||
2777 | --- src/ubuntu/hybris/tests/test_sensors_api.cpp 2013-12-03 07:10:43 +0000 | |||
2778 | +++ src/ubuntu/touch/hybris/tests/test_sensors_api.cpp 2014-05-02 12:23:55 +0000 | |||
2779 | @@ -28,11 +28,15 @@ | |||
2780 | 28 | 28 | ||
2781 | 29 | void on_new_accelerometer_event(UASAccelerometerEvent* event, void* context) | 29 | void on_new_accelerometer_event(UASAccelerometerEvent* event, void* context) |
2782 | 30 | { | 30 | { |
2783 | 31 | float x; uas_accelerometer_event_get_acceleration_x(event, &x); | ||
2784 | 32 | float y; uas_accelerometer_event_get_acceleration_y(event, &y); | ||
2785 | 33 | float z; uas_accelerometer_event_get_acceleration_z(event, &z); | ||
2786 | 34 | |||
2787 | 31 | printf("%s \n", __PRETTY_FUNCTION__); | 35 | printf("%s \n", __PRETTY_FUNCTION__); |
2788 | 32 | printf("\ttime: %" PRIu64 "\n", uas_accelerometer_event_get_timestamp(event)); | 36 | printf("\ttime: %" PRIu64 "\n", uas_accelerometer_event_get_timestamp(event)); |
2792 | 33 | printf("\tx: %f\n", uas_accelerometer_event_get_acceleration_x(event)); | 37 | printf("\tx: %f\n", x); |
2793 | 34 | printf("\ty: %f\n", uas_accelerometer_event_get_acceleration_y(event)); | 38 | printf("\ty: %f\n", y); |
2794 | 35 | printf("\tz: %f\n", uas_accelerometer_event_get_acceleration_z(event)); | 39 | printf("\tz: %f\n", z); |
2795 | 36 | } | 40 | } |
2796 | 37 | 41 | ||
2797 | 38 | void on_new_proximity_event(UASProximityEvent* event, void* context) | 42 | void on_new_proximity_event(UASProximityEvent* event, void* context) |
2798 | @@ -57,9 +61,11 @@ | |||
2799 | 57 | 61 | ||
2800 | 58 | void on_new_light_event(UASLightEvent* event, void* context) | 62 | void on_new_light_event(UASLightEvent* event, void* context) |
2801 | 59 | { | 63 | { |
2802 | 64 | float light = -1.f; uas_light_event_get_light(event, &light); | ||
2803 | 65 | |||
2804 | 60 | printf("%s \n", __PRETTY_FUNCTION__); | 66 | printf("%s \n", __PRETTY_FUNCTION__); |
2805 | 61 | printf("\ttime: %" PRIu64 "\n", uas_light_event_get_timestamp(event)); | 67 | printf("\ttime: %" PRIu64 "\n", uas_light_event_get_timestamp(event)); |
2807 | 62 | printf("\tlight: %f\n", uas_light_event_get_light(event)); | 68 | printf("\tlight: %f\n", light); |
2808 | 63 | } | 69 | } |
2809 | 64 | 70 | ||
2810 | 65 | int main(int argc, char** argv) | 71 | int main(int argc, char** argv) |
2811 | 66 | 72 | ||
2812 | === modified file 'src/ubuntu/touch/hybris/ubuntu_application_sensors_hybris.cpp' | |||
2813 | --- src/ubuntu/hybris/ubuntu_application_sensors_hybris.cpp 2014-02-05 09:26:23 +0000 | |||
2814 | +++ src/ubuntu/touch/hybris/ubuntu_application_sensors_hybris.cpp 2014-05-02 12:23:55 +0000 | |||
2815 | @@ -30,25 +30,25 @@ | |||
2816 | 30 | IMPLEMENT_FUNCTION1(UStatus, ua_sensors_accelerometer_enable, UASensorsAccelerometer*); | 30 | IMPLEMENT_FUNCTION1(UStatus, ua_sensors_accelerometer_enable, UASensorsAccelerometer*); |
2817 | 31 | IMPLEMENT_FUNCTION1(UStatus, ua_sensors_accelerometer_disable, UASensorsAccelerometer*); | 31 | IMPLEMENT_FUNCTION1(UStatus, ua_sensors_accelerometer_disable, UASensorsAccelerometer*); |
2818 | 32 | IMPLEMENT_FUNCTION1(uint32_t, ua_sensors_accelerometer_get_min_delay, UASensorsAccelerometer*); | 32 | IMPLEMENT_FUNCTION1(uint32_t, ua_sensors_accelerometer_get_min_delay, UASensorsAccelerometer*); |
2822 | 33 | IMPLEMENT_SF_FUNCTION1(float, ua_sensors_accelerometer_get_min_value, UASensorsAccelerometer*); | 33 | IMPLEMENT_FUNCTION2(UStatus, ua_sensors_accelerometer_get_min_value, UASensorsAccelerometer*, float*); |
2823 | 34 | IMPLEMENT_SF_FUNCTION1(float, ua_sensors_accelerometer_get_max_value, UASensorsAccelerometer*); | 34 | IMPLEMENT_FUNCTION2(UStatus, ua_sensors_accelerometer_get_max_value, UASensorsAccelerometer*, float*); |
2824 | 35 | IMPLEMENT_SF_FUNCTION1(float, ua_sensors_accelerometer_get_resolution, UASensorsAccelerometer*); | 35 | IMPLEMENT_FUNCTION2(UStatus, ua_sensors_accelerometer_get_resolution, UASensorsAccelerometer*, float*); |
2825 | 36 | IMPLEMENT_VOID_FUNCTION3(ua_sensors_accelerometer_set_reading_cb, UASensorsAccelerometer*, on_accelerometer_event_cb, void*); | 36 | IMPLEMENT_VOID_FUNCTION3(ua_sensors_accelerometer_set_reading_cb, UASensorsAccelerometer*, on_accelerometer_event_cb, void*); |
2826 | 37 | 37 | ||
2827 | 38 | // Acceleration Sensor Event | 38 | // Acceleration Sensor Event |
2828 | 39 | IMPLEMENT_FUNCTION1(uint64_t, uas_accelerometer_event_get_timestamp, UASAccelerometerEvent*); | 39 | IMPLEMENT_FUNCTION1(uint64_t, uas_accelerometer_event_get_timestamp, UASAccelerometerEvent*); |
2832 | 40 | IMPLEMENT_SF_FUNCTION1(float, uas_accelerometer_event_get_acceleration_x, UASAccelerometerEvent*); | 40 | IMPLEMENT_FUNCTION2(UStatus, uas_accelerometer_event_get_acceleration_x, UASAccelerometerEvent*, float*); |
2833 | 41 | IMPLEMENT_SF_FUNCTION1(float, uas_accelerometer_event_get_acceleration_y, UASAccelerometerEvent*); | 41 | IMPLEMENT_FUNCTION2(UStatus, uas_accelerometer_event_get_acceleration_y, UASAccelerometerEvent*, float*); |
2834 | 42 | IMPLEMENT_SF_FUNCTION1(float, uas_accelerometer_event_get_acceleration_z, UASAccelerometerEvent*); | 42 | IMPLEMENT_FUNCTION2(UStatus, uas_accelerometer_event_get_acceleration_z, UASAccelerometerEvent*, float*); |
2835 | 43 | 43 | ||
2836 | 44 | // Proximity Sensor | 44 | // Proximity Sensor |
2837 | 45 | IMPLEMENT_CTOR0(UASensorsProximity*, ua_sensors_proximity_new); | 45 | IMPLEMENT_CTOR0(UASensorsProximity*, ua_sensors_proximity_new); |
2838 | 46 | IMPLEMENT_FUNCTION1(UStatus, ua_sensors_proximity_enable, UASensorsProximity*); | 46 | IMPLEMENT_FUNCTION1(UStatus, ua_sensors_proximity_enable, UASensorsProximity*); |
2839 | 47 | IMPLEMENT_FUNCTION1(UStatus, ua_sensors_proximity_disable, UASensorsProximity*); | 47 | IMPLEMENT_FUNCTION1(UStatus, ua_sensors_proximity_disable, UASensorsProximity*); |
2840 | 48 | IMPLEMENT_FUNCTION1(uint32_t, ua_sensors_proximity_get_min_delay, UASensorsProximity*); | 48 | IMPLEMENT_FUNCTION1(uint32_t, ua_sensors_proximity_get_min_delay, UASensorsProximity*); |
2844 | 49 | IMPLEMENT_SF_FUNCTION1(float, ua_sensors_proximity_get_min_value, UASensorsProximity*); | 49 | IMPLEMENT_FUNCTION2(UStatus, ua_sensors_proximity_get_min_value, UASensorsProximity*, float*); |
2845 | 50 | IMPLEMENT_SF_FUNCTION1(float, ua_sensors_proximity_get_max_value, UASensorsProximity*); | 50 | IMPLEMENT_FUNCTION2(UStatus, ua_sensors_proximity_get_max_value, UASensorsProximity*, float*); |
2846 | 51 | IMPLEMENT_SF_FUNCTION1(float, ua_sensors_proximity_get_resolution, UASensorsProximity*); | 51 | IMPLEMENT_FUNCTION2(UStatus, ua_sensors_proximity_get_resolution, UASensorsProximity*, float*); |
2847 | 52 | IMPLEMENT_VOID_FUNCTION3(ua_sensors_proximity_set_reading_cb, UASensorsProximity*, on_proximity_event_cb, void*); | 52 | IMPLEMENT_VOID_FUNCTION3(ua_sensors_proximity_set_reading_cb, UASensorsProximity*, on_proximity_event_cb, void*); |
2848 | 53 | 53 | ||
2849 | 54 | // Proximity Sensor Event | 54 | // Proximity Sensor Event |
2850 | @@ -60,11 +60,11 @@ | |||
2851 | 60 | IMPLEMENT_FUNCTION1(UStatus, ua_sensors_light_enable, UASensorsLight*); | 60 | IMPLEMENT_FUNCTION1(UStatus, ua_sensors_light_enable, UASensorsLight*); |
2852 | 61 | IMPLEMENT_FUNCTION1(UStatus, ua_sensors_light_disable, UASensorsLight*); | 61 | IMPLEMENT_FUNCTION1(UStatus, ua_sensors_light_disable, UASensorsLight*); |
2853 | 62 | IMPLEMENT_FUNCTION1(uint32_t, ua_sensors_light_get_min_delay, UASensorsLight*); | 62 | IMPLEMENT_FUNCTION1(uint32_t, ua_sensors_light_get_min_delay, UASensorsLight*); |
2857 | 63 | IMPLEMENT_SF_FUNCTION1(float, ua_sensors_light_get_min_value, UASensorsLight*); | 63 | IMPLEMENT_FUNCTION2(UStatus, ua_sensors_light_get_min_value, UASensorsLight*, float*); |
2858 | 64 | IMPLEMENT_SF_FUNCTION1(float, ua_sensors_light_get_max_value, UASensorsLight*); | 64 | IMPLEMENT_FUNCTION2(UStatus, ua_sensors_light_get_max_value, UASensorsLight*, float*); |
2859 | 65 | IMPLEMENT_SF_FUNCTION1(float, ua_sensors_light_get_resolution, UASensorsLight*); | 65 | IMPLEMENT_FUNCTION2(UStatus, ua_sensors_light_get_resolution, UASensorsLight*, float*); |
2860 | 66 | IMPLEMENT_VOID_FUNCTION3(ua_sensors_light_set_reading_cb, UASensorsLight*, on_light_event_cb, void*); | 66 | IMPLEMENT_VOID_FUNCTION3(ua_sensors_light_set_reading_cb, UASensorsLight*, on_light_event_cb, void*); |
2861 | 67 | 67 | ||
2862 | 68 | // Ambient Light Sensor Event | 68 | // Ambient Light Sensor Event |
2863 | 69 | IMPLEMENT_FUNCTION1(uint64_t, uas_light_event_get_timestamp, UASLightEvent*); | 69 | IMPLEMENT_FUNCTION1(uint64_t, uas_light_event_get_timestamp, UASLightEvent*); |
2865 | 70 | IMPLEMENT_SF_FUNCTION1(float, uas_light_event_get_light, UASLightEvent*); | 70 | IMPLEMENT_FUNCTION2(UStatus, uas_light_event_get_light, UASLightEvent*, float*); |
2866 | 71 | 71 | ||
2867 | === modified file 'src/ubuntu/touch/hybris/ubuntu_platform_hardware_api.cpp' | |||
2868 | --- src/ubuntu/hybris/ubuntu_platform_hardware_api.cpp 2013-06-13 08:37:52 +0000 | |||
2869 | +++ src/ubuntu/touch/hybris/ubuntu_platform_hardware_api.cpp 2014-05-02 12:23:55 +0000 | |||
2870 | @@ -18,6 +18,7 @@ | |||
2871 | 18 | */ | 18 | */ |
2872 | 19 | 19 | ||
2873 | 20 | // C APIs | 20 | // C APIs |
2874 | 21 | #include <ubuntu/hardware/alarm.h> | ||
2875 | 21 | #include <ubuntu/hardware/gps.h> | 22 | #include <ubuntu/hardware/gps.h> |
2876 | 22 | 23 | ||
2877 | 23 | #include "bridge.h" | 24 | #include "bridge.h" |
2878 | @@ -76,3 +77,37 @@ | |||
2879 | 76 | UHardwareGps, | 77 | UHardwareGps, |
2880 | 77 | char*, | 78 | char*, |
2881 | 78 | int); | 79 | int); |
2882 | 80 | |||
2883 | 81 | /****************** HW ALARMS API ******************/ | ||
2884 | 82 | |||
2885 | 83 | IMPLEMENT_CTOR0( | ||
2886 | 84 | UHardwareAlarm, | ||
2887 | 85 | u_hardware_alarm_create); | ||
2888 | 86 | |||
2889 | 87 | IMPLEMENT_VOID_FUNCTION1( | ||
2890 | 88 | u_hardware_alarm_ref, | ||
2891 | 89 | UHardwareAlarm); | ||
2892 | 90 | |||
2893 | 91 | IMPLEMENT_VOID_FUNCTION1( | ||
2894 | 92 | u_hardware_alarm_unref, | ||
2895 | 93 | UHardwareAlarm); | ||
2896 | 94 | |||
2897 | 95 | IMPLEMENT_FUNCTION2( | ||
2898 | 96 | UStatus, | ||
2899 | 97 | u_hardware_alarm_set_timezone, | ||
2900 | 98 | UHardwareAlarm, | ||
2901 | 99 | const struct timezone*); | ||
2902 | 100 | |||
2903 | 101 | IMPLEMENT_FUNCTION4( | ||
2904 | 102 | UStatus, | ||
2905 | 103 | u_hardware_alarm_set_relative_to_with_behavior, | ||
2906 | 104 | UHardwareAlarm, | ||
2907 | 105 | UHardwareAlarmTimeReference, | ||
2908 | 106 | UHardwareAlarmSleepBehavior, | ||
2909 | 107 | const struct timespec*); | ||
2910 | 108 | |||
2911 | 109 | IMPLEMENT_FUNCTION2( | ||
2912 | 110 | UStatus, | ||
2913 | 111 | u_hardware_alarm_wait_for_next_alarm, | ||
2914 | 112 | UHardwareAlarm, | ||
2915 | 113 | UHardwareAlarmWaitResult*); | ||
2916 | 79 | 114 | ||
2917 | === modified file 'tests/test_ubuntu_application_sensors.cpp' | |||
2918 | --- tests/test_ubuntu_application_sensors.cpp 2014-02-07 12:24:32 +0000 | |||
2919 | +++ tests/test_ubuntu_application_sensors.cpp 2014-05-02 12:23:55 +0000 | |||
2920 | @@ -65,7 +65,7 @@ | |||
2921 | 65 | abort(); | 65 | abort(); |
2922 | 66 | } | 66 | } |
2923 | 67 | setenv("UBUNTU_PLATFORM_API_SENSOR_TEST", data_file, 1); | 67 | setenv("UBUNTU_PLATFORM_API_SENSOR_TEST", data_file, 1); |
2925 | 68 | setenv("UBUNTU_PLATFORM_API_BACKEND", "libubuntu_application_api_test.so.1", 1); | 68 | setenv("UBUNTU_PLATFORM_API_SENSORS_BACKEND", "libubuntu_application_api_test.so.1", 1); |
2926 | 69 | 69 | ||
2927 | 70 | // ensure the queue is clear | 70 | // ensure the queue is clear |
2928 | 71 | while (events.size() > 0) | 71 | while (events.size() > 0) |
2929 | @@ -110,9 +110,14 @@ | |||
2930 | 110 | 110 | ||
2931 | 111 | UASensorsAccelerometer *s = ua_sensors_accelerometer_new(); | 111 | UASensorsAccelerometer *s = ua_sensors_accelerometer_new(); |
2932 | 112 | EXPECT_TRUE(s != NULL); | 112 | EXPECT_TRUE(s != NULL); |
2936 | 113 | EXPECT_FLOAT_EQ(0.5, ua_sensors_accelerometer_get_min_value(s)); | 113 | |
2937 | 114 | EXPECT_FLOAT_EQ(1000.0, ua_sensors_accelerometer_get_max_value(s)); | 114 | float min = 0.f; ua_sensors_accelerometer_get_min_value(s, &min); |
2938 | 115 | EXPECT_FLOAT_EQ(0.1, ua_sensors_accelerometer_get_resolution(s)); | 115 | float max = 0.f; ua_sensors_accelerometer_get_max_value(s, &max); |
2939 | 116 | float res = 0.f; ua_sensors_accelerometer_get_resolution(s, &res); | ||
2940 | 117 | |||
2941 | 118 | EXPECT_FLOAT_EQ(0.5, min); | ||
2942 | 119 | EXPECT_FLOAT_EQ(1000.0, max); | ||
2943 | 120 | EXPECT_FLOAT_EQ(0.1, res); | ||
2944 | 116 | }) | 121 | }) |
2945 | 117 | 122 | ||
2946 | 118 | TESTP_F(SimBackendTest, CreateLight, { | 123 | TESTP_F(SimBackendTest, CreateLight, { |
2947 | @@ -122,9 +127,14 @@ | |||
2948 | 122 | 127 | ||
2949 | 123 | UASensorsLight *s = ua_sensors_light_new(); | 128 | UASensorsLight *s = ua_sensors_light_new(); |
2950 | 124 | EXPECT_TRUE(s != NULL); | 129 | EXPECT_TRUE(s != NULL); |
2954 | 125 | EXPECT_FLOAT_EQ(0.0, ua_sensors_light_get_min_value(s)); | 130 | |
2955 | 126 | EXPECT_FLOAT_EQ(10.0, ua_sensors_light_get_max_value(s)); | 131 | float min = 0.f; ua_sensors_light_get_min_value(s, &min); |
2956 | 127 | EXPECT_FLOAT_EQ(0.5, ua_sensors_light_get_resolution(s)); | 132 | float max = 0.f; ua_sensors_light_get_max_value(s, &max); |
2957 | 133 | float res = 0.f; ua_sensors_light_get_resolution(s, &res); | ||
2958 | 134 | |||
2959 | 135 | EXPECT_FLOAT_EQ(0.0, min); | ||
2960 | 136 | EXPECT_FLOAT_EQ(10.0, max); | ||
2961 | 137 | EXPECT_FLOAT_EQ(0.5, res); | ||
2962 | 128 | }) | 138 | }) |
2963 | 129 | 139 | ||
2964 | 130 | TESTP_F(SimBackendTest, ProximityEvents, { | 140 | TESTP_F(SimBackendTest, ProximityEvents, { |
2965 | @@ -191,8 +201,10 @@ | |||
2966 | 191 | 201 | ||
2967 | 192 | ua_sensors_light_set_reading_cb(s, | 202 | ua_sensors_light_set_reading_cb(s, |
2968 | 193 | [](UASLightEvent* ev, void* ctx) { | 203 | [](UASLightEvent* ev, void* ctx) { |
2969 | 204 | float light = -1.f; | ||
2970 | 205 | uas_light_event_get_light(ev, &light); | ||
2971 | 194 | events.push({uas_light_event_get_timestamp(ev), | 206 | events.push({uas_light_event_get_timestamp(ev), |
2973 | 195 | uas_light_event_get_light(ev), .0, .0, | 207 | light, .0, .0, |
2974 | 196 | (UASProximityDistance) 0, ctx}); | 208 | (UASProximityDistance) 0, ctx}); |
2975 | 197 | }, NULL); | 209 | }, NULL); |
2976 | 198 | 210 | ||
2977 | @@ -229,10 +241,14 @@ | |||
2978 | 229 | 241 | ||
2979 | 230 | ua_sensors_accelerometer_set_reading_cb(s, | 242 | ua_sensors_accelerometer_set_reading_cb(s, |
2980 | 231 | [](UASAccelerometerEvent* ev, void* ctx) { | 243 | [](UASAccelerometerEvent* ev, void* ctx) { |
2981 | 244 | float x; uas_accelerometer_event_get_acceleration_x(ev, &x); | ||
2982 | 245 | float y; uas_accelerometer_event_get_acceleration_y(ev, &y); | ||
2983 | 246 | float z; uas_accelerometer_event_get_acceleration_z(ev, &z); | ||
2984 | 247 | |||
2985 | 232 | events.push({uas_accelerometer_event_get_timestamp(ev), | 248 | events.push({uas_accelerometer_event_get_timestamp(ev), |
2989 | 233 | uas_accelerometer_event_get_acceleration_x(ev), | 249 | x, |
2990 | 234 | uas_accelerometer_event_get_acceleration_y(ev), | 250 | y, |
2991 | 235 | uas_accelerometer_event_get_acceleration_z(ev), | 251 | z, |
2992 | 236 | (UASProximityDistance) 0, ctx}); | 252 | (UASProximityDistance) 0, ctx}); |
2993 | 237 | }, NULL); | 253 | }, NULL); |
2994 | 238 | 254 | ||
2995 | @@ -274,8 +290,12 @@ | |||
2996 | 274 | // calling its functions should not crash; we can't assert much about | 290 | // calling its functions should not crash; we can't assert much about |
2997 | 275 | // their actual values, though | 291 | // their actual values, though |
2998 | 276 | ua_sensors_proximity_enable(s); | 292 | ua_sensors_proximity_enable(s); |
3001 | 277 | EXPECT_LE(ua_sensors_proximity_get_min_value(s), ua_sensors_proximity_get_max_value(s)); | 293 | float min; ua_sensors_proximity_get_min_value(s, &min); |
3002 | 278 | ua_sensors_proximity_get_resolution(s); | 294 | float max; ua_sensors_proximity_get_max_value(s, &max); |
3003 | 295 | |||
3004 | 296 | EXPECT_LE(min, max); | ||
3005 | 297 | |||
3006 | 298 | float res; ua_sensors_proximity_get_resolution(s, &res); | ||
3007 | 279 | ua_sensors_proximity_disable(s); | 299 | ua_sensors_proximity_disable(s); |
3008 | 280 | } else { | 300 | } else { |
3009 | 281 | cerr << "no proximity sensor on this hardware\n"; | 301 | cerr << "no proximity sensor on this hardware\n"; |
3010 | @@ -291,8 +311,12 @@ | |||
3011 | 291 | // calling its functions should not crash; we can't assert much about | 311 | // calling its functions should not crash; we can't assert much about |
3012 | 292 | // their actual values, though | 312 | // their actual values, though |
3013 | 293 | ua_sensors_accelerometer_enable(s); | 313 | ua_sensors_accelerometer_enable(s); |
3016 | 294 | EXPECT_LE(ua_sensors_accelerometer_get_min_value(s), ua_sensors_accelerometer_get_max_value(s)); | 314 | float min; ua_sensors_accelerometer_get_min_value(s, &min); |
3017 | 295 | ua_sensors_accelerometer_get_resolution(s); | 315 | float max; ua_sensors_accelerometer_get_max_value(s, &max); |
3018 | 316 | |||
3019 | 317 | EXPECT_LE(min, max); | ||
3020 | 318 | |||
3021 | 319 | float res; ua_sensors_accelerometer_get_resolution(s, &res); | ||
3022 | 296 | ua_sensors_accelerometer_disable(s); | 320 | ua_sensors_accelerometer_disable(s); |
3023 | 297 | } else { | 321 | } else { |
3024 | 298 | cerr << "no accelerometer sensor on this hardware\n"; | 322 | cerr << "no accelerometer sensor on this hardware\n"; |
3025 | @@ -308,8 +332,12 @@ | |||
3026 | 308 | // calling its functions should not crash; we can't assert much about | 332 | // calling its functions should not crash; we can't assert much about |
3027 | 309 | // their actual values, though | 333 | // their actual values, though |
3028 | 310 | ua_sensors_light_enable(s); | 334 | ua_sensors_light_enable(s); |
3031 | 311 | EXPECT_LE(ua_sensors_light_get_min_value(s), ua_sensors_light_get_max_value(s)); | 335 | float min; ua_sensors_light_get_min_value(s, &min); |
3032 | 312 | ua_sensors_light_get_resolution(s); | 336 | float max; ua_sensors_light_get_max_value(s, &max); |
3033 | 337 | |||
3034 | 338 | EXPECT_LE(min, max); | ||
3035 | 339 | |||
3036 | 340 | float res; ua_sensors_light_get_resolution(s, &res); | ||
3037 | 313 | ua_sensors_light_disable(s); | 341 | ua_sensors_light_disable(s); |
3038 | 314 | } else { | 342 | } else { |
3039 | 315 | cerr << "no light sensor on this hardware\n"; | 343 | cerr << "no light sensor on this hardware\n"; |