summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-29 08:08:22 +0000
committerhans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-29 08:08:22 +0000
commitc488e1e6549cacff899d47d9515d211b725d502f (patch)
treec5a8774b86ceb32e498ace32aee8ebaca69a7355
parent357c4db3890a3a9a325fb5a51b2d29f0054f3d89 (diff)
downloadchromium_src-c488e1e6549cacff899d47d9515d211b725d502f.zip
chromium_src-c488e1e6549cacff899d47d9515d211b725d502f.tar.gz
chromium_src-c488e1e6549cacff899d47d9515d211b725d502f.tar.bz2
Move the Sudden Motion Sensor library into third_party.
BUG=118913 TEST=manual (see instructions at http://code.google.com/p/chromium/issues/detail?id=44654#c11) Review URL: https://chromiumcodereview.appspot.com/9844020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129588 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/device_orientation/DEPS12
-rw-r--r--content/browser/device_orientation/accelerometer_mac.cc377
-rw-r--r--content/browser/device_orientation/accelerometer_mac.h78
-rw-r--r--content/content_browser.gypi1
-rw-r--r--third_party/sudden_motion_sensor/LICENSE43
-rw-r--r--third_party/sudden_motion_sensor/README.chromium19
-rw-r--r--third_party/sudden_motion_sensor/sudden_motion_sensor.gyp19
-rw-r--r--third_party/sudden_motion_sensor/sudden_motion_sensor_mac.cc400
-rw-r--r--third_party/sudden_motion_sensor/sudden_motion_sensor_mac.h95
9 files changed, 598 insertions, 446 deletions
diff --git a/content/browser/device_orientation/DEPS b/content/browser/device_orientation/DEPS
index 0272f05..3e195fe 100644
--- a/content/browser/device_orientation/DEPS
+++ b/content/browser/device_orientation/DEPS
@@ -1,6 +1,6 @@
-include_rules = [
- "-chrome",
- "+chrome/browser/ui", # for browser_test
- "+chrome/test", # for browser_test
-]
-
+include_rules = [
+ "-chrome",
+ "+chrome/browser/ui", # for browser_test
+ "+chrome/test", # for browser_test
+ "+third_party/sudden_motion_sensor",
+]
diff --git a/content/browser/device_orientation/accelerometer_mac.cc b/content/browser/device_orientation/accelerometer_mac.cc
index eec5751..d47f2dc 100644
--- a/content/browser/device_orientation/accelerometer_mac.cc
+++ b/content/browser/device_orientation/accelerometer_mac.cc
@@ -1,217 +1,17 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-//
-// This file is based on the SMSLib library.
-//
-// SMSLib Sudden Motion Sensor Access Library
-// Copyright (c) 2010 Suitable Systems
-// All rights reserved.
-//
-// Developed by: Daniel Griscom
-// Suitable Systems
-// http://www.suitable.com
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal with the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// - Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimers.
-//
-// - Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimers in the
-// documentation and/or other materials provided with the distribution.
-//
-// - Neither the names of Suitable Systems nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this Software without specific prior written permission.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-// IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-// ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-// SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
-//
-// For more information about SMSLib, see
-// <http://www.suitable.com/tools/smslib.html>
-// or contact
-// Daniel Griscom
-// Suitable Systems
-// 1 Centre Street, Suite 204
-// Wakefield, MA 01880
-// (781) 665-0053
#include "content/browser/device_orientation/accelerometer_mac.h"
#include <math.h>
-#include <sys/sysctl.h>
#include "base/logging.h"
-#include "base/mac/scoped_cftyperef.h"
-#include "base/memory/scoped_ptr.h"
#include "content/browser/device_orientation/orientation.h"
+#include "third_party/sudden_motion_sensor/sudden_motion_sensor_mac.h"
namespace device_orientation {
-struct AccelerometerMac::GenericMacbookSensor {
- // Name of device to be read.
- const char* service_name;
-
- // Number of bytes of the axis data.
- int axis_size;
-
- // Default calibration value for zero g.
- float zero_g;
-
- // Default calibration value for one g (negative when axis is inverted).
- float one_g;
-
- // Kernel function index.
- unsigned int function;
-
- // Size of the sensor record to be sent/received.
- unsigned int record_size;
-};
-
-struct AccelerometerMac::AxisData {
- // Location of the first byte representing the axis in the sensor data.
- int index;
-
- // Axis inversion flag. The value changes often between models.
- bool inverted;
-};
-
-// Sudden Motion Sensor descriptor.
-struct AccelerometerMac::SensorDescriptor {
- // Prefix of model to be tested.
- const char* model_name;
-
- // Board id of model, or NULL if it doesn't matter.
- const char* board_id;
-
- // Axis-specific data (x,y,z order).
- AxisData axis[3];
-};
-
-// Typical sensor parameters in MacBook models.
-const AccelerometerMac::GenericMacbookSensor
- AccelerometerMac::kGenericSensor = {
- "SMCMotionSensor", 2,
- 0, 251,
- 5, 40
-};
-
-// Supported sensor descriptors. Add entries here to enhance compatibility.
-// Tested in order; place more specific entries before more general ones. (All
-// non-tested entries from SMSLib have been removed.)
-const AccelerometerMac::SensorDescriptor
- AccelerometerMac::kSupportedSensors[] = {
- // Tested by tommyw on a 13" MacBook.
- { "MacBook1,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
-
- // Tested by S.Selz. (via avi) on a 13" MacBook.
- { "MacBook2,1", NULL, { { 0, true }, { 2, false }, { 4, true } } },
-
- // Tested by verhees on a 13" MacBook.
- { "MacBook3,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
-
- // Tested by adlr on a 13" MacBook.
- { "MacBook4,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
-
- // Tested by thakis on a 13" MacBook.
- { "MacBook5,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
-
- // Tested by Adam Gerson (via avi) on a 13" MacBook.
- { "MacBook5,2", NULL, { { 0, false }, { 2, true }, { 4, true } } },
-
- // Tested by tommyw on a 13" MacBook.
- { "MacBook6,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
-
- // Tested by avi on a 13" MacBook.
- { "MacBook7,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
-
- // Tested by crc on a 13" MacBook Air.
- { "MacBookAir1,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
-
- // Tested by sfiera, pjw on a 13" MacBook Air.
- { "MacBookAir2,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
-
- // Note:
- // - MacBookAir3,1 (11" MacBook Air, late 2010)
- // - MacBookAir3,2 (13" MacBook Air, late 2010)
- // - MacBookAir4,1 (11" MacBook Air, mid 2011)
- // - MacBookAir4,2 (13" MacBook Air, mid 2011)
- // have no accelerometer sensors.
-
- // Tested by crc on a 15" MacBook Pro.
- { "MacBookPro1,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
-
- // Tested by Raul Cuza (via avi) on a 17" MacBook Pro.
- { "MacBookPro1,2", NULL, { { 0, true }, { 2, true }, { 4, false } } },
-
- // Tested by L.V. (via avi) on a 17" MacBook Pro.
- { "MacBookPro2,1", NULL, { { 0, true }, { 2, false }, { 4, true } } },
-
- // Tested by leandrogracia on a 15" MacBook Pro.
- { "MacBookPro2,2", NULL, { { 0, true }, { 2, true }, { 4, false } } },
-
- // Tested by S.Som. (via avi) on a 17" MacBook Pro.
- { "MacBookPro3,1", "Mac-F42388C8",
- { { 0, true }, { 2, false }, { 4, true } } },
-
- // Tested by leandrogracia on a 15" MacBook Pro.
- { "MacBookPro3,1", NULL, { { 0, false }, { 2, true }, { 4, true } } },
-
- // Tested by leandrogracia on a 15" MacBook Pro.
- // Tested by Eric Shapiro (via avi) on a 17" MacBook Pro.
- { "MacBookPro4,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
-
- // Tested by leandrogracia on a 15" MacBook Pro.
- { "MacBookPro5,1", NULL, { { 0, false }, { 2, false }, { 4, false } } },
-
- // Tested by S.Selz. (via avi) on a 17" MacBook Pro.
- { "MacBookPro5,2", NULL, { { 0, false }, { 2, false }, { 4, false } } },
-
- // Tested by dmaclach on a 15" MacBook Pro.
- { "MacBookPro5,3", NULL, { { 2, false }, { 0, false }, { 4, true } } },
-
- // Tested by leandrogracia on a 15" MacBook Pro.
- { "MacBookPro5,4", NULL, { { 0, false }, { 2, false }, { 4, false } } },
-
- // Tested by leandrogracia on a 13" MacBook Pro.
- { "MacBookPro5,5", NULL, { { 0, true }, { 2, true }, { 4, false } } },
-
- // Tested by khom, leadpipe on a 17" MacBook Pro.
- { "MacBookPro6,1", NULL, { { 0, false }, { 2, false }, { 4, false } } },
-
- // Tested by leandrogracia on a 15" MacBook Pro.
- { "MacBookPro6,2", NULL, { { 0, true }, { 2, false }, { 4, true } } },
-
- // Tested by leandrogracia on a 13" MacBook Pro.
- { "MacBookPro7,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
-
- // Tested by avi on a 13" MacBook Pro.
- { "MacBookPro8,1", NULL, { { 0, false }, { 2, false }, { 4, false } } },
-
- // Tested by avi on a 15" MacBook Pro.
- { "MacBookPro8,2", NULL, { { 0, false }, { 2, false }, { 4, false } } },
-
- // Tested by avi on a 17" MacBook Pro.
- { "MacBookPro8,3", NULL, { { 0, false }, { 2, false }, { 4, false } } },
-
- // Generic MacBook accelerometer sensor data, to be used for future models
- // until they can be tested and their data entered. Note that this generic
- // configuration may well have problems with inverted axes.
- { "", NULL, { { 0, true }, { 2, true }, { 4, false } } }
-};
-
// Create a AccelerometerMac object and return NULL if no valid sensor found.
DataFetcher* AccelerometerMac::Create() {
scoped_ptr<AccelerometerMac> accelerometer(new AccelerometerMac);
@@ -219,71 +19,27 @@ DataFetcher* AccelerometerMac::Create() {
}
AccelerometerMac::~AccelerometerMac() {
- IOServiceClose(io_connection_);
}
-AccelerometerMac::AccelerometerMac()
- : sensor_(NULL),
- io_connection_(0) {
+AccelerometerMac::AccelerometerMac() {
}
-// Retrieve per-axis accelerometer values.
+// Retrieve per-axis orientation values.
//
// Axes and angles are defined according to the W3C DeviceOrientation Draft.
// See here: http://dev.w3.org/geo/api/spec-source-orientation.html
//
// Note: only beta and gamma angles are provided. Alpha is set to zero.
//
-// Returns false in case of error or non-properly initialized object.
+// Returns false in case of error.
//
bool AccelerometerMac::GetOrientation(Orientation* orientation) {
- DCHECK(sensor_);
-
- // Reset output record memory buffer.
- std::fill(output_record_.begin(), output_record_.end(), 0x00);
-
- // Read record data from memory.
- const size_t kInputSize = kGenericSensor.record_size;
- size_t output_size = kGenericSensor.record_size;
-
- if (IOConnectCallStructMethod(io_connection_, kGenericSensor.function,
- static_cast<const char *>(&input_record_[0]), kInputSize,
- &output_record_[0], &output_size) != KERN_SUCCESS) {
- return false;
- }
+ DCHECK(sudden_motion_sensor_.get());
- // Calculate per-axis calibrated values.
+ // Retrieve per-axis calibrated values.
float axis_value[3];
-
- for (int i = 0; i < 3; ++i) {
- int sensor_value = 0;
- int size = kGenericSensor.axis_size;
- int index = sensor_->axis[i].index;
-
- // Important Note: Little endian is assumed as this code is Mac-only
- // and PowerPC is currently not supported.
- memcpy(&sensor_value, &output_record_[index], size);
-
- sensor_value = ExtendSign(sensor_value, size);
-
- // Correct value using the current calibration.
- axis_value[i] = static_cast<float>(sensor_value - kGenericSensor.zero_g) /
- kGenericSensor.one_g;
-
- // Make sure we reject any NaN or infinite values.
- if (!isfinite(axis_value[i]))
- return false;
-
- // Clamp value to the [-1, 1] range.
- if (axis_value[i] < -1.0)
- axis_value[i] = -1.0;
- else if (axis_value[i] > 1.0)
- axis_value[i] = 1.0;
-
- // Apply axis inversion.
- if (sensor_->axis[i].inverted)
- axis_value[i] = -axis_value[i];
- }
+ if (!sudden_motion_sensor_->ReadSensorValues(axis_value))
+ return false;
// Transform the accelerometer values to W3C draft angles.
//
@@ -337,122 +93,9 @@ bool AccelerometerMac::GetOrientation(Orientation* orientation) {
return true;
}
-// Probe the local hardware looking for a supported sensor device
-// and initialize an I/O connection to it.
bool AccelerometerMac::Init() {
- // Request model name from the kernel.
- char local_model[32]; // size from SMSLib
- size_t local_model_size = sizeof(local_model);
- int params[2] = { CTL_HW, HW_MODEL };
- if (sysctl(params, 2, local_model, &local_model_size, NULL, 0) != 0)
- return NULL;
-
- const SensorDescriptor* sensor_candidate = NULL;
-
- // Look for the current model in the supported sensor list.
- base::mac::ScopedCFTypeRef<CFDataRef> board_id_data;
- const int kNumSensors = arraysize(kSupportedSensors);
-
- for (int i = 0; i < kNumSensors; ++i) {
- // Check if the supported sensor model name is a prefix
- // of the local hardware model (empty names are accepted).
- const char* p1 = kSupportedSensors[i].model_name;
- for (const char* p2 = local_model; *p1 != '\0' && *p1 == *p2; ++p1, ++p2)
- continue;
- if (*p1 != '\0')
- continue;
-
- // Check the board id.
- if (kSupportedSensors[i].board_id) {
- if (!board_id_data.get()) {
- CFMutableDictionaryRef dict =
- IOServiceMatching("IOPlatformExpertDevice");
- if (!dict)
- continue;
-
- io_service_t platform_expert =
- IOServiceGetMatchingService(kIOMasterPortDefault, dict);
- if (!platform_expert)
- continue;
-
- board_id_data.reset((CFDataRef)
- IORegistryEntryCreateCFProperty(platform_expert,
- CFSTR("board-id"),
- kCFAllocatorDefault,
- 0));
- IOObjectRelease(platform_expert);
- if (!board_id_data.get())
- continue;
- }
-
- if (strcmp(kSupportedSensors[i].board_id,
- (const char*)CFDataGetBytePtr(board_id_data)) != 0) {
- continue;
- }
- }
-
- // Local hardware found in the supported sensor list.
- sensor_candidate = &kSupportedSensors[i];
-
- // Get a dictionary of the services matching to the one in the sensor.
- CFMutableDictionaryRef dict =
- IOServiceMatching(kGenericSensor.service_name);
- if (!dict)
- continue;
-
- // Get the first matching service.
- io_service_t device = IOServiceGetMatchingService(kIOMasterPortDefault,
- dict);
- if (!device)
- continue;
-
- // Try to open device.
- kern_return_t result;
- result = IOServiceOpen(device, mach_task_self(), 0, &io_connection_);
- IOObjectRelease(device);
- if (result != KERN_SUCCESS || io_connection_ == 0)
- return false;
-
- // Local sensor service confirmed by IOKit.
- sensor_ = sensor_candidate;
- break;
- }
-
- if (sensor_ == NULL)
- return false;
-
- // Allocate and initialize input/output records.
- input_record_.resize(kGenericSensor.record_size, 0x01);
- output_record_.resize(kGenericSensor.record_size, 0x00);
-
- // Try to retrieve the current orientation.
- Orientation test_orientation;
- return GetOrientation(&test_orientation);
-}
-
-// Extend the sign of an integer of less than 32 bits to a 32-bit integer.
-int AccelerometerMac::ExtendSign(int value, size_t size) {
- switch (size) {
- case 1:
- if (value & 0x00000080)
- return value | 0xffffff00;
- break;
-
- case 2:
- if (value & 0x00008000)
- return value | 0xffff0000;
- break;
-
- case 3:
- if (value & 0x00800000)
- return value | 0xff000000;
- break;
-
- default:
- LOG(FATAL) << "Invalid integer size for sign extension: " << size;
- }
-
- return value;
+ sudden_motion_sensor_.reset(SuddenMotionSensor::Create());
+ return sudden_motion_sensor_.get() != NULL;
}
} // namespace device_orientation
diff --git a/content/browser/device_orientation/accelerometer_mac.h b/content/browser/device_orientation/accelerometer_mac.h
index 853b4d5..4413dd0 100644
--- a/content/browser/device_orientation/accelerometer_mac.h
+++ b/content/browser/device_orientation/accelerometer_mac.h
@@ -1,52 +1,6 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-//
-// This file is based on the SMSLib library.
-//
-// SMSLib Sudden Motion Sensor Access Library
-// Copyright (c) 2010 Suitable Systems
-// All rights reserved.
-//
-// Developed by: Daniel Griscom
-// Suitable Systems
-// http://www.suitable.com
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal with the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// - Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimers.
-//
-// - Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimers in the
-// documentation and/or other materials provided with the distribution.
-//
-// - Neither the names of Suitable Systems nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this Software without specific prior written permission.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-// IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-// ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-// SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
-//
-// For more information about SMSLib, see
-// <http://www.suitable.com/tools/smslib.html>
-// or contact
-// Daniel Griscom
-// Suitable Systems
-// 1 Centre Street, Suite 204
-// Wakefield, MA 01880
-// (781) 665-0053
#ifndef CONTENT_BROWSER_DEVICE_ORIENTATION_ACCELEROMETER_MAC_H_
#define CONTENT_BROWSER_DEVICE_ORIENTATION_ACCELEROMETER_MAC_H_
@@ -54,15 +8,14 @@
#include <vector>
-#include <IOKit/IOKitLib.h>
-
#include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
#include "content/browser/device_orientation/data_fetcher.h"
+class SuddenMotionSensor;
+
namespace device_orientation {
-// Provides an easy-to-use interface to retrieve data
-// from the MacBook family accelerometer.
class AccelerometerMac : public DataFetcher {
public:
static DataFetcher* Create();
@@ -76,28 +29,7 @@ class AccelerometerMac : public DataFetcher {
AccelerometerMac();
bool Init();
- // Extend the sign of an integer of size bytes to a 32-bit one.
- static int ExtendSign(int value, size_t size);
-
- struct GenericMacbookSensor;
- struct SensorDescriptor;
- struct AxisData;
-
- // Generic sensor data and list of supported sensors.
- static const GenericMacbookSensor kGenericSensor;
- static const SensorDescriptor kSupportedSensors[];
-
- // Local sensor if supported, else NULL.
- const SensorDescriptor* sensor_;
-
- // IOKit connection to the local sensor.
- io_connect_t io_connection_;
-
- // Input memory used for sensor I/O.
- std::vector<char> input_record_;
-
- // Output memory used for sensor I/O.
- std::vector<char> output_record_;
+ scoped_ptr<SuddenMotionSensor> sudden_motion_sensor_;
};
} // namespace device_orientation
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 7bd9870..32bdc65 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -826,6 +826,7 @@
],
'dependencies': [
'../base/base.gyp:closure_blocks_leopard_compat',
+ '../third_party/sudden_motion_sensor/sudden_motion_sensor.gyp:sudden_motion_sensor',
],
}, { # OS!="mac"
'dependencies': [
diff --git a/third_party/sudden_motion_sensor/LICENSE b/third_party/sudden_motion_sensor/LICENSE
new file mode 100644
index 0000000..83d4012
--- /dev/null
+++ b/third_party/sudden_motion_sensor/LICENSE
@@ -0,0 +1,43 @@
+SMSLib Sudden Motion Sensor Access Library
+Copyright (c) 2010 Suitable Systems
+All rights reserved.
+
+Developed by: Daniel Griscom
+ Suitable Systems
+ http://www.suitable.com
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal with the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+- Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimers.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimers in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the names of Suitable Systems nor the names of its
+contributors may be used to endorse or promote products derived from
+this Software without specific prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
+
+For more information about SMSLib, see
+ <http://www.suitable.com/tools/smslib.html>
+or contact
+ Daniel Griscom
+ Suitable Systems
+ 1 Centre Street, Suite 204
+ Wakefield, MA 01880
+ (781) 665-0053
diff --git a/third_party/sudden_motion_sensor/README.chromium b/third_party/sudden_motion_sensor/README.chromium
new file mode 100644
index 0000000..afd594e
--- /dev/null
+++ b/third_party/sudden_motion_sensor/README.chromium
@@ -0,0 +1,19 @@
+Name: Sudden Motion Sensor library
+Short Name: smslib
+URL: http://www.suitable.com/tools/smslib.html
+Version: 0
+Date: 2010-08-26
+Revision:
+License: University of Illinois/NCSA Open Source License
+License File: LICENSE
+Security Critical: yes
+
+Description:
+A package for accessing the Sudden Motion Sensors in Mac laptops.
+Used for providing data to the Device Orientation API implementation.
+
+Local Modifications:
+The code was rewritten to follow Chromium code standards and practices
+(see the original code review at http://codereview.chromium.org/3169040/show)
+and completely new research was done on every mac laptop to obtain orientation
+information.
diff --git a/third_party/sudden_motion_sensor/sudden_motion_sensor.gyp b/third_party/sudden_motion_sensor/sudden_motion_sensor.gyp
new file mode 100644
index 0000000..897421b
--- /dev/null
+++ b/third_party/sudden_motion_sensor/sudden_motion_sensor.gyp
@@ -0,0 +1,19 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+ 'targets': [
+ {
+ 'target_name': 'sudden_motion_sensor',
+ 'type': 'static_library',
+ 'dependencies': [
+ '<(DEPTH)/base/base.gyp:base',
+ ],
+ 'sources': [
+ 'sudden_motion_sensor_mac.cc',
+ 'sudden_motion_sensor_mac.h',
+ ],
+ },
+ ],
+}
diff --git a/third_party/sudden_motion_sensor/sudden_motion_sensor_mac.cc b/third_party/sudden_motion_sensor/sudden_motion_sensor_mac.cc
new file mode 100644
index 0000000..869763f
--- /dev/null
+++ b/third_party/sudden_motion_sensor/sudden_motion_sensor_mac.cc
@@ -0,0 +1,400 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// This file is based on the SMSLib library.
+//
+// SMSLib Sudden Motion Sensor Access Library
+// Copyright (c) 2010 Suitable Systems
+// All rights reserved.
+//
+// Developed by: Daniel Griscom
+// Suitable Systems
+// http://www.suitable.com
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal with the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// - Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimers.
+//
+// - Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimers in the
+// documentation and/or other materials provided with the distribution.
+//
+// - Neither the names of Suitable Systems nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this Software without specific prior written permission.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+// ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+// SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
+//
+// For more information about SMSLib, see
+// <http://www.suitable.com/tools/smslib.html>
+// or contact
+// Daniel Griscom
+// Suitable Systems
+// 1 Centre Street, Suite 204
+// Wakefield, MA 01880
+// (781) 665-0053
+
+#include "sudden_motion_sensor_mac.h"
+
+#include <math.h>
+#include <sys/sysctl.h>
+
+#include "base/logging.h"
+#include "base/mac/scoped_cftyperef.h"
+#include "base/memory/scoped_ptr.h"
+
+struct SuddenMotionSensor::GenericMacbookSensor {
+ // Name of device to be read.
+ const char* service_name;
+
+ // Number of bytes of the axis data.
+ int axis_size;
+
+ // Default calibration value for zero g.
+ float zero_g;
+
+ // Default calibration value for one g (negative when axis is inverted).
+ float one_g;
+
+ // Kernel function index.
+ unsigned int function;
+
+ // Size of the sensor record to be sent/received.
+ unsigned int record_size;
+};
+
+struct SuddenMotionSensor::AxisData {
+ // Location of the first byte representing the axis in the sensor data.
+ int index;
+
+ // Axis inversion flag. The value changes often between models.
+ bool inverted;
+};
+
+// Sudden Motion Sensor descriptor.
+struct SuddenMotionSensor::SensorDescriptor {
+ // Prefix of model to be tested.
+ const char* model_name;
+
+ // Board id of model, or NULL if it doesn't matter.
+ const char* board_id;
+
+ // Axis-specific data (x,y,z order).
+ AxisData axis[3];
+};
+
+// Typical sensor parameters in MacBook models.
+const SuddenMotionSensor::GenericMacbookSensor
+ SuddenMotionSensor::kGenericSensor = {
+ "SMCMotionSensor", 2,
+ 0, 251,
+ 5, 40
+};
+
+// Supported sensor descriptors. Add entries here to enhance compatibility.
+// Tested in order; place more specific entries before more general ones. (All
+// non-tested entries from SMSLib have been removed.)
+const SuddenMotionSensor::SensorDescriptor
+ SuddenMotionSensor::kSupportedSensors[] = {
+ // Tested by tommyw on a 13" MacBook.
+ { "MacBook1,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
+
+ // Tested by S.Selz. (via avi) on a 13" MacBook.
+ { "MacBook2,1", NULL, { { 0, true }, { 2, false }, { 4, true } } },
+
+ // Tested by verhees on a 13" MacBook.
+ { "MacBook3,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
+
+ // Tested by adlr on a 13" MacBook.
+ { "MacBook4,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
+
+ // Tested by thakis on a 13" MacBook.
+ { "MacBook5,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
+
+ // Tested by Adam Gerson (via avi) on a 13" MacBook.
+ { "MacBook5,2", NULL, { { 0, false }, { 2, true }, { 4, true } } },
+
+ // Tested by tommyw on a 13" MacBook.
+ { "MacBook6,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
+
+ // Tested by avi on a 13" MacBook.
+ { "MacBook7,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
+
+ // Tested by crc on a 13" MacBook Air.
+ { "MacBookAir1,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
+
+ // Tested by sfiera, pjw on a 13" MacBook Air.
+ { "MacBookAir2,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
+
+ // Note:
+ // - MacBookAir3,1 (11" MacBook Air, late 2010)
+ // - MacBookAir3,2 (13" MacBook Air, late 2010)
+ // - MacBookAir4,1 (11" MacBook Air, mid 2011)
+ // - MacBookAir4,2 (13" MacBook Air, mid 2011)
+ // have no accelerometer sensors.
+
+ // Tested by crc on a 15" MacBook Pro.
+ { "MacBookPro1,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
+
+ // Tested by Raul Cuza (via avi) on a 17" MacBook Pro.
+ { "MacBookPro1,2", NULL, { { 0, true }, { 2, true }, { 4, false } } },
+
+ // Tested by L.V. (via avi) on a 17" MacBook Pro.
+ { "MacBookPro2,1", NULL, { { 0, true }, { 2, false }, { 4, true } } },
+
+ // Tested by leandrogracia on a 15" MacBook Pro.
+ { "MacBookPro2,2", NULL, { { 0, true }, { 2, true }, { 4, false } } },
+
+ // Tested by S.Som. (via avi) on a 17" MacBook Pro.
+ { "MacBookPro3,1", "Mac-F42388C8",
+ { { 0, true }, { 2, false }, { 4, true } } },
+
+ // Tested by leandrogracia on a 15" MacBook Pro.
+ { "MacBookPro3,1", NULL, { { 0, false }, { 2, true }, { 4, true } } },
+
+ // Tested by leandrogracia on a 15" MacBook Pro.
+ // Tested by Eric Shapiro (via avi) on a 17" MacBook Pro.
+ { "MacBookPro4,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
+
+ // Tested by leandrogracia on a 15" MacBook Pro.
+ { "MacBookPro5,1", NULL, { { 0, false }, { 2, false }, { 4, false } } },
+
+ // Tested by S.Selz. (via avi) on a 17" MacBook Pro.
+ { "MacBookPro5,2", NULL, { { 0, false }, { 2, false }, { 4, false } } },
+
+ // Tested by dmaclach on a 15" MacBook Pro.
+ { "MacBookPro5,3", NULL, { { 2, false }, { 0, false }, { 4, true } } },
+
+ // Tested by leandrogracia on a 15" MacBook Pro.
+ { "MacBookPro5,4", NULL, { { 0, false }, { 2, false }, { 4, false } } },
+
+ // Tested by leandrogracia on a 13" MacBook Pro.
+ { "MacBookPro5,5", NULL, { { 0, true }, { 2, true }, { 4, false } } },
+
+ // Tested by khom, leadpipe on a 17" MacBook Pro.
+ { "MacBookPro6,1", NULL, { { 0, false }, { 2, false }, { 4, false } } },
+
+ // Tested by leandrogracia on a 15" MacBook Pro.
+ { "MacBookPro6,2", NULL, { { 0, true }, { 2, false }, { 4, true } } },
+
+ // Tested by leandrogracia on a 13" MacBook Pro.
+ { "MacBookPro7,1", NULL, { { 0, true }, { 2, true }, { 4, false } } },
+
+ // Tested by avi on a 13" MacBook Pro.
+ { "MacBookPro8,1", NULL, { { 0, false }, { 2, false }, { 4, false } } },
+
+ // Tested by avi on a 15" MacBook Pro.
+ { "MacBookPro8,2", NULL, { { 0, false }, { 2, false }, { 4, false } } },
+
+ // Tested by avi on a 17" MacBook Pro.
+ { "MacBookPro8,3", NULL, { { 0, false }, { 2, false }, { 4, false } } },
+
+ // Generic MacBook accelerometer sensor data, to be used for future models
+ // until they can be tested and their data entered. Note that this generic
+ // configuration may well have problems with inverted axes.
+ { "", NULL, { { 0, true }, { 2, true }, { 4, false } } }
+};
+
+// Create a SuddenMotionSensor object and return NULL if no valid sensor found.
+SuddenMotionSensor* SuddenMotionSensor::Create() {
+ scoped_ptr<SuddenMotionSensor> accelerometer(new SuddenMotionSensor);
+ return accelerometer->Init() ? accelerometer.release() : NULL;
+}
+
+SuddenMotionSensor::~SuddenMotionSensor() {
+ IOServiceClose(io_connection_);
+}
+
+SuddenMotionSensor::SuddenMotionSensor()
+ : sensor_(NULL),
+ io_connection_(0) {
+}
+
+// Retrieve per-axis accelerometer values.
+bool SuddenMotionSensor::ReadSensorValues(float axes[3]) {
+ DCHECK(sensor_);
+
+ // Reset output record memory buffer.
+ std::fill(output_record_.begin(), output_record_.end(), 0x00);
+
+ // Read record data from memory.
+ const size_t kInputSize = kGenericSensor.record_size;
+ size_t output_size = kGenericSensor.record_size;
+
+ if (IOConnectCallStructMethod(io_connection_, kGenericSensor.function,
+ static_cast<const char *>(&input_record_[0]), kInputSize,
+ &output_record_[0], &output_size) != KERN_SUCCESS) {
+ return false;
+ }
+
+ // Calculate per-axis calibrated values.
+ float axis_value[3];
+
+ for (int i = 0; i < 3; ++i) {
+ int sensor_value = 0;
+ int size = kGenericSensor.axis_size;
+ int index = sensor_->axis[i].index;
+
+ // Important Note: Little endian is assumed as this code is Mac-only
+ // and PowerPC is currently not supported.
+ memcpy(&sensor_value, &output_record_[index], size);
+
+ sensor_value = ExtendSign(sensor_value, size);
+
+ // Correct value using the current calibration.
+ axis_value[i] = static_cast<float>(sensor_value - kGenericSensor.zero_g) /
+ kGenericSensor.one_g;
+
+ // Make sure we reject any NaN or infinite values.
+ if (!isfinite(axis_value[i]))
+ return false;
+
+ // Clamp value to the [-1, 1] range.
+ if (axis_value[i] < -1.0)
+ axis_value[i] = -1.0;
+ else if (axis_value[i] > 1.0)
+ axis_value[i] = 1.0;
+
+ // Apply axis inversion.
+ if (sensor_->axis[i].inverted)
+ axis_value[i] = -axis_value[i];
+ }
+
+ axes[0] = axis_value[0];
+ axes[1] = axis_value[1];
+ axes[2] = axis_value[2];
+
+ return true;
+}
+
+// Probe the local hardware looking for a supported sensor device
+// and initialize an I/O connection to it.
+bool SuddenMotionSensor::Init() {
+ // Request model name from the kernel.
+ char local_model[32]; // size from SMSLib
+ size_t local_model_size = sizeof(local_model);
+ int params[2] = { CTL_HW, HW_MODEL };
+ if (sysctl(params, 2, local_model, &local_model_size, NULL, 0) != 0)
+ return NULL;
+
+ const SensorDescriptor* sensor_candidate = NULL;
+
+ // Look for the current model in the supported sensor list.
+ base::mac::ScopedCFTypeRef<CFDataRef> board_id_data;
+ const int kNumSensors = arraysize(kSupportedSensors);
+
+ for (int i = 0; i < kNumSensors; ++i) {
+ // Check if the supported sensor model name is a prefix
+ // of the local hardware model (empty names are accepted).
+ const char* p1 = kSupportedSensors[i].model_name;
+ for (const char* p2 = local_model; *p1 != '\0' && *p1 == *p2; ++p1, ++p2)
+ continue;
+ if (*p1 != '\0')
+ continue;
+
+ // Check the board id.
+ if (kSupportedSensors[i].board_id) {
+ if (!board_id_data.get()) {
+ CFMutableDictionaryRef dict =
+ IOServiceMatching("IOPlatformExpertDevice");
+ if (!dict)
+ continue;
+
+ io_service_t platform_expert =
+ IOServiceGetMatchingService(kIOMasterPortDefault, dict);
+ if (!platform_expert)
+ continue;
+
+ board_id_data.reset((CFDataRef)
+ IORegistryEntryCreateCFProperty(platform_expert,
+ CFSTR("board-id"),
+ kCFAllocatorDefault,
+ 0));
+ IOObjectRelease(platform_expert);
+ if (!board_id_data.get())
+ continue;
+ }
+
+ if (strcmp(kSupportedSensors[i].board_id,
+ (const char*)CFDataGetBytePtr(board_id_data)) != 0) {
+ continue;
+ }
+ }
+
+ // Local hardware found in the supported sensor list.
+ sensor_candidate = &kSupportedSensors[i];
+
+ // Get a dictionary of the services matching to the one in the sensor.
+ CFMutableDictionaryRef dict =
+ IOServiceMatching(kGenericSensor.service_name);
+ if (!dict)
+ continue;
+
+ // Get the first matching service.
+ io_service_t device = IOServiceGetMatchingService(kIOMasterPortDefault,
+ dict);
+ if (!device)
+ continue;
+
+ // Try to open device.
+ kern_return_t result;
+ result = IOServiceOpen(device, mach_task_self(), 0, &io_connection_);
+ IOObjectRelease(device);
+ if (result != KERN_SUCCESS || io_connection_ == 0)
+ return false;
+
+ // Local sensor service confirmed by IOKit.
+ sensor_ = sensor_candidate;
+ break;
+ }
+
+ if (sensor_ == NULL)
+ return false;
+
+ // Allocate and initialize input/output records.
+ input_record_.resize(kGenericSensor.record_size, 0x01);
+ output_record_.resize(kGenericSensor.record_size, 0x00);
+
+ // Try to retrieve the current orientation.
+ float test_axes[3];
+ return ReadSensorValues(test_axes);
+}
+
+// Extend the sign of an integer of less than 32 bits to a 32-bit integer.
+int SuddenMotionSensor::ExtendSign(int value, size_t size) {
+ switch (size) {
+ case 1:
+ if (value & 0x00000080)
+ return value | 0xffffff00;
+ break;
+
+ case 2:
+ if (value & 0x00008000)
+ return value | 0xffff0000;
+ break;
+
+ case 3:
+ if (value & 0x00800000)
+ return value | 0xff000000;
+ break;
+
+ default:
+ LOG(FATAL) << "Invalid integer size for sign extension: " << size;
+ }
+
+ return value;
+}
diff --git a/third_party/sudden_motion_sensor/sudden_motion_sensor_mac.h b/third_party/sudden_motion_sensor/sudden_motion_sensor_mac.h
new file mode 100644
index 0000000..ba70b39
--- /dev/null
+++ b/third_party/sudden_motion_sensor/sudden_motion_sensor_mac.h
@@ -0,0 +1,95 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// This file is based on the SMSLib library.
+//
+// SMSLib Sudden Motion Sensor Access Library
+// Copyright (c) 2010 Suitable Systems
+// All rights reserved.
+//
+// Developed by: Daniel Griscom
+// Suitable Systems
+// http://www.suitable.com
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal with the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// - Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimers.
+//
+// - Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimers in the
+// documentation and/or other materials provided with the distribution.
+//
+// - Neither the names of Suitable Systems nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this Software without specific prior written permission.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+// ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+// SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
+//
+// For more information about SMSLib, see
+// <http://www.suitable.com/tools/smslib.html>
+// or contact
+// Daniel Griscom
+// Suitable Systems
+// 1 Centre Street, Suite 204
+// Wakefield, MA 01880
+// (781) 665-0053
+
+#ifndef SUDDEN_MOTION_SENSOR_H_
+#define SUDDEN_MOTION_SENSOR_H_
+#pragma once
+
+#include <vector>
+
+#include <IOKit/IOKitLib.h>
+
+// Provides an easy-to-use interface to retrieve data
+// from the MacBook family accelerometer.
+class SuddenMotionSensor {
+ public:
+ static SuddenMotionSensor* Create();
+ bool ReadSensorValues(float axes[3]);
+ ~SuddenMotionSensor();
+
+ private:
+ SuddenMotionSensor();
+ bool Init();
+
+ // Extend the sign of an integer of size bytes to a 32-bit one.
+ static int ExtendSign(int value, size_t size);
+
+ struct GenericMacbookSensor;
+ struct SensorDescriptor;
+ struct AxisData;
+
+ // Generic sensor data and list of supported sensors.
+ static const GenericMacbookSensor kGenericSensor;
+ static const SensorDescriptor kSupportedSensors[];
+
+ // Local sensor if supported, else NULL.
+ const SensorDescriptor* sensor_;
+
+ // IOKit connection to the local sensor.
+ io_connect_t io_connection_;
+
+ // Input memory used for sensor I/O.
+ std::vector<char> input_record_;
+
+ // Output memory used for sensor I/O.
+ std::vector<char> output_record_;
+};
+
+#endif // SUDDEN_MOTION_SENSOR_H_