Changeset 5908:66940b2023ee in roaraudio

Timestamp:

09/02/13 00:15:33 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added roard driver: i2cdmx.

Files:

• ChangeLog (modified) (1 diff)
• configure (modified) (1 diff)
• roard/Makefile (modified) (1 diff)
• roard/driver.c (modified) (1 diff)
• roard/driver_i2cdmx.c (added)
• roard/include/driver.h (modified) (1 diff)

ChangeLog

@@ -4 +4 @@
         * Added GPIO service.
         * Added GPIO driver: piface.
+        * Added roard driver: i2cdmx.
 
 v. 1.0beta9 - Mon Feb 18 2013 23:28 CET

configure

@@ -662 +662 @@
 test_lib_defmake ROAR_HAVE_H_ICONV       %            iconv.h       c          -- iconv.h
 test_lib_defmake ROAR_HAVE_H_NETINET_IN  %            'netinet/in.h' c         -- 'netinet/in.h'
-test_lib_defmake ROAR_HAVE_H_LINUX_REBOOT %            linux/reboot.h c        -- linux/reboot.h
-test_lib_defmake ROAR_HAVE_H_LINUX_SPI_SPIDEV %            linux/spi/spidev.h c        -- linux/spi/spidev.h
+test_lib_defmake ROAR_HAVE_H_LINUX_REBOOT %           linux/reboot.h c         -- linux/reboot.h
+test_lib_defmake ROAR_HAVE_H_LINUX_SPI_SPIDEV %       linux/spi/spidev.h c     -- linux/spi/spidev.h
+test_lib_defmake ROAR_HAVE_H_LINUX_I2C   %            linux/i2c.h   c          -- linux/i2c.h
+test_lib_defmake ROAR_HAVE_H_LINUX_I2C_DEV   %        linux/i2c-dev.h   c      -- linux/i2c-dev.h
 test_lib_defmake ROAR_HAVE_H_WINDOWS     %            windows.h     c          -- windows.h
 test_lib_defmake ROAR_HAVE_H_WINSOCK     %            winsock.h     c          -- winsock.h

roard/Makefile

@@ -3 +3 @@
 OBJ=roard.o driver.o mixer.o output.o signals.o loop.o clients.o streams.o network.o commands.o req.o sources.o sample.o meta.o codecfilter.o lib.o ssynth.o container_framework.o plugins.o memlock.o hwmixer.o auth.o caps.o rolestack.o
 SUBSYS=midi.o light.o raw.o rdtcs.o waveform.o beep.o
-DRV=driver_esd.o driver_ao.o driver_roar.o driver_oss.o driver_shout.o driver_sndio.o driver_dmx.o driver_pwmled.o driver_sysclock.o driver_wmm.o driver_dstr.o driver_alsa.o driver_rsound.o driver_portaudio.o driver_pulsesimple.o driver_jack.o driver_artsc.o
+DRV=driver_esd.o driver_ao.o driver_roar.o driver_oss.o driver_shout.o driver_sndio.o driver_dmx.o driver_pwmled.o driver_i2cdmx.o driver_sysclock.o driver_wmm.o driver_dstr.o driver_alsa.o driver_rsound.o driver_portaudio.o driver_pulsesimple.o driver_jack.o driver_artsc.o
 CF_CODEC=codecfilter_cmd.o codecfilter_vorbis.o codecfilter_celt.o codecfilter_speex.o codecfilter_alaw.o codecfilter_mulaw.o codecfilter_sndfile.o codecfilter_fishsound.o codecfilter_flac.o
 CF_CONTAINER=codecfilter_wave.o codecfilter_raum.o codecfilter_au.o

roard/driver.c

@@ -81 +81 @@
  {"pwmled", "PWM LED driver", "/dev/ttyS0", STREAM_DIR_OUT, DRV_FLAG_FHSEC, ROAR_SUBSYS_LIGHT,
   NULL, NULL, driver_pwmled_open_vio},
+#endif
+#ifdef ROAR_HAVE_DRIVER_I2CDMX
+ {"i2cdmx", "I^2C DMX Interface driver", "/dev/i2c-1", STREAM_DIR_BIDIR, DRV_FLAG_NONE, ROAR_SUBSYS_LIGHT,
+  NULL, NULL, driver_i2cdmx_open_vio},
 #endif
 #ifdef ROAR_HAVE_DRIVER_SYSCLOCK

roard/include/driver.h

@@ -115 +115 @@
 #endif
 
+#if !defined(ROAR_WITHOUT_VIO_DSTR) && !defined(ROAR_WITHOUT_DCOMP_DMX) && defined(ROAR_HAVE_H_LINUX_I2C) && defined(ROAR_HAVE_H_LINUX_I2C_DEV)
+#define ROAR_HAVE_DRIVER_I2CDMX
+int driver_i2cdmx_open_vio  (struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream);
+#endif
+
 #define DRV_FLAG_NONE           0x00
 #define DRV_FLAG_FHSEC          0x01