summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/CMakeLists.txt (renamed from HAL-afb/hal-most-unicens/CMakeLists.txt)0
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c (renamed from HAL-afb/hal-most-unicens/hal_most_unicens.c)0
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/ucs2-vol/CMakeLists.txt (renamed from HAL-afb/hal-most-unicens/ucs2-vol/CMakeLists.txt)0
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/device_container.h (renamed from HAL-afb/hal-most-unicens/ucs2-vol/inc/device_container.h)0
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/device_value.h (renamed from HAL-afb/hal-most-unicens/ucs2-vol/inc/device_value.h)0
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/libmostvolume.h (renamed from HAL-afb/hal-most-unicens/ucs2-vol/inc/libmostvolume.h)0
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/setup.h (renamed from HAL-afb/hal-most-unicens/ucs2-vol/inc/setup.h)0
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/CMakeLists.txt (renamed from HAL-afb/hal-most-unicens/ucs2-vol/src/CMakeLists.txt)0
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_container.cpp (renamed from HAL-afb/hal-most-unicens/ucs2-vol/src/device_container.cpp)0
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_value.cpp (renamed from HAL-afb/hal-most-unicens/ucs2-vol/src/device_value.cpp)0
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp (renamed from HAL-afb/hal-most-unicens/ucs2-vol/src/libmostvolume.cpp)0
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/setup.cpp (renamed from HAL-afb/hal-most-unicens/ucs2-vol/src/setup.cpp)0
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/wrap-json.c (renamed from HAL-afb/hal-most-unicens/wrap-json.c)0
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/wrap-json.h (renamed from HAL-afb/hal-most-unicens/wrap-json.h)0
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/wrap-json.md (renamed from HAL-afb/hal-most-unicens/wrap-json.md)0
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/wrap_unicens.c (renamed from HAL-afb/hal-most-unicens/wrap_unicens.c)0
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/wrap_unicens.h (renamed from HAL-afb/hal-most-unicens/wrap_unicens.h)0
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/wrap_volume.c (renamed from HAL-afb/hal-most-unicens/wrap_volume.c)0
-rw-r--r--HAL-afb/HAL_MOST_UNICENS/wrap_volume.h (renamed from HAL-afb/hal-most-unicens/wrap_volume.h)0
-rw-r--r--nbproject/configurations.xml217
20 files changed, 112 insertions, 105 deletions
diff --git a/HAL-afb/hal-most-unicens/CMakeLists.txt b/HAL-afb/HAL_MOST_UNICENS/CMakeLists.txt
index e532191..e532191 100644
--- a/HAL-afb/hal-most-unicens/CMakeLists.txt
+++ b/HAL-afb/HAL_MOST_UNICENS/CMakeLists.txt
diff --git a/HAL-afb/hal-most-unicens/hal_most_unicens.c b/HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c
index a5971fb..a5971fb 100644
--- a/HAL-afb/hal-most-unicens/hal_most_unicens.c
+++ b/HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/CMakeLists.txt b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/CMakeLists.txt
index 8735677..8735677 100644
--- a/HAL-afb/hal-most-unicens/ucs2-vol/CMakeLists.txt
+++ b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/CMakeLists.txt
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/inc/device_container.h b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/device_container.h
index 5e3b753..5e3b753 100644
--- a/HAL-afb/hal-most-unicens/ucs2-vol/inc/device_container.h
+++ b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/device_container.h
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/inc/device_value.h b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/device_value.h
index 21fdbdc..21fdbdc 100644
--- a/HAL-afb/hal-most-unicens/ucs2-vol/inc/device_value.h
+++ b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/device_value.h
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/inc/libmostvolume.h b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/libmostvolume.h
index 1d7249d..1d7249d 100644
--- a/HAL-afb/hal-most-unicens/ucs2-vol/inc/libmostvolume.h
+++ b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/libmostvolume.h
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/inc/setup.h b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/setup.h
index 63bc0e2..63bc0e2 100644
--- a/HAL-afb/hal-most-unicens/ucs2-vol/inc/setup.h
+++ b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/inc/setup.h
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/src/CMakeLists.txt b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/CMakeLists.txt
index 1be7184..1be7184 100644
--- a/HAL-afb/hal-most-unicens/ucs2-vol/src/CMakeLists.txt
+++ b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/CMakeLists.txt
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/src/device_container.cpp b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_container.cpp
index cef25b1..cef25b1 100644
--- a/HAL-afb/hal-most-unicens/ucs2-vol/src/device_container.cpp
+++ b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_container.cpp
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/src/device_value.cpp b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_value.cpp
index b8c681e..b8c681e 100644
--- a/HAL-afb/hal-most-unicens/ucs2-vol/src/device_value.cpp
+++ b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/device_value.cpp
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/src/libmostvolume.cpp b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp
index a90b5b1..a90b5b1 100644
--- a/HAL-afb/hal-most-unicens/ucs2-vol/src/libmostvolume.cpp
+++ b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/libmostvolume.cpp
diff --git a/HAL-afb/hal-most-unicens/ucs2-vol/src/setup.cpp b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/setup.cpp
index 61b8a68..61b8a68 100644
--- a/HAL-afb/hal-most-unicens/ucs2-vol/src/setup.cpp
+++ b/HAL-afb/HAL_MOST_UNICENS/ucs2-vol/src/setup.cpp
diff --git a/HAL-afb/hal-most-unicens/wrap-json.c b/HAL-afb/HAL_MOST_UNICENS/wrap-json.c
index 987a008..987a008 100644
--- a/HAL-afb/hal-most-unicens/wrap-json.c
+++ b/HAL-afb/HAL_MOST_UNICENS/wrap-json.c
diff --git a/HAL-afb/hal-most-unicens/wrap-json.h b/HAL-afb/HAL_MOST_UNICENS/wrap-json.h
index b5eadf5..b5eadf5 100644
--- a/HAL-afb/hal-most-unicens/wrap-json.h
+++ b/HAL-afb/HAL_MOST_UNICENS/wrap-json.h
diff --git a/HAL-afb/hal-most-unicens/wrap-json.md b/HAL-afb/HAL_MOST_UNICENS/wrap-json.md
index 3718b66..3718b66 100644
--- a/HAL-afb/hal-most-unicens/wrap-json.md
+++ b/HAL-afb/HAL_MOST_UNICENS/wrap-json.md
diff --git a/HAL-afb/hal-most-unicens/wrap_unicens.c b/HAL-afb/HAL_MOST_UNICENS/wrap_unicens.c
index 0cac86b..0cac86b 100644
--- a/HAL-afb/hal-most-unicens/wrap_unicens.c
+++ b/HAL-afb/HAL_MOST_UNICENS/wrap_unicens.c
diff --git a/HAL-afb/hal-most-unicens/wrap_unicens.h b/HAL-afb/HAL_MOST_UNICENS/wrap_unicens.h
index 268fb74..268fb74 100644
--- a/HAL-afb/hal-most-unicens/wrap_unicens.h
+++ b/HAL-afb/HAL_MOST_UNICENS/wrap_unicens.h
diff --git a/HAL-afb/hal-most-unicens/wrap_volume.c b/HAL-afb/HAL_MOST_UNICENS/wrap_volume.c
index cf70647..cf70647 100644
--- a/HAL-afb/hal-most-unicens/wrap_volume.c
+++ b/HAL-afb/HAL_MOST_UNICENS/wrap_volume.c
diff --git a/HAL-afb/hal-most-unicens/wrap_volume.h b/HAL-afb/HAL_MOST_UNICENS/wrap_volume.h
index 3378540..3378540 100644
--- a/HAL-afb/hal-most-unicens/wrap_volume.h
+++ b/HAL-afb/HAL_MOST_UNICENS/wrap_volume.h
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index f0f58e2..75a5a25 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -57,23 +57,15 @@
<in>hal-volramp.c</in>
<in>hal-volume.c</in>
</df>
- <df name="hal-most-unicens">
- <df name="ucs2-vol">
- <df name="src">
- <in>device_container.cpp</in>
- <in>device_value.cpp</in>
- <in>libmostvolume.cpp</in>
- <in>setup.cpp</in>
- </df>
- </df>
+ <df name="HAL-plugin">
+ <in>HalPlugPcm.c</in>
+ </df>
+ <df name="HAL_MOST_UNICENS">
<in>hal_most_unicens.c</in>
<in>wrap-json.c</in>
<in>wrap_unicens.c</in>
<in>wrap_volume.c</in>
</df>
- <df name="HAL-plugin">
- <in>HalPlugPcm.c</in>
- </df>
<df name="HDA-intel">
<in>IntelHdaHAL.c</in>
</df>
@@ -389,117 +381,132 @@
<cTool flags="4">
<incDir>
<pElem>Shared-Interface</pElem>
- <pElem>HAL-afb/HAL-interface</pElem>
- <pElem>build/HAL-afb/Unicens-USB</pElem>
+ <pElem>/usr/lib64/gcc/x86_64-suse-linux/5/include</pElem>
+ <pElem>build/HAL-afb/HAL-interface</pElem>
</incDir>
</cTool>
</item>
- <item path="HAL-afb/Unicens-USB/UnicensVol.c" ex="false" tool="0" flavor2="3">
- <cTool flags="4">
+ <item path="HAL-afb/HAL-interface/hal-volume.c" ex="false" tool="0" flavor2="3">
+ <cTool flags="3">
<incDir>
- <pElem>HAL-afb/HAL-interface</pElem>
- <pElem>build/HAL-afb/Unicens-USB</pElem>
+ <pElem>/usr/lib64/gcc/x86_64-suse-linux/5/include</pElem>
+ <pElem>build/HAL-afb/HAL-interface</pElem>
</incDir>
</cTool>
</item>
- <item path="HAL-afb/hal-most-unicens/hal_most_unicens.c"
- ex="false"
- tool="0"
- flavor2="3">
+ <item path="HAL-afb/HAL-plugin/HalPlugCb.c" ex="false" tool="0" flavor2="3">
+ <cTool flags="3">
<incDir>
- <pElem>/opt/AGL/include/afb</pElem>
- <pElem>HAL-afb/hal-most-unicens</pElem>
- <pElem>/usr/include/json-c</pElem>
- <pElem>Shared-Interface</pElem>
- <pElem>HAL-afb/HAL-interface</pElem>
+ <pElem>HAL-afb/HAL-plugin</pElem>
<pElem>/usr/lib64/gcc/x86_64-suse-linux/5/include</pElem>
- <pElem>/opt/AGL/include</pElem>
- <pElem>build/HAL-afb/hal-most-unicens</pElem>
+ <pElem>build/HAL-afb/HAL-plugin</pElem>
</incDir>
</cTool>
</item>
- <item path="HAL-afb/hal-most-unicens/ucs2-vol/src/device_container.cpp"
- ex="false"
- tool="1"
- flavor2="0">
- <ccTool flags="1">
+ <item path="HAL-afb/HAL-plugin/HalPlugCtl.c" ex="false" tool="0" flavor2="3">
+ <cTool flags="3">
<incDir>
- <pElem>HAL-afb/hal-most-unicens/ucs2-vol/inc</pElem>
- <pElem>HAL-afb/hal-most-unicens/ucs2-vol/src</pElem>
+ <pElem>HAL-afb/HAL-plugin</pElem>
+ <pElem>/usr/lib64/gcc/x86_64-suse-linux/5/include</pElem>
+ <pElem>build/HAL-afb/HAL-plugin</pElem>
</incDir>
- </ccTool>
+ </cTool>
</item>
- <item path="HAL-afb/hal-most-unicens/ucs2-vol/src/device_value.cpp"
- ex="false"
- tool="1"
- flavor2="0">
- <ccTool flags="1">
+ <item path="HAL-afb/HAL-plugin/HalPlugPcm.c" ex="false" tool="0" flavor2="3">
+ <cTool flags="1">
<incDir>
- <pElem>HAL-afb/hal-most-unicens/ucs2-vol/src</pElem>
- <pElem>HAL-afb/hal-most-unicens/ucs2-vol/inc</pElem>
+ <pElem>../../../opt/include/afb</pElem>
+ <pElem>HAL-afb/HAL-plugin</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>build/HAL-afb/HAL-plugin</pElem>
</incDir>
- </ccTool>
+ <preprocessorList>
+ <Elem>CONTROL_CDEV_RX="/dev/inic-usb-crx"</Elem>
+ <Elem>CONTROL_CDEV_TX="/dev/inic-usb-ctx"</Elem>
+ <Elem>MAX_SND_CARD=16</Elem>
+ </preprocessorList>
+ </cTool>
</item>
- <item path="HAL-afb/hal-most-unicens/ucs2-vol/src/libmostvolume.cpp"
+ <item path="HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c"
ex="false"
- tool="1"
- flavor2="0">
- <ccTool flags="1">
+ tool="0"
+ flavor2="3">
<incDir>
- <pElem>HAL-afb/hal-most-unicens/ucs2-vol/src</pElem>
- <pElem>HAL-afb/hal-most-unicens/ucs2-vol/inc</pElem>
+ <pElem>/opt/AGL/include/afb</pElem>
+ <pElem>HAL-afb/hal-most-unicens</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>Shared-Interface</pElem>
+ <pElem>HAL-afb/HAL-interface</pElem>
+ <pElem>build/HAL-afb/Unicens-USB</pElem>
</incDir>
- </ccTool>
+ </cTool>
</item>
- <item path="HAL-afb/hal-most-unicens/ucs2-vol/src/setup.cpp"
+ <item path="HAL-afb/HAL_MOST_UNICENS/wrap-json.c"
ex="false"
- tool="1"
- flavor2="0">
- <ccTool flags="1">
+ tool="0"
+ flavor2="3">
+ <cTool flags="3">
<incDir>
- <pElem>HAL-afb/hal-most-unicens/ucs2-vol/inc</pElem>
- <pElem>HAL-afb/hal-most-unicens/ucs2-vol/src</pElem>
+ <pElem>HAL-afb/HAL-interface</pElem>
+ <pElem>build/HAL-afb/Unicens-USB</pElem>
</incDir>
- </ccTool>
+ </cTool>
</item>
- <item path="HAL-afb/hal-most-unicens/wrap-json.c"
+ <item path="HAL-afb/HAL_MOST_UNICENS/wrap_unicens.c"
ex="false"
tool="0"
flavor2="3">
- <cTool flags="4">
<incDir>
+ <pElem>/opt/AGL/include/afb</pElem>
<pElem>HAL-afb/hal-most-unicens</pElem>
- <pElem>/usr/lib64/gcc/x86_64-suse-linux/5/include</pElem>
<pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/lib64/gcc/x86_64-suse-linux/5/include</pElem>
<pElem>build/HAL-afb/hal-most-unicens</pElem>
</incDir>
</cTool>
</item>
- <item path="HAL-afb/hal-most-unicens/wrap_unicens.c"
+ <item path="HAL-afb/HAL_MOST_UNICENS/wrap_volume.c"
ex="false"
tool="0"
flavor2="3">
- <cTool flags="4">
+ <cTool flags="3">
<incDir>
<pElem>/opt/AGL/include/afb</pElem>
<pElem>HAL-afb/hal-most-unicens</pElem>
- <pElem>/usr/include/json-c</pElem>
<pElem>/usr/lib64/gcc/x86_64-suse-linux/5/include</pElem>
+ <pElem>HAL-afb/hal-most-unicens/ucs2-vol/inc</pElem>
<pElem>build/HAL-afb/hal-most-unicens</pElem>
</incDir>
</cTool>
</item>
- <item path="HAL-afb/hal-most-unicens/wrap_volume.c"
+ <item path="HAL-afb/HDA-intel/IntelHdaHAL.c" ex="false" tool="0" flavor2="3">
+ <cTool flags="3">
+ </cTool>
+ </item>
+ <item path="HAL-afb/Scarlett-Focusrite/ScarlettUsbHAL.c"
ex="false"
tool="0"
flavor2="3">
- <cTool flags="4">
+ <cTool flags="3">
+ </cTool>
+ </item>
+ <item path="HAL-afb/Unicens-USB/UnicensHAL.c" ex="false" tool="0" flavor2="3">
+ <cTool flags="3">
<incDir>
- <pElem>/opt/AGL/include/afb</pElem>
- <pElem>HAL-afb/hal-most-unicens</pElem>
+ <pElem>Shared-Interface</pElem>
+ <pElem>HAL-afb/HAL-interface</pElem>
<pElem>/usr/lib64/gcc/x86_64-suse-linux/5/include</pElem>
- <pElem>HAL-afb/hal-most-unicens/ucs2-vol/inc</pElem>
- <pElem>build/HAL-afb/hal-most-unicens</pElem>
+ <pElem>/opt/AGL/include</pElem>
+ <pElem>build/HAL-afb/Unicens-USB</pElem>
+ </incDir>
+ </cTool>
+ </item>
+ <item path="HAL-afb/Unicens-USB/UnicensVol.c" ex="false" tool="0" flavor2="3">
+ <cTool flags="3">
+ <incDir>
+ <pElem>HAL-afb/HAL-interface</pElem>
+ <pElem>/usr/lib64/gcc/x86_64-suse-linux/5/include</pElem>
+ <pElem>build/HAL-afb/Unicens-USB</pElem>
</incDir>
</cTool>
</item>
@@ -512,7 +519,7 @@
</cTool>
</item>
<item path="Shared-Interface/audio-interface.c" ex="false" tool="0" flavor2="3">
- <cTool flags="4">
+ <cTool flags="3">
</cTool>
</folder>
<folder path="0/Alsa-afb">
@@ -918,6 +925,27 @@
<cTool flags="1">
</cTool>
</item>
+ <item path="HAL-afb/HAL_MOST_UNICENS/hal_most_unicens.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="4">
+ </cTool>
+ </item>
+ <item path="HAL-afb/HAL_MOST_UNICENS/wrap_unicens.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="4">
+ </cTool>
+ </item>
+ <item path="HAL-afb/HAL_MOST_UNICENS/wrap_volume.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="4">
+ </cTool>
+ </item>
<item path="HAL-afb/HDA-intel/IntelHdaHAL.c" ex="false" tool="0" flavor2="3">
<cTool flags="3">
</cTool>
@@ -954,27 +982,6 @@
</incDir>
</cTool>
</item>
- <item path="HAL-afb/hal-most-unicens/hal_most_unicens.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="4">
- </cTool>
- </item>
- <item path="HAL-afb/hal-most-unicens/wrap_unicens.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="4">
- </cTool>
- </item>
- <item path="HAL-afb/hal-most-unicens/wrap_volume.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="4">
- </cTool>
- </item>
<item path="HighLevel-afb/HighLevelApiConf.c" ex="false" tool="0" flavor2="3">
<cTool flags="2">
<incDir>
@@ -1062,6 +1069,18 @@
</incDir>
</cTool>
</folder>
+ <folder path="0/HAL-afb/HAL_MOST_UNICENS">
+ <cTool>
+ <incDir>
+ <pElem>HAL-afb/Scarlett-Focusrite</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>Shared-Interface</pElem>
+ <pElem>HAL-afb/HAL-interface</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>build/HAL-afb/Scarlett-Focusrite</pElem>
+ </incDir>
+ </cTool>
+ </folder>
<folder path="0/HAL-afb/HDA-intel">
<cTool>
<incDir>
@@ -1110,18 +1129,6 @@
</incDir>
</cTool>
</folder>
- <folder path="0/HAL-afb/hal-most-unicens">
- <cTool>
- <incDir>
- <pElem>HAL-afb/Scarlett-Focusrite</pElem>
- <pElem>/usr/include/json-c</pElem>
- <pElem>Shared-Interface</pElem>
- <pElem>HAL-afb/HAL-interface</pElem>
- <pElem>../../../opt/include</pElem>
- <pElem>build/HAL-afb/Scarlett-Focusrite</pElem>
- </incDir>
- </cTool>
- </folder>
<folder path="0/HighLevel-afb">
<cTool>
<incDir>