From 0ffc1ba8b64287653c59a6ab8beaad6de6029935 Mon Sep 17 00:00:00 2001
From: Christian Gromm <christian.gromm@microchip.com>
Date: Tue, 6 Dec 2016 15:20:06 +0100
Subject: update NetworkManager to v3.0.4

This patch updates the NetworkManager binary to version v3.0.4.
Additionally, configuration scripts are added and updated to
match the camera setup.

Change-Id: I264f5bc88b120269bda576267e2ba7acfb6c2ec7
Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
---
 config-agl.xml | 194 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 154 insertions(+), 40 deletions(-)

(limited to 'config-agl.xml')

diff --git a/config-agl.xml b/config-agl.xml
index 97fcb5c..8824aee 100644
--- a/config-agl.xml
+++ b/config-agl.xml
@@ -1,24 +1,22 @@
 <?xml version="1.0"?>
 <root>
   <network_manager>
-    <endpoint>
-      <port_id>USB</port_id>
+    <local_connection>
       <device_api_ver>3</device_api_ver>
-      <data_type>CTRL</data_type>
-      <dir>IN</dir>
-      <channel_addr_hex>8f</channel_addr_hex>
-    </endpoint>
-    <endpoint>
       <port_id>USB</port_id>
-      <device_api_ver>f</device_api_ver>
-      <data_type>CTRL</data_type>
-      <dir>OUT</dir>
-      <channel_addr_hex>f</channel_addr_hex>
-    </endpoint>
-    <network_config>
       <timing_master>1</timing_master>
-      <async_bandwidth>276</async_bandwidth>
-    </network_config>
+      <async_bandwidth>212</async_bandwidth>
+      <endpoint>
+        <data_type>CTRL</data_type>
+        <dir>IN</dir>
+        <channel_addr_hex>8f</channel_addr_hex>
+      </endpoint>
+      <endpoint>
+        <data_type>CTRL</data_type>
+        <dir>OUT</dir>
+        <channel_addr_hex>f</channel_addr_hex>
+      </endpoint>
+    </local_connection>
 
     <!-- Server device with OS81118 D-Rev -->
     <device>
@@ -46,8 +44,8 @@
           <blockwidth>4</blockwidth>
         </socket>
       </channel>
-	  <channel>
-	  <channel_id>2</channel_id>
+      <channel>
+        <channel_id>2</channel_id>
         <socket>
           <port_id>USB</port_id>
           <data_type>SYNC</data_type>
@@ -67,8 +65,8 @@
           <blockwidth>4</blockwidth>
         </socket>
       </channel>
-	  <channel>
-	  <channel_id>3</channel_id>
+      <channel>
+        <channel_id>3</channel_id>
         <socket>
           <port_id>USB</port_id>
           <data_type>SYNC</data_type>
@@ -88,7 +86,7 @@
           <blockwidth>4</blockwidth>
         </socket>
       </channel>
-	  <channel>
+      <channel>
         <channel_id>4</channel_id>
         <socket>
           <port_id>USB</port_id>
@@ -108,13 +106,33 @@
           <subbuffer_size>188</subbuffer_size>
         </socket>
       </channel>
+      <channel>
+        <channel_id>5</channel_id>
+        <socket>
+          <port_id>USB</port_id>
+          <data_type>ISOC</data_type>
+          <dir>OUT</dir>
+          <channel_addr_hex>81</channel_addr_hex>
+          <subbuffer_size>188</subbuffer_size>
+          <number_of_buffers>32</number_of_buffers>
+          <buffer_size>7520</buffer_size>
+          <packets_per_xact>2</packets_per_xact>
+          <aim_type>V4L</aim_type>
+        </socket>
+        <socket>
+          <port_id>MOST</port_id>
+          <data_type>ISOC</data_type>
+          <dir>IN</dir>
+          <blockwidth>60</blockwidth>
+        </socket>
+      </channel>
     </device>
-    
+
     <!-- Slim amplifier 1 with OS81118 -->
     <device>
       <device_type_hex>370</device_type_hex>
       <device_api_ver>3</device_api_ver>
-      <script>i2c-slim-amplifier.script</script>
+      <script>i2c-slim-amplifier-v2.3.script</script>
       <channel>
         <channel_id>1</channel_id>
         <socket>
@@ -137,12 +155,12 @@
         </socket>
       </channel>
     </device>
-	
-	<!-- Slim amplifier 2 with OS81118 -->
+
+    <!-- Slim amplifier 2 with OS81118 -->
     <device>
       <device_type_hex>371</device_type_hex>
       <device_api_ver>3</device_api_ver>
-      <script>i2c-slim-amplifier.script</script>
+      <script>i2c-slim-amplifier-v2.3.script</script>
       <channel>
         <channel_id>1</channel_id>
         <socket>
@@ -165,12 +183,12 @@
         </socket>
       </channel>
     </device>
-	
-	<!-- Slim amplifier 3 with OS81118 -->
+
+    <!-- Slim amplifier 3 with OS81118 -->
     <device>
       <device_type_hex>372</device_type_hex>
       <device_api_ver>3</device_api_ver>
-      <script>i2c-slim-amplifier.script</script>
+      <script>i2c-slim-amplifier-v2.3.script</script>
       <channel>
         <channel_id>1</channel_id>
         <socket>
@@ -193,8 +211,8 @@
         </socket>
       </channel>
     </device>
-	
-	<!-- RSE with OS81118 USB -->
+
+    <!-- RSE with OS81118 USB -->
     <device>
       <device_type_hex>332</device_type_hex>
       <device_api_ver>3</device_api_ver>
@@ -212,8 +230,8 @@
           <port_id>USB</port_id>
           <data_type>ISOC</data_type>
           <dir>OUT</dir>
-	  <buffer_size>7520</buffer_size>
-	  <packets_per_xact>2</packets_per_xact>
+          <buffer_size>7520</buffer_size>
+          <packets_per_xact>2</packets_per_xact>
           <channel_addr_hex>83</channel_addr_hex>
           <subbuffer_size>188</subbuffer_size>
         </socket>
@@ -238,8 +256,74 @@
           <blockwidth>4</blockwidth>
         </socket>
       </channel>
+      <channel>
+        <channel_id>3</channel_id>
+        <socket>
+          <port_id>USB</port_id>
+          <data_type>ISOC</data_type>
+          <dir>OUT</dir>
+          <channel_addr_hex>81</channel_addr_hex>
+          <subbuffer_size>188</subbuffer_size>
+          <number_of_buffers>32</number_of_buffers>
+          <buffer_size>7520</buffer_size>
+          <packets_per_xact>2</packets_per_xact>
+        </socket>
+        <socket>
+          <port_id>MOST</port_id>
+          <data_type>ISOC</data_type>
+          <dir>IN</dir>
+          <blockwidth>60</blockwidth>
+        </socket>
+      </channel>
     </device>
-	
+
+    <!-- MOST camera with OS88133 -->
+    <device>
+      <device_type_hex>340</device_type_hex>
+      <device_api_ver>3</device_api_ver>
+      <script>camera-os88133-ap0100.script</script>
+      <channel>
+        <channel_id>1</channel_id>
+        <socket>
+          <port_id>MLB</port_id>
+          <data_type>ISOC</data_type>
+          <dir>IN</dir>
+          <blockwidth>60</blockwidth>
+          <channel_addr_hex>a</channel_addr_hex>
+        </socket>
+        <socket>
+          <port_id>MOST</port_id>
+          <data_type>ISOC</data_type>
+          <dir>OUT</dir>
+          <blockwidth>100</blockwidth>
+        </socket>
+      </channel>
+    </device>
+
+    <!-- MOST camera with OS88122 -->
+    <device>
+      <device_type_hex>321</device_type_hex>
+      <device_api_ver>1</device_api_ver>
+      <open_mlb_port_speed>3072</open_mlb_port_speed>
+      <script>camera-os88122-ts.script</script>
+      <channel>
+        <channel_id>1</channel_id>
+        <socket>
+          <port_id>MLB</port_id>
+          <data_type>ISOC</data_type>
+          <dir>IN</dir>
+          <blockwidth>60</blockwidth>
+          <channel_addr_hex>a</channel_addr_hex>
+        </socket>
+        <socket>
+          <port_id>MOST</port_id>
+          <data_type>ISOC</data_type>
+          <dir>OUT</dir>
+          <blockwidth>60</blockwidth>
+        </socket>
+      </channel>
+    </device>
+
     <!-- Routing 5.1 channel (1/3)-->
     <route>
       <terminal>
@@ -253,8 +337,8 @@
         <channel_id>1</channel_id>
       </terminal>
     </route>
-	
-	<!-- Routing 5.1 channel (2/3)-->
+
+    <!-- Routing 5.1 channel (2/3)-->
     <route>
       <terminal>
         <device_type_hex>311</device_type_hex>
@@ -267,8 +351,8 @@
         <channel_id>1</channel_id>
       </terminal>
     </route>
-	
-	<!-- Routing 5.1 channel (3/3)-->
+
+    <!-- Routing 5.1 channel (3/3)-->
     <route>
       <terminal>
         <device_type_hex>311</device_type_hex>
@@ -281,8 +365,8 @@
         <channel_id>1</channel_id>
       </terminal>
     </route>
-	
-	<!-- Routing Video (3/3)-->
+
+    <!-- Routing VoD Video-->
     <route>
       <terminal>
         <device_type_hex>311</device_type_hex>
@@ -300,6 +384,36 @@
         <channel_id>1</channel_id>
       </terminal>
     </route>
-	
+
+    <!-- Routing Camera Video-->
+    <route>
+      <terminal>
+        <device_type_hex>321</device_type_hex>
+        <instance>0</instance>
+        <channel_id>1</channel_id>
+      </terminal>
+      <terminal>
+        <device_type_hex>340</device_type_hex>
+        <instance>0</instance>
+        <channel_id>1</channel_id>
+      </terminal>
+      <terminal>
+        <device_type_hex>311</device_type_hex>
+        <instance>0</instance>
+        <channel_id>5</channel_id>
+      </terminal>
+      <terminal>
+        <device_type_hex>332</device_type_hex>
+        <instance>0</instance>
+        <channel_id>3</channel_id>
+      </terminal>
+      <terminal>
+        <device_type_hex>332</device_type_hex>
+        <instance>1</instance>
+        <channel_id>3</channel_id>
+      </terminal>
+    </route>
+
+
   </network_manager>
 </root>
-- 
cgit 1.2.3-korg