Changeset 173420e8c2bb2d4c20278dae3beebd2f6aaf52e5

Timestamp:

30/05/08 13:27:31 (4 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1212146851 +0200

git-parent:

[74400291c2e06e05e51f9e959b4149f25012543c]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1212146740 +0200

Message:

Add support for applesmc motion sensors (macbooks) on linux. (Untested
since the sensor doesn't want to work on my laptop)

Files:

• modules/control/motion.c (modified) (5 diffs)

modules/control/motion.c

@@ -50 +50 @@
-struct intf_sys_t
-{
-
+
+
-#ifdef __APPLE__
-    enum sms_hardware unimotion_hw;
@@ -77 +78 @@
-    set_category( CAT_INTERFACE );
-    set_description( N_("motion control interface") );
+    set_help( N_("Use HDAPS, AMS, APPLESMC or UNIMOTION motion sensors " \
+                 "to rotate the video") )
-
-    add_bool( "motion-use-rotate", 0, NULL,
@@ -121 +124 @@
-        /* Apple Motion Sensor support */
-        p_intf->p_sys->sensor = AMS_SENSOR;
+    }
+    else if( access( "/sys/devices/applesmc.768/position", R_OK ) == 0 )
+    {
+        /* Apple SMC (newer macbooks) */
+        /* Should be factorised with HDAPS */
+        f = fopen( "/sys/devices/applesmc.768/calibrate", "r" );
+        if( f )
+        {
+            i_x = i_y = 0;
+            fscanf( f, "(%d,%d)", &i_x, &i_y );
+            fclose( f );
+            p_intf->p_sys->i_calibrate = i_x;
+            p_intf->p_sys->sensor = APPLESMC_SENSOR;
+        }
+        else
+        {
+            p_intf->p_sys->sensor = NO_SENSOR;
+        }
-    }
-#ifdef __APPLE__
@@ -243 +264 @@
-{
-    FILE *f;
-
-
-
-
+
+
-    switch( p_intf->p_sys->sensor )
-    {
@@ -273 +292 @@
-
-        return - i_x * 30; /* FIXME: arbitrary */
+
+    case APPLESMC_SENSOR:
+        f = fopen( "/sys/devices/applesmc.768/position", "r" );
+        if( !f )
+        {
+            return 0;
+        }
+
+        i_x = i_y = i_z = 0;
+        fscanf( f, "(%d,%d,%d)", &i_x, &i_y, &i_z );
+        fclose( f );
+
+        return ( i_x - p_intf->p_sys->i_calibrate ) * 10;
+
-#ifdef __APPLE__
-    case UNIMOTION_SENSOR: