Changeset 5998:fa7bf107cb7f in roaraudio for roard

Timestamp:

02/24/14 23:27:06 (10 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

first and most incomplet patch for SPI based transfers in the I2C DMX driver

File:

• roard/driver_i2cdmx.c (modified) (4 diffs)

roard/driver_i2cdmx.c

@@ -31 +31 @@
 #include <linux/i2c-dev.h>
 
+#ifdef ROAR_HAVE_H_LINUX_SPI_SPIDEV
+#include <linux/spi/spidev.h>
+#include <sys/ioctl.h>
+
+#define TRANSFER_DELAY 5
+#define TRANSFER_SPEED 1000000
+#define TRANSFER_BPW   8
+#endif
+
 #define DEFAULT_DEVICE  "/dev/i2c-1"
 
@@ -61 +70 @@
 struct driver_i2cdmx {
  struct roar_vio_calls vio;
+ struct roar_vio_calls spi;
+ int have_spi;
  uint8_t slave;
  size_t startaddr;
  size_t len;
 };
+
+static int __spi_transfer(struct driver_i2cdmx * self, void * txbuffer, void * rxbuffer, size_t len) {
+#ifdef ROAR_HAVE_H_LINUX_SPI_SPIDEV
+ struct spi_ioc_transfer transfer_buffer = {
+  .tx_buf = (unsigned long) txbuffer,
+  .rx_buf = (unsigned long) rxbuffer,
+  .len = len,
+  .delay_usecs = TRANSFER_DELAY,
+  .speed_hz = TRANSFER_SPEED,
+  .bits_per_word = TRANSFER_BPW,
+ };
+ struct roar_vio_sysio_ioctl ctl = {.cmd = SPI_IOC_MESSAGE(1), .argp = &transfer_buffer};
+
+ if ( roar_vio_ctl(self->spi, ROAR_VIO_CTL_SYSIO_IOCTL, &ctl) == -1 )
+  return -1;
+
+ return 0;
+#else
+ roar_err_set(ROAR_ERROR_NOSYS);
+ return -1;
+#endif
+}
 
 static inline int __i2c_set_slave(struct driver_i2cdmx * self) {
@@ -341 +374 @@
  struct driver_i2cdmx * self = vio->inst;
  roar_vio_close(&(self->vio));
+ if ( self->have_spi )
+  roar_vio_close(&(self->spi));
  roar_mm_free(self);
  return 0;
@@ -360 +395 @@
  }
  memset(self, 0, sizeof(*self));
+ self->have_spi  = 0;
  self->startaddr = 0;
  self->len       = info->channels;