aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Guiriec2013-01-28 13:48:21 -0600
committerSebastien Guiriec2013-02-05 05:36:59 -0600
commitef5bf2f297174568d4cbefb94ed72936ca6ac1c0 (patch)
tree822317fa06b45c9dee022ffaaabd8b59c1b62649
parentc7b5ba1d18d6aaf7cda22d0cdb69d537bd9e84f3 (diff)
downloadabefw-omap4plus-ef5bf2f297174568d4cbefb94ed72936ca6ac1c0.tar.gz
abefw-omap4plus-ef5bf2f297174568d4cbefb94ed72936ca6ac1c0.tar.xz
abefw-omap4plus-ef5bf2f297174568d4cbefb94ed72936ca6ac1c0.zip
abefw: Update according to new kernel header file.
Update in order to refect kernel header split. Signed-off-by: Sebastien Guiriec <s-guiriec@ti.com>
-rw-r--r--tasks/009590/abe_addr.c110
-rw-r--r--tasks/009590/abe_asrc.c23
-rw-r--r--tasks/abe-local.h25
3 files changed, 69 insertions, 89 deletions
diff --git a/tasks/009590/abe_addr.c b/tasks/009590/abe_addr.c
index b2cbdb4..5fb8afe 100644
--- a/tasks/009590/abe_addr.c
+++ b/tasks/009590/abe_addr.c
@@ -66,8 +66,7 @@
66#include <abe_initxxx_labels.h> 66#include <abe_initxxx_labels.h>
67#include <abe_taskid.h> 67#include <abe_taskid.h>
68 68
69#include <sound/soc/omap/aess/abe_typ.h> 69#include <sound/soc/omap/aess/aess-fw.h>
70#include <sound/soc/omap/aess/abe_port.h>
71 70
72#include "abe-local.h" 71#include "abe-local.h"
73 72
@@ -805,10 +804,8 @@ static const struct omap_aess_port abe_port_init_pp = {
805 .status = OMAP_ABE_PORT_ACTIVITY_IDLE, 804 .status = OMAP_ABE_PORT_ACTIVITY_IDLE,
806 .format = { 805 .format = {
807 .f = 48000, 806 .f = 48000,
808 .samp_format = STEREO_MSB, 807 .samp_format = OMAP_AESS_FORMAT_STEREO_MSB,
809 }, 808 },
810 .drift = NODRIFT,
811 .callback = NOCALLBACK,
812 .task = { 809 .task = {
813 .nb_task = 1, 810 .nb_task = 1,
814 .task = { 811 .task = {
@@ -937,15 +934,13 @@ struct omap_aess_port abe_port_init[LAST_PORT_ID] = {
937 .status = OMAP_ABE_PORT_ACTIVITY_IDLE, 934 .status = OMAP_ABE_PORT_ACTIVITY_IDLE,
938 .format = { 935 .format = {
939 .f = 96000, 936 .f = 96000,
940 .samp_format = SIX_MSB, 937 .samp_format = OMAP_AESS_FORMAT_SIX_MSB,
941 }, 938 },
942 .drift = NODRIFT,
943 .callback = NOCALLBACK,
944 .smem_buffer1 = 1, 939 .smem_buffer1 = 1,
945 .smem_buffer2 = (DMIC_ITER/6), 940 .smem_buffer2 = (DMIC_ITER/6),
946 .protocol = { 941 .protocol = {
947 .direction = SNK_P, 942 .direction = SNK_P,
948 .protocol_switch = DMIC_PORT_PROT, 943 .protocol_switch = OMAP_AESS_PORT_DMIC,
949 .p = { 944 .p = {
950 .prot_dmic = { 945 .prot_dmic = {
951 .buf_addr = dmem_dmic, 946 .buf_addr = dmem_dmic,
@@ -979,15 +974,13 @@ struct omap_aess_port abe_port_init[LAST_PORT_ID] = {
979 .status = OMAP_ABE_PORT_ACTIVITY_IDLE, 974 .status = OMAP_ABE_PORT_ACTIVITY_IDLE,
980 .format = { 975 .format = {
981 .f = 96000, 976 .f = 96000,
982 .samp_format = STEREO_MSB, 977 .samp_format = OMAP_AESS_FORMAT_STEREO_MSB,
983 }, 978 },
984 .drift = NODRIFT,
985 .callback = NOCALLBACK,
986 .smem_buffer1 = smem_amic, 979 .smem_buffer1 = smem_amic,
987 .smem_buffer2 = (MCPDM_UL_ITER/2), 980 .smem_buffer2 = (MCPDM_UL_ITER/2),
988 .protocol = { 981 .protocol = {
989 .direction = SNK_P, 982 .direction = SNK_P,
990 .protocol_switch = MCPDMUL_PORT_PROT, 983 .protocol_switch = OMAP_AESS_PORT_MCPDMUL,
991 .p = { 984 .p = {
992 .prot_mcpdmul = { 985 .prot_mcpdmul = {
993 .buf_addr = dmem_amic, 986 .buf_addr = dmem_amic,
@@ -1015,15 +1008,13 @@ struct omap_aess_port abe_port_init[LAST_PORT_ID] = {
1015 .status = OMAP_ABE_PORT_ACTIVITY_IDLE, 1008 .status = OMAP_ABE_PORT_ACTIVITY_IDLE,
1016 .format = { 1009 .format = {
1017 .f = 8000, 1010 .f = 8000,
1018 .samp_format = STEREO_MSB, 1011 .samp_format = OMAP_AESS_FORMAT_STEREO_MSB,
1019 }, 1012 },
1020 .drift = NODRIFT,
1021 .callback = NOCALLBACK,
1022 .smem_buffer1 = smem_bt_vx_ul_opp50, 1013 .smem_buffer1 = smem_bt_vx_ul_opp50,
1023 .smem_buffer2 = 1, 1014 .smem_buffer2 = 1,
1024 .protocol = { 1015 .protocol = {
1025 .direction = SNK_P, 1016 .direction = SNK_P,
1026 .protocol_switch = SERIAL_PORT_PROT, 1017 .protocol_switch = OMAP_AESS_PORT_SERIAL,
1027 .p = { 1018 .p = {
1028 .prot_serial = { 1019 .prot_serial = {
1029 .desc_addr = (MCBSP1_DMA_TX*ATC_SIZE), 1020 .desc_addr = (MCBSP1_DMA_TX*ATC_SIZE),
@@ -1104,15 +1095,13 @@ struct omap_aess_port abe_port_init[LAST_PORT_ID] = {
1104 .status = OMAP_ABE_PORT_ACTIVITY_IDLE, 1095 .status = OMAP_ABE_PORT_ACTIVITY_IDLE,
1105 .format = { 1096 .format = {
1106 .f = 48000, 1097 .f = 48000,
1107 .samp_format = STEREO_MSB, 1098 .samp_format = OMAP_AESS_FORMAT_STEREO_MSB,
1108 }, 1099 },
1109 .drift = NODRIFT,
1110 .callback = NOCALLBACK,
1111 .smem_buffer1 = smem_mm_ul, 1100 .smem_buffer1 = smem_mm_ul,
1112 .smem_buffer2 = 1, 1101 .smem_buffer2 = 1,
1113 .protocol = { 1102 .protocol = {
1114 .direction = SRC_P, 1103 .direction = SRC_P,
1115 .protocol_switch = DMAREQ_PORT_PROT, 1104 .protocol_switch = OMAP_AESS_PORT_DMAREQ,
1116 .p = { 1105 .p = {
1117 .prot_dmareq = { 1106 .prot_dmareq = {
1118 .desc_addr = (CBPr_DMA_RTX3*ATC_SIZE), 1107 .desc_addr = (CBPr_DMA_RTX3*ATC_SIZE),
@@ -1144,15 +1133,13 @@ struct omap_aess_port abe_port_init[LAST_PORT_ID] = {
1144 .status = OMAP_ABE_PORT_ACTIVITY_IDLE, 1133 .status = OMAP_ABE_PORT_ACTIVITY_IDLE,
1145 .format = { 1134 .format = {
1146 .f = 48000, 1135 .f = 48000,
1147 .samp_format = STEREO_MSB, 1136 .samp_format = OMAP_AESS_FORMAT_STEREO_MSB,
1148 }, 1137 },
1149 .drift = NODRIFT,
1150 .callback = NOCALLBACK,
1151 .smem_buffer1 = smem_mm_ul2, 1138 .smem_buffer1 = smem_mm_ul2,
1152 .smem_buffer2 = 1, 1139 .smem_buffer2 = 1,
1153 .protocol = { 1140 .protocol = {
1154 .direction = SRC_P, 1141 .direction = SRC_P,
1155 .protocol_switch = DMAREQ_PORT_PROT, 1142 .protocol_switch = OMAP_AESS_PORT_DMAREQ,
1156 .p = { 1143 .p = {
1157 .prot_dmareq = { 1144 .prot_dmareq = {
1158 .desc_addr = (CBPr_DMA_RTX4*ATC_SIZE), 1145 .desc_addr = (CBPr_DMA_RTX4*ATC_SIZE),
@@ -1184,15 +1171,13 @@ struct omap_aess_port abe_port_init[LAST_PORT_ID] = {
1184 .status = OMAP_ABE_PORT_ACTIVITY_IDLE, 1171 .status = OMAP_ABE_PORT_ACTIVITY_IDLE,
1185 .format = { 1172 .format = {
1186 .f = 8000, 1173 .f = 8000,
1187 .samp_format = MONO_MSB, 1174 .samp_format = OMAP_AESS_FORMAT_MONO_MSB,
1188 }, 1175 },
1189 .drift = NODRIFT,
1190 .callback = NOCALLBACK,
1191 .smem_buffer1 = smem_vx_ul, 1176 .smem_buffer1 = smem_vx_ul,
1192 .smem_buffer2 = 1, 1177 .smem_buffer2 = 1,
1193 .protocol = { 1178 .protocol = {
1194 .direction = SRC_P, 1179 .direction = SRC_P,
1195 .protocol_switch = DMAREQ_PORT_PROT, 1180 .protocol_switch = OMAP_AESS_PORT_DMAREQ,
1196 .p = { 1181 .p = {
1197 .prot_dmareq = { 1182 .prot_dmareq = {
1198 .desc_addr = (CBPr_DMA_RTX2*ATC_SIZE), 1183 .desc_addr = (CBPr_DMA_RTX2*ATC_SIZE),
@@ -1328,15 +1313,13 @@ struct omap_aess_port abe_port_init[LAST_PORT_ID] = {
1328 .status = OMAP_ABE_PORT_ACTIVITY_IDLE, 1313 .status = OMAP_ABE_PORT_ACTIVITY_IDLE,
1329 .format = { 1314 .format = {
1330 .f = 48000, 1315 .f = 48000,
1331 .samp_format = STEREO_MSB, 1316 .samp_format = OMAP_AESS_FORMAT_STEREO_MSB,
1332 }, 1317 },
1333 .drift = NODRIFT,
1334 .callback = NOCALLBACK,
1335 .smem_buffer1 = smem_mm_dl, 1318 .smem_buffer1 = smem_mm_dl,
1336 .smem_buffer2 = 1, 1319 .smem_buffer2 = 1,
1337 .protocol = { 1320 .protocol = {
1338 .direction = SNK_P, 1321 .direction = SNK_P,
1339 .protocol_switch = DMAREQ_PORT_PROT, 1322 .protocol_switch = OMAP_AESS_PORT_DMAREQ,
1340 .p = { 1323 .p = {
1341 .prot_dmareq = { 1324 .prot_dmareq = {
1342 .desc_addr = (CBPr_DMA_RTX0*ATC_SIZE), 1325 .desc_addr = (CBPr_DMA_RTX0*ATC_SIZE),
@@ -1422,15 +1405,13 @@ struct omap_aess_port abe_port_init[LAST_PORT_ID] = {
1422 .status = OMAP_ABE_PORT_ACTIVITY_IDLE, 1405 .status = OMAP_ABE_PORT_ACTIVITY_IDLE,
1423 .format = { 1406 .format = {
1424 .f = 8000, 1407 .f = 8000,
1425 .samp_format = MONO_MSB, 1408 .samp_format = OMAP_AESS_FORMAT_MONO_MSB,
1426 }, 1409 },
1427 .drift = NODRIFT,
1428 .callback = NOCALLBACK,
1429 .smem_buffer1 = smem_vx_dl, 1410 .smem_buffer1 = smem_vx_dl,
1430 .smem_buffer2 = 1, 1411 .smem_buffer2 = 1,
1431 .protocol = { 1412 .protocol = {
1432 .direction = SNK_P, 1413 .direction = SNK_P,
1433 .protocol_switch = DMAREQ_PORT_PROT, 1414 .protocol_switch = OMAP_AESS_PORT_DMAREQ,
1434 .p = { 1415 .p = {
1435 .prot_dmareq = { 1416 .prot_dmareq = {
1436 .desc_addr = (CBPr_DMA_RTX1*ATC_SIZE), 1417 .desc_addr = (CBPr_DMA_RTX1*ATC_SIZE),
@@ -1566,15 +1547,13 @@ struct omap_aess_port abe_port_init[LAST_PORT_ID] = {
1566 .status = OMAP_ABE_PORT_ACTIVITY_IDLE, 1547 .status = OMAP_ABE_PORT_ACTIVITY_IDLE,
1567 .format = { 1548 .format = {
1568 .f = 48000, 1549 .f = 48000,
1569 .samp_format = STEREO_MSB, 1550 .samp_format = OMAP_AESS_FORMAT_STEREO_MSB,
1570 }, 1551 },
1571 .drift = NODRIFT,
1572 .callback = NOCALLBACK,
1573 .smem_buffer1 = smem_tones_dl, 1552 .smem_buffer1 = smem_tones_dl,
1574 .smem_buffer2 = 1, 1553 .smem_buffer2 = 1,
1575 .protocol = { 1554 .protocol = {
1576 .direction = SNK_P, 1555 .direction = SNK_P,
1577 .protocol_switch = DMAREQ_PORT_PROT, 1556 .protocol_switch = OMAP_AESS_PORT_DMAREQ,
1578 .p = { 1557 .p = {
1579 .prot_dmareq = { 1558 .prot_dmareq = {
1580 .desc_addr = (CBPr_DMA_RTX5*ATC_SIZE), 1559 .desc_addr = (CBPr_DMA_RTX5*ATC_SIZE),
@@ -1639,15 +1618,13 @@ struct omap_aess_port abe_port_init[LAST_PORT_ID] = {
1639 .status = OMAP_ABE_PORT_ACTIVITY_IDLE, 1618 .status = OMAP_ABE_PORT_ACTIVITY_IDLE,
1640 .format = { 1619 .format = {
1641 .f = 48000, 1620 .f = 48000,
1642 .samp_format = STEREO_MSB, 1621 .samp_format = OMAP_AESS_FORMAT_STEREO_MSB,
1643 }, 1622 },
1644 .drift = NODRIFT,
1645 .callback = NOCALLBACK,
1646 .smem_buffer1 = DL1_GAIN_out_labelID, 1623 .smem_buffer1 = DL1_GAIN_out_labelID,
1647 .smem_buffer2 = 1, 1624 .smem_buffer2 = 1,
1648 .protocol = { 1625 .protocol = {
1649 .direction = SRC_P, 1626 .direction = SRC_P,
1650 .protocol_switch = SERIAL_PORT_PROT, 1627 .protocol_switch = OMAP_AESS_PORT_SERIAL,
1651 .p = { 1628 .p = {
1652 .prot_serial = { 1629 .prot_serial = {
1653 .desc_addr = (MCASP1_TX*ATC_SIZE), 1630 .desc_addr = (MCASP1_TX*ATC_SIZE),
@@ -1677,15 +1654,13 @@ struct omap_aess_port abe_port_init[LAST_PORT_ID] = {
1677 .status = OMAP_ABE_PORT_ACTIVITY_IDLE, 1654 .status = OMAP_ABE_PORT_ACTIVITY_IDLE,
1678 .format = { 1655 .format = {
1679 .f = 8000, 1656 .f = 8000,
1680 .samp_format = MONO_MSB, 1657 .samp_format = OMAP_AESS_FORMAT_MONO_MSB,
1681 }, 1658 },
1682 .drift = NODRIFT,
1683 .callback = NOCALLBACK,
1684 .smem_buffer1 = smem_bt_vx_dl_opp50, 1659 .smem_buffer1 = smem_bt_vx_dl_opp50,
1685 .smem_buffer2 = 1, 1660 .smem_buffer2 = 1,
1686 .protocol = { 1661 .protocol = {
1687 .direction = SRC_P, 1662 .direction = SRC_P,
1688 .protocol_switch = SERIAL_PORT_PROT, 1663 .protocol_switch = OMAP_AESS_PORT_SERIAL,
1689 .p = { 1664 .p = {
1690 .prot_serial = { 1665 .prot_serial = {
1691 .desc_addr = (MCBSP1_DMA_RX*ATC_SIZE), 1666 .desc_addr = (MCBSP1_DMA_RX*ATC_SIZE),
@@ -1760,15 +1735,13 @@ struct omap_aess_port abe_port_init[LAST_PORT_ID] = {
1760 .status = OMAP_ABE_PORT_ACTIVITY_IDLE, 1735 .status = OMAP_ABE_PORT_ACTIVITY_IDLE,
1761 .format = { 1736 .format = {
1762 .f = 96000, 1737 .f = 96000,
1763 .samp_format = SIX_MSB, 1738 .samp_format = OMAP_AESS_FORMAT_SIX_MSB,
1764 }, 1739 },
1765 .drift = NODRIFT,
1766 .callback = NOCALLBACK,
1767 .smem_buffer1 = 1, 1740 .smem_buffer1 = 1,
1768 .smem_buffer2 = (MCPDM_DL_ITER/6), 1741 .smem_buffer2 = (MCPDM_DL_ITER/6),
1769 .protocol = { 1742 .protocol = {
1770 .direction = SRC_P, 1743 .direction = SRC_P,
1771 .protocol_switch = MCPDMDL_PORT_PROT, 1744 .protocol_switch = OMAP_AESS_PORT_MCPDMDL,
1772 .p = { 1745 .p = {
1773 .prot_mcpdmdl = { 1746 .prot_mcpdmdl = {
1774 .buf_addr = dmem_mcpdm, 1747 .buf_addr = dmem_mcpdm,
@@ -1801,15 +1774,13 @@ struct omap_aess_port abe_port_init[LAST_PORT_ID] = {
1801 .status = OMAP_ABE_PORT_ACTIVITY_IDLE, 1774 .status = OMAP_ABE_PORT_ACTIVITY_IDLE,
1802 .format = { 1775 .format = {
1803 .f = 48000, 1776 .f = 48000,
1804 .samp_format = STEREO_MSB, 1777 .samp_format = OMAP_AESS_FORMAT_STEREO_MSB,
1805 }, 1778 },
1806 .drift = NODRIFT,
1807 .callback = NOCALLBACK,
1808 .smem_buffer1 = smem_mm_ext_out, 1779 .smem_buffer1 = smem_mm_ext_out,
1809 .smem_buffer2 = 1, 1780 .smem_buffer2 = 1,
1810 .protocol = { 1781 .protocol = {
1811 .direction = SRC_P, 1782 .direction = SRC_P,
1812 .protocol_switch = SERIAL_PORT_PROT, 1783 .protocol_switch = OMAP_AESS_PORT_SERIAL,
1813 .p = { 1784 .p = {
1814 .prot_serial = { 1785 .prot_serial = {
1815 .desc_addr = (MCBSP1_DMA_TX*ATC_SIZE), 1786 .desc_addr = (MCBSP1_DMA_TX*ATC_SIZE),
@@ -1839,15 +1810,13 @@ struct omap_aess_port abe_port_init[LAST_PORT_ID] = {
1839 .status = OMAP_ABE_PORT_ACTIVITY_IDLE, 1810 .status = OMAP_ABE_PORT_ACTIVITY_IDLE,
1840 .format = { 1811 .format = {
1841 .f = 48000, 1812 .f = 48000,
1842 .samp_format = STEREO_MSB, 1813 .samp_format = OMAP_AESS_FORMAT_STEREO_MSB,
1843 }, 1814 },
1844 .drift = NODRIFT,
1845 .callback = NOCALLBACK,
1846 .smem_buffer1 = smem_mm_ext_in_opp100, 1815 .smem_buffer1 = smem_mm_ext_in_opp100,
1847 .smem_buffer2 = 1, 1816 .smem_buffer2 = 1,
1848 .protocol = { 1817 .protocol = {
1849 .direction = SNK_P, 1818 .direction = SNK_P,
1850 .protocol_switch = SERIAL_PORT_PROT, 1819 .protocol_switch = OMAP_AESS_PORT_SERIAL,
1851 .p = { 1820 .p = {
1852 .prot_serial = { 1821 .prot_serial = {
1853 .desc_addr = (MCBSP1_DMA_RX*ATC_SIZE), 1822 .desc_addr = (MCBSP1_DMA_RX*ATC_SIZE),
@@ -1877,15 +1846,13 @@ struct omap_aess_port abe_port_init[LAST_PORT_ID] = {
1877 .status = OMAP_ABE_PORT_ACTIVITY_IDLE, 1846 .status = OMAP_ABE_PORT_ACTIVITY_IDLE,
1878 .format = { 1847 .format = {
1879 .f = 48000, 1848 .f = 48000,
1880 .samp_format = STEREO_MSB, 1849 .samp_format = OMAP_AESS_FORMAT_STEREO_MSB,
1881 }, 1850 },
1882 .drift = NODRIFT,
1883 .callback = NOCALLBACK,
1884 .smem_buffer1 = 1, 1851 .smem_buffer1 = 1,
1885 .smem_buffer2 = 1, 1852 .smem_buffer2 = 1,
1886 .protocol = { 1853 .protocol = {
1887 .direction = SRC_P, 1854 .direction = SRC_P,
1888 .protocol_switch = SERIAL_PORT_PROT, 1855 .protocol_switch = OMAP_AESS_PORT_SERIAL,
1889 .p = { 1856 .p = {
1890 .prot_serial = { 1857 .prot_serial = {
1891 .desc_addr = (MCBSP3_DMA_TX * ATC_SIZE), 1858 .desc_addr = (MCBSP3_DMA_TX * ATC_SIZE),
@@ -1908,15 +1875,13 @@ struct omap_aess_port abe_port_init[LAST_PORT_ID] = {
1908 .status = OMAP_ABE_PORT_ACTIVITY_IDLE, 1875 .status = OMAP_ABE_PORT_ACTIVITY_IDLE,
1909 .format = { 1876 .format = {
1910 .f = 48000, 1877 .f = 48000,
1911 .samp_format = STEREO_MSB, 1878 .samp_format = OMAP_AESS_FORMAT_STEREO_MSB,
1912 }, 1879 },
1913 .drift = NODRIFT,
1914 .callback = NOCALLBACK,
1915 .smem_buffer1 = 1, 1880 .smem_buffer1 = 1,
1916 .smem_buffer2 = 1, 1881 .smem_buffer2 = 1,
1917 .protocol = { 1882 .protocol = {
1918 .direction = SRC_P, 1883 .direction = SRC_P,
1919 .protocol_switch = SERIAL_PORT_PROT, 1884 .protocol_switch = OMAP_AESS_PORT_SERIAL,
1920 .p = { 1885 .p = {
1921 .prot_serial = { 1886 .prot_serial = {
1922 .desc_addr = (MCBSP3_DMA_RX * ATC_SIZE), 1887 .desc_addr = (MCBSP3_DMA_RX * ATC_SIZE),
@@ -1939,15 +1904,13 @@ struct omap_aess_port abe_port_init[LAST_PORT_ID] = {
1939 .status = OMAP_ABE_PORT_ACTIVITY_IDLE, 1904 .status = OMAP_ABE_PORT_ACTIVITY_IDLE,
1940 .format = { 1905 .format = {
1941 .f = 48000, 1906 .f = 48000,
1942 .samp_format = MONO_MSB, 1907 .samp_format = OMAP_AESS_FORMAT_MONO_MSB,
1943 }, 1908 },
1944 .drift = NODRIFT,
1945 .callback = NOCALLBACK,
1946 .smem_buffer1 = 1, 1909 .smem_buffer1 = 1,
1947 .smem_buffer2 = 1, 1910 .smem_buffer2 = 1,
1948 .protocol = { 1911 .protocol = {
1949 .direction = SRC_P, 1912 .direction = SRC_P,
1950 .protocol_switch = DMAREQ_PORT_PROT, 1913 .protocol_switch = OMAP_AESS_PORT_DMAREQ,
1951 .p = { 1914 .p = {
1952 .prot_dmareq = { 1915 .prot_dmareq = {
1953 .desc_addr = (CBPr_DMA_RTX7 * ATC_SIZE), 1916 .desc_addr = (CBPr_DMA_RTX7 * ATC_SIZE),
@@ -1969,4 +1932,3 @@ struct omap_aess_port abe_port_init[LAST_PORT_ID] = {
1969 }, 1932 },
1970}; 1933};
1971 1934
1972
diff --git a/tasks/009590/abe_asrc.c b/tasks/009590/abe_asrc.c
index 1f4662b..348a1af 100644
--- a/tasks/009590/abe_asrc.c
+++ b/tasks/009590/abe_asrc.c
@@ -63,8 +63,7 @@
63#include <abegen.h> 63#include <abegen.h>
64 64
65/* kernel ABE header */ 65/* kernel ABE header */
66#include <sound/soc/omap/aess/abe_typ.h> 66#include <sound/soc/omap/aess/aess-fw.h>
67#include <sound/soc/omap/aess/abe_port.h>
68 67
69/* abe HAL non kernel headers, we should be using kernel headers here ?? */ 68/* abe HAL non kernel headers, we should be using kernel headers here ?? */
70#include <abe_define.h> 69#include <abe_define.h>
@@ -349,8 +348,8 @@ int omap_aess_init_asrc_vx_dl(s32 *el, s32 dppm)
349 /* 8. drift_ASRC = 0 & drift_io = 0 */ 348 /* 8. drift_ASRC = 0 & drift_io = 0 */
350 mem_tag = ABE_DMEM; 349 mem_tag = ABE_DMEM;
351 mem_addr = OMAP_ABE_D_IODESCR_ADDR + 350 mem_addr = OMAP_ABE_D_IODESCR_ADDR +
352 (OMAP_ABE_VX_DL_PORT * sizeof(struct ABE_SIODescriptor)) + 351 (OMAP_ABE_VX_DL_PORT * sizeof(struct omap_aess_io_desc)) +
353 offsetof(struct ABE_SIODescriptor, drift_asrc); 352 offsetof(struct omap_aess_io_desc, drift_asrc);
354 el[i] = (mem_tag << 16) + mem_addr; 353 el[i] = (mem_tag << 16) + mem_addr;
355 el[i + 1] = temp0; 354 el[i + 1] = temp0;
356 /* dummy field */ 355 /* dummy field */
@@ -559,8 +558,8 @@ int omap_aess_init_asrc_vx_ul(s32 *el, s32 dppm)
559 /* 8. drift_ASRC = 0 & drift_io = 0 */ 558 /* 8. drift_ASRC = 0 & drift_io = 0 */
560 mem_tag = ABE_DMEM; 559 mem_tag = ABE_DMEM;
561 mem_addr = OMAP_ABE_D_IODESCR_ADDR + 560 mem_addr = OMAP_ABE_D_IODESCR_ADDR +
562 (OMAP_ABE_VX_UL_PORT * sizeof(struct ABE_SIODescriptor)) + 561 (OMAP_ABE_VX_UL_PORT * sizeof(struct omap_aess_io_desc)) +
563 offsetof(struct ABE_SIODescriptor, drift_asrc); 562 offsetof(struct omap_aess_io_desc, drift_asrc);
564 el[i] = (mem_tag << 16) + mem_addr; 563 el[i] = (mem_tag << 16) + mem_addr;
565 el[i + 1] = temp0; 564 el[i + 1] = temp0;
566 /* dummy field */ 565 /* dummy field */
@@ -782,8 +781,8 @@ void omap_aess_init_asrc_mm_ext_in(struct omap_aess *abe, s32 dppm)
782 i = i + 3; 781 i = i + 3;
783 /* 8. drift_ASRC = 0 & drift_io = 0 */ 782 /* 8. drift_ASRC = 0 & drift_io = 0 */
784 mem_tag = ABE_DMEM; 783 mem_tag = ABE_DMEM;
785 mem_addr = OMAP_ABE_D_IODESCR_ADDR + (OMAP_ABE_MM_EXT_IN_PORT * sizeof(struct ABE_SIODescriptor)) 784 mem_addr = OMAP_ABE_D_IODESCR_ADDR + (OMAP_ABE_MM_EXT_IN_PORT * sizeof(struct omap_aess_io_desc))
786 + offsetof(struct ABE_SIODescriptor, drift_asrc); 785 + offsetof(struct omap_aess_io_desc, drift_asrc);
787 el[i] = (mem_tag << 16) + mem_addr; 786 el[i] = (mem_tag << 16) + mem_addr;
788 el[i + 1] = temp0; 787 el[i + 1] = temp0;
789 /* dummy field */ 788 /* dummy field */
@@ -974,8 +973,8 @@ void omap_aess_init_asrc_bt_ul(struct omap_aess *abe, s32 dppm)
974 i = i + 3; 973 i = i + 3;
975 /* 8. drift_ASRC = 0 & drift_io = 0 */ 974 /* 8. drift_ASRC = 0 & drift_io = 0 */
976 mem_tag = ABE_DMEM; 975 mem_tag = ABE_DMEM;
977 mem_addr = OMAP_ABE_D_IODESCR_ADDR + (OMAP_ABE_BT_VX_UL_PORT * sizeof(struct ABE_SIODescriptor)) 976 mem_addr = OMAP_ABE_D_IODESCR_ADDR + (OMAP_ABE_BT_VX_UL_PORT * sizeof(struct omap_aess_io_desc))
978 + offsetof(struct ABE_SIODescriptor, drift_asrc); 977 + offsetof(struct omap_aess_io_desc, drift_asrc);
979 el[i] = (mem_tag << 16) + mem_addr; 978 el[i] = (mem_tag << 16) + mem_addr;
980 el[i + 1] = temp0; 979 el[i + 1] = temp0;
981 /* dummy field */ 980 /* dummy field */
@@ -1168,8 +1167,8 @@ void omap_aess_init_asrc_bt_dl(struct omap_aess *abe, s32 dppm)
1168 i = i + 3; 1167 i = i + 3;
1169 /* 8. drift_ASRC = 0 & drift_io = 0 */ 1168 /* 8. drift_ASRC = 0 & drift_io = 0 */
1170 mem_tag = ABE_DMEM; 1169 mem_tag = ABE_DMEM;
1171 mem_addr = OMAP_ABE_D_IODESCR_ADDR + (OMAP_ABE_BT_VX_DL_PORT * sizeof(struct ABE_SIODescriptor)) 1170 mem_addr = OMAP_ABE_D_IODESCR_ADDR + (OMAP_ABE_BT_VX_DL_PORT * sizeof(struct omap_aess_io_desc))
1172 + offsetof(struct ABE_SIODescriptor, drift_asrc); 1171 + offsetof(struct omap_aess_io_desc, drift_asrc);
1173 el[i] = (mem_tag << 16) + mem_addr; 1172 el[i] = (mem_tag << 16) + mem_addr;
1174 el[i + 1] = temp0; 1173 el[i + 1] = temp0;
1175 /* dummy field */ 1174 /* dummy field */
diff --git a/tasks/abe-local.h b/tasks/abe-local.h
index 739a03d..fb94a6c 100644
--- a/tasks/abe-local.h
+++ b/tasks/abe-local.h
@@ -59,9 +59,28 @@
59#ifndef _ABE_LOCAL_H_ 59#ifndef _ABE_LOCAL_H_
60#define _ABE_LOCAL_H_ 60#define _ABE_LOCAL_H_
61 61
62#include <sound/soc/omap/aess/abe_typ.h> 62#include <sound/soc/omap/aess/aess-fw.h>
63#include <sound/soc/omap/aess/abe_ext.h> 63
64#include <sound/soc/omap/aess/abe_mem.h> 64struct ABE_STask {
65 /* 0 ... Index of called function */
66 u16 iF;
67 /* 2 ... for INITPTR of A0 */
68 u16 A0;
69 /* 4 ... for INITPTR of A1 */
70 u16 A1;
71 /* 6 ... for INITPTR of A2 & A3 */
72 u16 A2_3;
73 /* 8 ... for INITPTR of A4 & A5 */
74 u16 A4_5;
75 /* 10 ... for INITREG of R0, R1, R2, R3 */
76 u16 R;
77 /* 12 */
78 u16 misc0;
79 /* 14 */
80 u16 misc1;
81};
82
83#define ABE_TASK_ID(ID) (OMAP_ABE_D_TASKSLIST_ADDR + sizeof(struct ABE_STask)*(ID))
65 84
66struct omap_aess_mapping { 85struct omap_aess_mapping {
67 const struct omap_aess_addr *map; 86 const struct omap_aess_addr *map;