diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-04-26 17:25:23 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-12-22 15:03:52 -0800 |
| commit | af6d2409499da5ffb0da1cb4d3d50293774937e8 (patch) | |
| tree | 6408dc6254fb33e6e855fd3086ae9e7a6e41655f /mpm/python/usrp_mpm/periph_manager | |
| parent | 658bdb71d89d1d8cd4be88f7f1b28c44682f5850 (diff) | |
| download | uhd-af6d2409499da5ffb0da1cb4d3d50293774937e8.tar.gz uhd-af6d2409499da5ffb0da1cb4d3d50293774937e8.tar.bz2 uhd-af6d2409499da5ffb0da1cb4d3d50293774937e8.zip | |
mpm: Improved udev identification of SPI device nodes
Diffstat (limited to 'mpm/python/usrp_mpm/periph_manager')
| -rw-r--r-- | mpm/python/usrp_mpm/periph_manager/base.py | 4 | ||||
| -rw-r--r-- | mpm/python/usrp_mpm/periph_manager/udev.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mpm/python/usrp_mpm/periph_manager/base.py b/mpm/python/usrp_mpm/periph_manager/base.py index 459f8833f..4815bd88d 100644 --- a/mpm/python/usrp_mpm/periph_manager/base.py +++ b/mpm/python/usrp_mpm/periph_manager/base.py @@ -77,8 +77,8 @@ class PeriphManagerBase(object): # I know spidev masters on the dboard slots hw_pid = 2 if hw_pid in dboard_manager.HW_PIDS: - spi_devices = get_spidev_nodes("e0006000.spi") - self.log.debug("found spidev nodes: {0}".format(spi_devices)) + spi_devices = sorted(get_spidev_nodes("e0006000.spi")) + self.log.debug("Found spidev nodes: {0}".format(spi_devices)) dboard = dboard_manager.HW_PIDS.get(hw_pid, dboard_manager.unknown) self.dboards.update({dboard_slot: dboard(spi_devices, eeprom_data)}) diff --git a/mpm/python/usrp_mpm/periph_manager/udev.py b/mpm/python/usrp_mpm/periph_manager/udev.py index 6801d2163..9d64b1b64 100644 --- a/mpm/python/usrp_mpm/periph_manager/udev.py +++ b/mpm/python/usrp_mpm/periph_manager/udev.py @@ -38,7 +38,7 @@ def get_spidev_nodes(spi_master): """ context = pyudev.Context() parent = pyudev.Device.from_name(context, "platform", spi_master) - paths = [device.sys_path + paths = [device.device_node.encode('ascii') for device in context.list_devices(parent=parent, subsystem="spidev")] return paths |