Merge socketcan_native and socketcan_ctypes into one (#326)

Also support broadcast channel

Author: christiansandberg

can/interface.py

@@ -20,6 +20,8 @@
 from .util import load_config
 from .interfaces import BACKENDS
 
+from can.interfaces.socketcan.socketcan import CyclicSendTask, MultiRateCyclicSendTask
+
 # Required by "detect_available_configs" for argument interpretation
 if sys.version_info.major > 2:
     basestring = str
@@ -37,14 +39,6 @@ def _get_class_for_interface(interface):
         ImportError     if there was a problem while importing the
                         interface or the bus class within that
     """
-
-    # filter out the socketcan special case
-    if interface == 'socketcan':
-        try:
-            interface = can.util.choose_socketcan_implementation()
-        except Exception as e:
-            raise ImportError("Cannot choose socketcan implementation: {}".format(e))
-
     # Find the correct backend
     try:
         module_name, class_name = BACKENDS[interface]
@@ -175,43 +169,3 @@ def detect_available_configs(interfaces=None):
             result += available
 
     return result
-
-
-class CyclicSendTask(CyclicSendTaskABC):
-
-    @staticmethod
-    def __new__(cls, channel, *args, **kwargs):
-
-        config = load_config(config={'channel': channel})
-
-        # Import the correct implementation of CyclicSendTask
-        if config['interface'] == 'socketcan_ctypes':
-            from can.interfaces.socketcan.socketcan_ctypes import CyclicSendTask as _ctypesCyclicSendTask
-            cls = _ctypesCyclicSendTask
-        elif config['interface'] == 'socketcan_native':
-            from can.interfaces.socketcan.socketcan_native import CyclicSendTask as _nativeCyclicSendTask
-            cls = _nativeCyclicSendTask
-        else:
-            raise can.CanError("Current CAN interface doesn't support CyclicSendTask")
-
-        return cls(config['channel'], *args, **kwargs)
-
-
-class MultiRateCyclicSendTask(MultiRateCyclicSendTaskABC):
-
-    @staticmethod
-    def __new__(cls, channel, *args, **kwargs):
-
-        config = load_config(config={'channel': channel})
-
-        # Import the correct implementation of CyclicSendTask
-        if config['interface'] == 'socketcan_ctypes':
-            from can.interfaces.socketcan.socketcan_ctypes import MultiRateCyclicSendTask as _ctypesMultiRateCyclicSendTask
-            cls = _ctypesMultiRateCyclicSendTask
-        elif config['interface'] == 'socketcan_native':
-            from can.interfaces.socketcan.socketcan_native import MultiRateCyclicSendTask as _nativeMultiRateCyclicSendTask
-            cls = _nativeMultiRateCyclicSendTask
-        else:
-            can.log.info("Current CAN interface doesn't support CyclicSendTask")
-
-        return cls(config['channel'], *args, **kwargs)

can/interfaces/__init__.py

@@ -10,8 +10,7 @@
 # interface_name => (module, classname)
 BACKENDS = {
     'kvaser':           ('can.interfaces.kvaser',           'KvaserBus'),
-    'socketcan_ctypes': ('can.interfaces.socketcan',        'SocketcanCtypes_Bus'),
-    'socketcan_native': ('can.interfaces.socketcan',        'SocketcanNative_Bus'),
+    'socketcan':        ('can.interfaces.socketcan',        'SocketcanBus'),
     'serial':           ('can.interfaces.serial.serial_can','SerialBus'),
     'pcan':             ('can.interfaces.pcan',             'PcanBus'),
     'usb2can':          ('can.interfaces.usb2can',          'Usb2canBus'),
@@ -29,4 +28,4 @@
     for interface in iter_entry_points('can.interface')
 })
 
-VALID_INTERFACES = frozenset(list(BACKENDS.keys()) + ['socketcan'])
+VALID_INTERFACES = frozenset(list(BACKENDS.keys()) + ['socketcan_native', 'socketcan_ctypes'])

can/interfaces/socketcan/__init__.py

@@ -5,6 +5,4 @@
 See: https://www.kernel.org/doc/Documentation/networking/can.txt
 """
 
-from can.interfaces.socketcan import socketcan_constants as constants
-from can.interfaces.socketcan.socketcan_ctypes import SocketcanCtypes_Bus
-from can.interfaces.socketcan.socketcan_native import SocketcanNative_Bus
+from can.interfaces.socketcan.socketcan import SocketcanBus, CyclicSendTask, MultiRateCyclicSendTask

can/interfaces/socketcan/socketcan_constants.py renamed to can/interfaces/socketcan/constants.py

@@ -53,6 +53,7 @@
 SOCK_DGRAM =    2
 AF_CAN =        PF_CAN
 
+SIOCGIFNAME =   0x8910
 SIOCGIFINDEX =  0x8933
 SIOCGSTAMP =    0x8906
 EXTFLG =        0x0004