Changeset 6000:e96f8ed8280b in roaraudio

Timestamp:

02/25/14 16:34:47 (10 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

hard disable SPI mode

File:

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

roard/driver_i2cdmx.c

@@ -31 +31 @@
 #include <linux/i2c-dev.h>
 
+// hard disable SPI mode.
+#ifdef ROAR_HAVE_H_LINUX_SPI_SPIDEV
+#undef ROAR_HAVE_H_LINUX_SPI_SPIDEV
+#endif
+
 #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_DELAY 50
+#define TRANSFER_SPEED 100000
 #define TRANSFER_BPW   8
+#define TRANSFER_CHANS 24
+#define TRANSFER_SIZE  (TRANSFER_CHANS+6)
+#define SPI_DEVICE     "file://dev/spidev0.0"
 #endif
 
@@ -75 +83 @@
  size_t startaddr;
  size_t len;
+#ifdef ROAR_HAVE_H_LINUX_SPI_SPIDEV
+ char txtransfer[TRANSFER_SIZE];
+ char rxtransfer[TRANSFER_SIZE];
+#endif
 };
 
-static int __spi_transfer(struct driver_i2cdmx * self, void * txbuffer, void * rxbuffer, size_t len) {
-#ifdef ROAR_HAVE_H_LINUX_SPI_SPIDEV
+#ifdef ROAR_HAVE_H_LINUX_SPI_SPIDEV
+static int __spi_transfer(struct driver_i2cdmx * self, size_t offset_in, size_t offset_out, size_t len) {
  struct spi_ioc_transfer transfer_buffer = {
-  .tx_buf = (unsigned long) txbuffer,
-  .rx_buf = (unsigned long) rxbuffer,
+  .tx_buf = (unsigned long) self->txtransfer,
+  .rx_buf = (unsigned long) self->rxtransfer,
   .len = len,
   .delay_usecs = TRANSFER_DELAY,
@@ -89 +101 @@
  struct roar_vio_sysio_ioctl ctl = {.cmd = SPI_IOC_MESSAGE(1), .argp = &transfer_buffer};
 
+ self->txtransfer[0] = 1; // command
+ self->txtransfer[1] = len;
+ self->txtransfer[2] = (offset_in & 0xFF00) >> 8;
+ self->txtransfer[3] =  offset_in & 0x00FF;
+ self->txtransfer[4] = (offset_in & 0xFF00) >> 8;
+ self->txtransfer[5] =  offset_in & 0x00FF;
+
  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
-}
+}
+#endif
 
 static inline int __i2c_set_slave(struct driver_i2cdmx * self) {
@@ -312 +328 @@
  self = vio->inst;
 
+ if ( count != 512 ) {
+  roar_err_set(ROAR_ERROR_INVAL);
+  return -1;
+ }
+
  if ( __i2c_start_dmx(self) == -1 )
   return -1;
 
- roar_err_set(ROAR_ERROR_NOSYS);
- return -1;
+ memset(buf, 0, count); // optimize this...
+#ifdef ROAR_HAVE_H_LINUX_SPI_SPIDEV
+ memcpy(buf, self->rxtransfer+6, sizeof(self->rxtransfer)-6);
+#endif
+ return 0;
 }
 
@@ -342 +366 @@
   if ( __i2c_write_channel(self, i, ((uint8_t*)buf)[i]) == -1 )
    return -1;
+#ifdef ROAR_HAVE_H_LINUX_SPI_SPIDEV
+ memcpy(self->txtransfer+6, buf, sizeof(self->txtransfer)-6);
+ __spi_transfer(self, 0, 0, TRANSFER_CHANS);
+#endif
 
  return count;
@@ -417 +445 @@
  }
 
+#if defined(ROAR_HAVE_H_LINUX_SPI_SPIDEV) && defined(SPI_DEVICE)
+ if ( roar_vio_open_dstr_simple(&(self->spi), SPI_DEVICE, ROAR_VIOF_READWRITE) == 0 )
+  self->have_spi = 1;
+#endif
+
  roar_vio_clear_calls(inst);
  inst->inst  = self;