Merge branch 'AllWinner_refactor' of https://github.com/yeyeto2788/Adafruit_Blinka...

[hackapet/Adafruit_Blinka.git] / src / adafruit_blinka / microcontroller / generic_linux / spi.py

diff --git a/src/adafruit_blinka/microcontroller/generic_linux/spi.py b/src/adafruit_blinka/microcontroller/generic_linux/spi.py
index b90587316536e105499e17d317a2073079b7fb18..f2ffa823ec6a64c70570aed4cf68ad92ea14c67a 100755 (executable)
--- a/src/adafruit_blinka/microcontroller/generic_linux/spi.py
+++ b/src/adafruit_blinka/microcontroller/generic_linux/spi.py
@@ -1,5 +1,6 @@
 import spidev
 import time
 import spidev
 import time

+from adafruit_blinka.agnostic import detector

 
 class SPI:
     MSB = 0
 
 class SPI:
     MSB = 0


@@ -29,6 +30,15 @@ class SPI:
         self.baudrate = baudrate
         self.mode = mode
         self.bits = bits
         self.baudrate = baudrate
         self.mode = mode
         self.bits = bits

+        self.chip = detector.chip
+
+    def set_no_cs(self):
+        # No kernel seems to support this, so we're just going to pass
+        pass
+
+    @property
+    def frequency(self):
+        return self.baudrate

 
     def write(self, buf, start=0, end=None):
         if not buf:
 
     def write(self, buf, start=0, end=None):
         if not buf:


@@ -37,34 +47,28 @@ class SPI:
             end = len(buf)
         try:
             self._spi.open(self._port, 0)
             end = len(buf)
         try:
             self._spi.open(self._port, 0)

-            try:
-              self._spi.no_cs = True  # this doesn't work but try anyways
-            except AttributeError:
-              pass
+            self.set_no_cs()

             self._spi.max_speed_hz = self.baudrate
             self._spi.mode = self.mode
             self._spi.bits_per_word = self.bits
             self._spi.max_speed_hz = self.baudrate
             self._spi.mode = self.mode
             self._spi.bits_per_word = self.bits

-            self._spi.writebytes([x for x in buf[start:end]])
+            self._spi.writebytes2(buf[start:end])

             self._spi.close()
         except FileNotFoundError as not_found:
             print("Could not open SPI device - check if SPI is enabled in kernel!")
             raise
 
             self._spi.close()
         except FileNotFoundError as not_found:
             print("Could not open SPI device - check if SPI is enabled in kernel!")
             raise
 

-    def readinto(self, buf, start=0, end=None):
+    def readinto(self, buf, start=0, end=None, write_value=0):

         if not buf:
             return
         if end is None:
             end = len(buf)
         try:
             self._spi.open(self._port, 0)
         if not buf:
             return
         if end is None:
             end = len(buf)
         try:
             self._spi.open(self._port, 0)

-            try:
-              self._spi.no_cs = True  # this doesn't work but try anyways
-            except AttributeError:
-              pass
+            self.set_no_cs()

             self._spi.max_speed_hz = self.baudrate
             self._spi.mode = self.mode
             self._spi.bits_per_word = self.bits
             self._spi.max_speed_hz = self.baudrate
             self._spi.mode = self.mode
             self._spi.bits_per_word = self.bits

-            data = self._spi.readbytes(end-start)
+            data = self._spi.xfer([write_value]*(end-start))

             for i in range(end-start):  # 'readinto' the given buffer
               buf[start+i] = data[i]
             self._spi.close()
             for i in range(end-start):  # 'readinto' the given buffer
               buf[start+i] = data[i]
             self._spi.close()


@@ -77,17 +81,14 @@ class SPI:
         if not buffer_out or not buffer_in:
             return
         if out_end is None:
         if not buffer_out or not buffer_in:
             return
         if out_end is None:

-            out_end = len(buffer_out)        
+            out_end = len(buffer_out)

         if in_end is None:
             in_end = len(buffer_in)
         if out_end - out_start != in_end - in_start:
             raise RuntimeError('Buffer slices must be of equal length.')
         try:
             self._spi.open(self._port, 0)
         if in_end is None:
             in_end = len(buffer_in)
         if out_end - out_start != in_end - in_start:
             raise RuntimeError('Buffer slices must be of equal length.')
         try:
             self._spi.open(self._port, 0)

-            try:
-                self._spi.no_cs = True  # this doesn't work but try anyways
-            except AttributeError:
-                pass
+            self.set_no_cs()

             self._spi.max_speed_hz = self.baudrate
             self._spi.mode = self.mode
             self._spi.bits_per_word = self.bits
             self._spi.max_speed_hz = self.baudrate
             self._spi.mode = self.mode
             self._spi.bits_per_word = self.bits