Update to DP4

Change-Id: I40b5c4367c5d37ca4ba42803aaca131fc7e4b814

Author: mangini

BUILD_NUMBER

@@ -1 +1 @@
-nyc-iot-release@3961477 NIG86K
+nyc-iot-release@4007815 NIH40D

armeabi-v7a/include/pio/i2s_device.h

@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SYSTEM_PERIPHERALMANAGER_I2S_H_
+#define SYSTEM_PERIPHERALMANAGER_I2S_H_
+
+#include <sys/cdefs.h>
+#include <sys/types.h>
+
+__BEGIN_DECLS
+
+/// @defgroup I2s I2s Interface
+/// @brief Functions to control I2S pins.
+///
+/// These functions can be used to control I2S.
+/// @{
+
+/// Possible encodings
+typedef enum APcmEncoding {
+  APCM_ENCODING_8_BIT,
+  APCM_ENCODING_16_BIT,
+  APCM_ENCODING_24_BIT,
+  APCM_ENCODING_32_BIT
+} APcmEncoding;
+
+typedef struct AI2sDevice AI2sDevice;
+
+/// Writes raw data to the I2S device. Multi-channel audio data is interleaved.
+/// @param i2s Pointer to the AI2s struct.
+/// @param data Data to write.
+/// @param offset Offset to first byte in data.
+/// @param size Number of bytes to write.
+/// @param bytes_written Number of bytes written.
+/// @return 0 on success, errno on error.
+int AI2sDevice_write(const AI2sDevice* i2s,
+                     const void* data,
+                     int offset,
+                     int size,
+                     int* bytes_written);
+
+/// Reads raw data from the I2S device. Multi-channel audio data is interleaved.
+/// @param i2s Pointer to the AI2s struct.
+/// @param data Buffer to fill with data read.
+/// @param offset Offset to first byte in data.
+/// @param size Number of bytes to read.
+/// @param bytes_read Number of bytes read.
+/// @return 0 on success, errno on error.
+int AI2sDevice_read(
+    const AI2sDevice* i2s, void* data, int offset, int size, int* bytes_read);
+
+/// Destroys an AI2s struct.
+/// @param i2s Pointer to the AI2s struct.
+void AI2sDevice_delete(AI2sDevice* i2s);
+
+/// @}
+
+__END_DECLS
+
+#endif  // SYSTEM_PERIPHERALMANAGER_I2S_H_

armeabi-v7a/include/pio/peripheral_manager_client.h

@@ -21,6 +21,7 @@
 
 #include "gpio.h"
 #include "i2c_device.h"
+#include "i2s_device.h"
 #include "pwm.h"
 #include "spi_device.h"
 #include "uart_device.h"
@@ -126,6 +127,31 @@ int APeripheralManagerClient_openUartDevice(
     const char* name,
     AUartDevice** dev);
 
+/// Returns the list of I2S buses.
+/// This does not take ownership into account.
+/// The list must be freed by the caller.
+/// @param client Pointer to the APeripheralManagerClient struct.
+/// @param num_i2s_buses Output pointer to the number of elements in the list.
+/// @return The list of I2S buses.
+char** APeripheralManagerClient_listI2sDevices(
+    const APeripheralManagerClient* client, int* num_i2s_buses);
+
+/// Opens an I2S device and takes ownership of it.
+/// @param client Pointer to the APeripheralManagerClient struct.
+/// @param name Name of the I2S device.
+/// @param encoding Device pcm encoding.
+/// @param channels Number of channels.
+/// @param rate Device rate in Hz.
+/// @param dev Output pointer to the AI2sDevice struct. Empty on error.
+/// @return 0 on success, errno on error
+int APeripheralManagerClient_openI2sDevice(
+    const APeripheralManagerClient* client,
+    const char* name,
+    APcmEncoding encoding,
+    int channels,
+    int rate,
+    AI2sDevice** dev);
+
 /// Creates a new client.
 /// @return A pointer to the created client. nullptr on errors.
 APeripheralManagerClient* APeripheralManagerClient_new();

armeabi-v7a/lib/libandroidthings.so

@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SYSTEM_PERIPHERALMANAGER_I2S_H_
+#define SYSTEM_PERIPHERALMANAGER_I2S_H_
+
+#include <sys/cdefs.h>
+#include <sys/types.h>
+
+__BEGIN_DECLS
+
+/// @defgroup I2s I2s Interface
+/// @brief Functions to control I2S pins.
+///
+/// These functions can be used to control I2S.
+/// @{
+
+/// Possible encodings
+typedef enum APcmEncoding {
+  APCM_ENCODING_8_BIT,
+  APCM_ENCODING_16_BIT,
+  APCM_ENCODING_24_BIT,
+  APCM_ENCODING_32_BIT
+} APcmEncoding;
+
+typedef struct AI2sDevice AI2sDevice;
+
+/// Writes raw data to the I2S device. Multi-channel audio data is interleaved.
+/// @param i2s Pointer to the AI2s struct.
+/// @param data Data to write.
+/// @param offset Offset to first byte in data.
+/// @param size Number of bytes to write.
+/// @param bytes_written Number of bytes written.
+/// @return 0 on success, errno on error.
+int AI2sDevice_write(const AI2sDevice* i2s,
+                     const void* data,
+                     int offset,
+                     int size,
+                     int* bytes_written);
+
+/// Reads raw data from the I2S device. Multi-channel audio data is interleaved.
+/// @param i2s Pointer to the AI2s struct.
+/// @param data Buffer to fill with data read.
+/// @param offset Offset to first byte in data.
+/// @param size Number of bytes to read.
+/// @param bytes_read Number of bytes read.
+/// @return 0 on success, errno on error.
+int AI2sDevice_read(
+    const AI2sDevice* i2s, void* data, int offset, int size, int* bytes_read);
+
+/// Destroys an AI2s struct.
+/// @param i2s Pointer to the AI2s struct.
+void AI2sDevice_delete(AI2sDevice* i2s);
+
+/// @}
+
+__END_DECLS
+
+#endif  // SYSTEM_PERIPHERALMANAGER_I2S_H_

x86/include/pio/i2s_device.h

@@ -21,6 +21,7 @@
 
 #include "gpio.h"
 #include "i2c_device.h"
+#include "i2s_device.h"
 #include "pwm.h"
 #include "spi_device.h"
 #include "uart_device.h"
@@ -126,6 +127,31 @@ int APeripheralManagerClient_openUartDevice(
     const char* name,
     AUartDevice** dev);
 
+/// Returns the list of I2S buses.
+/// This does not take ownership into account.
+/// The list must be freed by the caller.
+/// @param client Pointer to the APeripheralManagerClient struct.
+/// @param num_i2s_buses Output pointer to the number of elements in the list.
+/// @return The list of I2S buses.
+char** APeripheralManagerClient_listI2sDevices(
+    const APeripheralManagerClient* client, int* num_i2s_buses);
+
+/// Opens an I2S device and takes ownership of it.
+/// @param client Pointer to the APeripheralManagerClient struct.
+/// @param name Name of the I2S device.
+/// @param encoding Device pcm encoding.
+/// @param channels Number of channels.
+/// @param rate Device rate in Hz.
+/// @param dev Output pointer to the AI2sDevice struct. Empty on error.
+/// @return 0 on success, errno on error
+int APeripheralManagerClient_openI2sDevice(
+    const APeripheralManagerClient* client,
+    const char* name,
+    APcmEncoding encoding,
+    int channels,
+    int rate,
+    AI2sDevice** dev);
+
 /// Creates a new client.
 /// @return A pointer to the created client. nullptr on errors.
 APeripheralManagerClient* APeripheralManagerClient_new();