[vlc-devel] commit: Remove libsysfs code ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Feb 17 22:02:56 2010 +0200| [62d1845e1ba8a8f224503a525d1bfd72c0861dde] | committer: Rémi Denis-Courmont 

Remove libsysfs code

udev has dropped libsysfs in favor of libudev. Normally, you'd want to
port the code, but this only concerns old devices with FireWire.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=62d1845e1ba8a8f224503a525d1bfd72c0861dde
---

 configure.ac             |    9 ---------
 modules/demux/mp4/drms.c |   43 -------------------------------------------
 2 files changed, 0 insertions(+), 52 deletions(-)

diff --git a/configure.ac b/configure.ac
index 96cd9fc..a74906a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2950,15 +2950,6 @@ if test "${enable_realrtsp}" = "yes"; then
   VLC_ADD_PLUGIN([access_realrtsp])
 fi
 
-AC_ARG_ENABLE(libsysfs,
-  [  --enable-libsysfs       Get user key from firewire connected iPod via libsysfs (default enabled)])
-
-AS_IF([test "${enable_libsysfs}" != "no"],[
-  AC_CHECK_HEADERS(sysfs/libsysfs.h, [
-    VLC_ADD_LIBS([mp4 mkv],[-lsysfs])
-  ] )
-])
-
 dnl
 dnl skins2 module
 dnl
diff --git a/modules/demux/mp4/drms.c b/modules/demux/mp4/drms.c
index a996955..35d6057 100644
--- a/modules/demux/mp4/drms.c
+++ b/modules/demux/mp4/drms.c
@@ -62,10 +62,6 @@
 #   include <CoreFoundation/CFNumber.h>
 #endif
 
-#ifdef HAVE_SYSFS_LIBSYSFS_H
-#   include <sysfs/libsysfs.h>
-#endif
-
 #include "drms.h"
 #include "drmstables.h"
 
@@ -1791,45 +1787,6 @@ static int GetiPodID( int64_t *p_ipod_id )
 
         mach_port_deallocate( mach_task_self(), port );
     }
-
-#elif defined (HAVE_SYSFS_LIBSYSFS_H)
-    struct sysfs_bus *bus = NULL;
-    struct dlist *devlist = NULL;
-    struct dlist *attributes = NULL;
-    struct sysfs_device *curdev = NULL;
-    struct sysfs_attribute *curattr = NULL;
-
-    bus = sysfs_open_bus( "ieee1394" );
-    if( bus != NULL )
-    {
-        devlist = sysfs_get_bus_devices( bus );
-        if( devlist != NULL )
-        {
-            dlist_for_each_data( devlist, curdev, struct sysfs_device )
-            {
-                attributes = sysfs_get_device_attributes( curdev );
-                if( attributes != NULL )
-                {
-                    dlist_for_each_data( attributes, curattr,
-                                         struct sysfs_attribute )
-                    {
-                        if( ( strcmp( curattr->name, "model_name" ) == 0 ) &&
-                            ( strncmp( curattr->value, PROD_NAME,
-                                       sizeof(PROD_NAME) ) == 0 ) )
-                        {
-                            *p_ipod_id = strtoll( curdev->name, NULL, 16 );
-                            i_ret = 0;
-                            break;
-                        }
-                    }
-               }
-
-                if( !i_ret ) break;
-            }
-        }
-
-        sysfs_close_bus( bus );
-    }
 #endif
 
     return i_ret;