diff options
| -rw-r--r-- | sound/core/pcm_lib.c | 117 | ||||
| -rw-r--r-- | sound/core/pcm_memory.c | 2 | ||||
| -rw-r--r-- | sound/core/pcm_native.c | 9 | ||||
| -rw-r--r-- | sound/core/rawmidi.c | 2 |
4 files changed, 124 insertions, 6 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 0082914a7e33..0503980c23d9 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c | |||
| @@ -524,6 +524,9 @@ void snd_interval_mul(const snd_interval_t *a, const snd_interval_t *b, snd_inte | |||
| 524 | 524 | ||
| 525 | /** | 525 | /** |
| 526 | * snd_interval_div - refine the interval value with division | 526 | * snd_interval_div - refine the interval value with division |
| 527 | * @a: dividend | ||
| 528 | * @b: divisor | ||
| 529 | * @c: quotient | ||
| 527 | * | 530 | * |
| 528 | * c = a / b | 531 | * c = a / b |
| 529 | * | 532 | * |
| @@ -555,7 +558,11 @@ void snd_interval_div(const snd_interval_t *a, const snd_interval_t *b, snd_inte | |||
| 555 | 558 | ||
| 556 | /** | 559 | /** |
| 557 | * snd_interval_muldivk - refine the interval value | 560 | * snd_interval_muldivk - refine the interval value |
| 558 | * | 561 | * @a: dividend 1 |
| 562 | * @b: dividend 2 | ||
| 563 | * @k: divisor (as integer) | ||
| 564 | * @c: result | ||
| 565 | * | ||
| 559 | * c = a * b / k | 566 | * c = a * b / k |
| 560 | * | 567 | * |
| 561 | * Returns non-zero if the value is changed, zero if not changed. | 568 | * Returns non-zero if the value is changed, zero if not changed. |
| @@ -582,6 +589,10 @@ void snd_interval_muldivk(const snd_interval_t *a, const snd_interval_t *b, | |||
| 582 | 589 | ||
| 583 | /** | 590 | /** |
| 584 | * snd_interval_mulkdiv - refine the interval value | 591 | * snd_interval_mulkdiv - refine the interval value |
| 592 | * @a: dividend 1 | ||
| 593 | * @k: dividend 2 (as integer) | ||
| 594 | * @b: divisor | ||
| 595 | * @c: result | ||
| 585 | * | 596 | * |
| 586 | * c = a * k / b | 597 | * c = a * k / b |
| 587 | * | 598 | * |
| @@ -618,6 +629,11 @@ void snd_interval_mulkdiv(const snd_interval_t *a, unsigned int k, | |||
| 618 | 629 | ||
| 619 | /** | 630 | /** |
| 620 | * snd_interval_ratnum - refine the interval value | 631 | * snd_interval_ratnum - refine the interval value |
| 632 | * @i: interval to refine | ||
| 633 | * @rats_count: number of ratnum_t | ||
| 634 | * @rats: ratnum_t array | ||
| 635 | * @nump: pointer to store the resultant numerator | ||
| 636 | * @denp: pointer to store the resultant denominator | ||
| 621 | * | 637 | * |
| 622 | * Returns non-zero if the value is changed, zero if not changed. | 638 | * Returns non-zero if the value is changed, zero if not changed. |
| 623 | */ | 639 | */ |
| @@ -715,6 +731,11 @@ int snd_interval_ratnum(snd_interval_t *i, | |||
| 715 | 731 | ||
| 716 | /** | 732 | /** |
| 717 | * snd_interval_ratden - refine the interval value | 733 | * snd_interval_ratden - refine the interval value |
| 734 | * @i: interval to refine | ||
| 735 | * @rats_count: number of ratden_t | ||
| 736 | * @rats: ratden_t array | ||
| 737 | * @nump: pointer to store the resultant numerator | ||
| 738 | * @denp: pointer to store the resultant denominator | ||
| 718 | * | 739 | * |
| 719 | * Returns non-zero if the value is changed, zero if not changed. | 740 | * Returns non-zero if the value is changed, zero if not changed. |
| 720 | */ | 741 | */ |
| @@ -936,6 +957,11 @@ int snd_pcm_hw_rule_add(snd_pcm_runtime_t *runtime, unsigned int cond, | |||
| 936 | 957 | ||
| 937 | /** | 958 | /** |
| 938 | * snd_pcm_hw_constraint_mask | 959 | * snd_pcm_hw_constraint_mask |
| 960 | * @runtime: PCM runtime instance | ||
| 961 | * @var: hw_params variable to apply the mask | ||
| 962 | * @mask: the bitmap mask | ||
| 963 | * | ||
| 964 | * Apply the constraint of the given bitmap mask to a mask parameter. | ||
| 939 | */ | 965 | */ |
| 940 | int snd_pcm_hw_constraint_mask(snd_pcm_runtime_t *runtime, snd_pcm_hw_param_t var, | 966 | int snd_pcm_hw_constraint_mask(snd_pcm_runtime_t *runtime, snd_pcm_hw_param_t var, |
| 941 | u_int32_t mask) | 967 | u_int32_t mask) |
| @@ -951,6 +977,11 @@ int snd_pcm_hw_constraint_mask(snd_pcm_runtime_t *runtime, snd_pcm_hw_param_t va | |||
| 951 | 977 | ||
| 952 | /** | 978 | /** |
| 953 | * snd_pcm_hw_constraint_mask64 | 979 | * snd_pcm_hw_constraint_mask64 |
| 980 | * @runtime: PCM runtime instance | ||
| 981 | * @var: hw_params variable to apply the mask | ||
| 982 | * @mask: the 64bit bitmap mask | ||
| 983 | * | ||
| 984 | * Apply the constraint of the given bitmap mask to a mask parameter. | ||
| 954 | */ | 985 | */ |
| 955 | int snd_pcm_hw_constraint_mask64(snd_pcm_runtime_t *runtime, snd_pcm_hw_param_t var, | 986 | int snd_pcm_hw_constraint_mask64(snd_pcm_runtime_t *runtime, snd_pcm_hw_param_t var, |
| 956 | u_int64_t mask) | 987 | u_int64_t mask) |
| @@ -967,6 +998,10 @@ int snd_pcm_hw_constraint_mask64(snd_pcm_runtime_t *runtime, snd_pcm_hw_param_t | |||
| 967 | 998 | ||
| 968 | /** | 999 | /** |
| 969 | * snd_pcm_hw_constraint_integer | 1000 | * snd_pcm_hw_constraint_integer |
| 1001 | * @runtime: PCM runtime instance | ||
| 1002 | * @var: hw_params variable to apply the integer constraint | ||
| 1003 | * | ||
| 1004 | * Apply the constraint of integer to an interval parameter. | ||
| 970 | */ | 1005 | */ |
| 971 | int snd_pcm_hw_constraint_integer(snd_pcm_runtime_t *runtime, snd_pcm_hw_param_t var) | 1006 | int snd_pcm_hw_constraint_integer(snd_pcm_runtime_t *runtime, snd_pcm_hw_param_t var) |
| 972 | { | 1007 | { |
| @@ -976,6 +1011,12 @@ int snd_pcm_hw_constraint_integer(snd_pcm_runtime_t *runtime, snd_pcm_hw_param_t | |||
| 976 | 1011 | ||
| 977 | /** | 1012 | /** |
| 978 | * snd_pcm_hw_constraint_minmax | 1013 | * snd_pcm_hw_constraint_minmax |
| 1014 | * @runtime: PCM runtime instance | ||
| 1015 | * @var: hw_params variable to apply the range | ||
| 1016 | * @min: the minimal value | ||
| 1017 | * @max: the maximal value | ||
| 1018 | * | ||
| 1019 | * Apply the min/max range constraint to an interval parameter. | ||
| 979 | */ | 1020 | */ |
| 980 | int snd_pcm_hw_constraint_minmax(snd_pcm_runtime_t *runtime, snd_pcm_hw_param_t var, | 1021 | int snd_pcm_hw_constraint_minmax(snd_pcm_runtime_t *runtime, snd_pcm_hw_param_t var, |
| 981 | unsigned int min, unsigned int max) | 1022 | unsigned int min, unsigned int max) |
| @@ -999,6 +1040,12 @@ static int snd_pcm_hw_rule_list(snd_pcm_hw_params_t *params, | |||
| 999 | 1040 | ||
| 1000 | /** | 1041 | /** |
| 1001 | * snd_pcm_hw_constraint_list | 1042 | * snd_pcm_hw_constraint_list |
| 1043 | * @runtime: PCM runtime instance | ||
| 1044 | * @cond: condition bits | ||
| 1045 | * @var: hw_params variable to apply the list constraint | ||
| 1046 | * @l: list | ||
| 1047 | * | ||
| 1048 | * Apply the list of constraints to an interval parameter. | ||
| 1002 | */ | 1049 | */ |
| 1003 | int snd_pcm_hw_constraint_list(snd_pcm_runtime_t *runtime, | 1050 | int snd_pcm_hw_constraint_list(snd_pcm_runtime_t *runtime, |
| 1004 | unsigned int cond, | 1051 | unsigned int cond, |
| @@ -1027,6 +1074,10 @@ static int snd_pcm_hw_rule_ratnums(snd_pcm_hw_params_t *params, | |||
| 1027 | 1074 | ||
| 1028 | /** | 1075 | /** |
| 1029 | * snd_pcm_hw_constraint_ratnums | 1076 | * snd_pcm_hw_constraint_ratnums |
| 1077 | * @runtime: PCM runtime instance | ||
| 1078 | * @cond: condition bits | ||
| 1079 | * @var: hw_params variable to apply the ratnums constraint | ||
| 1080 | * @r: ratnums_t constriants | ||
| 1030 | */ | 1081 | */ |
| 1031 | int snd_pcm_hw_constraint_ratnums(snd_pcm_runtime_t *runtime, | 1082 | int snd_pcm_hw_constraint_ratnums(snd_pcm_runtime_t *runtime, |
| 1032 | unsigned int cond, | 1083 | unsigned int cond, |
| @@ -1054,6 +1105,10 @@ static int snd_pcm_hw_rule_ratdens(snd_pcm_hw_params_t *params, | |||
| 1054 | 1105 | ||
| 1055 | /** | 1106 | /** |
| 1056 | * snd_pcm_hw_constraint_ratdens | 1107 | * snd_pcm_hw_constraint_ratdens |
| 1108 | * @runtime: PCM runtime instance | ||
| 1109 | * @cond: condition bits | ||
| 1110 | * @var: hw_params variable to apply the ratdens constraint | ||
| 1111 | * @r: ratdens_t constriants | ||
| 1057 | */ | 1112 | */ |
| 1058 | int snd_pcm_hw_constraint_ratdens(snd_pcm_runtime_t *runtime, | 1113 | int snd_pcm_hw_constraint_ratdens(snd_pcm_runtime_t *runtime, |
| 1059 | unsigned int cond, | 1114 | unsigned int cond, |
| @@ -1079,6 +1134,10 @@ static int snd_pcm_hw_rule_msbits(snd_pcm_hw_params_t *params, | |||
| 1079 | 1134 | ||
| 1080 | /** | 1135 | /** |
| 1081 | * snd_pcm_hw_constraint_msbits | 1136 | * snd_pcm_hw_constraint_msbits |
| 1137 | * @runtime: PCM runtime instance | ||
| 1138 | * @cond: condition bits | ||
| 1139 | * @width: sample bits width | ||
| 1140 | * @msbits: msbits width | ||
| 1082 | */ | 1141 | */ |
| 1083 | int snd_pcm_hw_constraint_msbits(snd_pcm_runtime_t *runtime, | 1142 | int snd_pcm_hw_constraint_msbits(snd_pcm_runtime_t *runtime, |
| 1084 | unsigned int cond, | 1143 | unsigned int cond, |
| @@ -1101,6 +1160,10 @@ static int snd_pcm_hw_rule_step(snd_pcm_hw_params_t *params, | |||
| 1101 | 1160 | ||
| 1102 | /** | 1161 | /** |
| 1103 | * snd_pcm_hw_constraint_step | 1162 | * snd_pcm_hw_constraint_step |
| 1163 | * @runtime: PCM runtime instance | ||
| 1164 | * @cond: condition bits | ||
| 1165 | * @var: hw_params variable to apply the step constraint | ||
| 1166 | * @step: step size | ||
| 1104 | */ | 1167 | */ |
| 1105 | int snd_pcm_hw_constraint_step(snd_pcm_runtime_t *runtime, | 1168 | int snd_pcm_hw_constraint_step(snd_pcm_runtime_t *runtime, |
| 1106 | unsigned int cond, | 1169 | unsigned int cond, |
| @@ -1126,6 +1189,9 @@ static int snd_pcm_hw_rule_pow2(snd_pcm_hw_params_t *params, snd_pcm_hw_rule_t * | |||
| 1126 | 1189 | ||
| 1127 | /** | 1190 | /** |
| 1128 | * snd_pcm_hw_constraint_pow2 | 1191 | * snd_pcm_hw_constraint_pow2 |
| 1192 | * @runtime: PCM runtime instance | ||
| 1193 | * @cond: condition bits | ||
| 1194 | * @var: hw_params variable to apply the power-of-2 constraint | ||
| 1129 | */ | 1195 | */ |
| 1130 | int snd_pcm_hw_constraint_pow2(snd_pcm_runtime_t *runtime, | 1196 | int snd_pcm_hw_constraint_pow2(snd_pcm_runtime_t *runtime, |
| 1131 | unsigned int cond, | 1197 | unsigned int cond, |
| @@ -1162,7 +1228,7 @@ static void _snd_pcm_hw_param_any(snd_pcm_hw_params_t *params, | |||
| 1162 | } | 1228 | } |
| 1163 | 1229 | ||
| 1164 | #if 0 | 1230 | #if 0 |
| 1165 | /** | 1231 | /* |
| 1166 | * snd_pcm_hw_param_any | 1232 | * snd_pcm_hw_param_any |
| 1167 | */ | 1233 | */ |
| 1168 | int snd_pcm_hw_param_any(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, | 1234 | int snd_pcm_hw_param_any(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, |
| @@ -1185,7 +1251,7 @@ void _snd_pcm_hw_params_any(snd_pcm_hw_params_t *params) | |||
| 1185 | } | 1251 | } |
| 1186 | 1252 | ||
| 1187 | #if 0 | 1253 | #if 0 |
| 1188 | /** | 1254 | /* |
| 1189 | * snd_pcm_hw_params_any | 1255 | * snd_pcm_hw_params_any |
| 1190 | * | 1256 | * |
| 1191 | * Fill PARAMS with full configuration space boundaries | 1257 | * Fill PARAMS with full configuration space boundaries |
| @@ -1199,6 +1265,9 @@ int snd_pcm_hw_params_any(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) | |||
| 1199 | 1265 | ||
| 1200 | /** | 1266 | /** |
| 1201 | * snd_pcm_hw_param_value | 1267 | * snd_pcm_hw_param_value |
| 1268 | * @params: the hw_params instance | ||
| 1269 | * @var: parameter to retrieve | ||
| 1270 | * @dir: pointer to the direction (-1,0,1) or NULL | ||
| 1202 | * | 1271 | * |
| 1203 | * Return the value for field PAR if it's fixed in configuration space | 1272 | * Return the value for field PAR if it's fixed in configuration space |
| 1204 | * defined by PARAMS. Return -EINVAL otherwise | 1273 | * defined by PARAMS. Return -EINVAL otherwise |
| @@ -1228,6 +1297,9 @@ static int snd_pcm_hw_param_value(const snd_pcm_hw_params_t *params, | |||
| 1228 | 1297 | ||
| 1229 | /** | 1298 | /** |
| 1230 | * snd_pcm_hw_param_value_min | 1299 | * snd_pcm_hw_param_value_min |
| 1300 | * @params: the hw_params instance | ||
| 1301 | * @var: parameter to retrieve | ||
| 1302 | * @dir: pointer to the direction (-1,0,1) or NULL | ||
| 1231 | * | 1303 | * |
| 1232 | * Return the minimum value for field PAR. | 1304 | * Return the minimum value for field PAR. |
| 1233 | */ | 1305 | */ |
| @@ -1251,6 +1323,9 @@ unsigned int snd_pcm_hw_param_value_min(const snd_pcm_hw_params_t *params, | |||
| 1251 | 1323 | ||
| 1252 | /** | 1324 | /** |
| 1253 | * snd_pcm_hw_param_value_max | 1325 | * snd_pcm_hw_param_value_max |
| 1326 | * @params: the hw_params instance | ||
| 1327 | * @var: parameter to retrieve | ||
| 1328 | * @dir: pointer to the direction (-1,0,1) or NULL | ||
| 1254 | * | 1329 | * |
| 1255 | * Return the maximum value for field PAR. | 1330 | * Return the maximum value for field PAR. |
| 1256 | */ | 1331 | */ |
| @@ -1302,7 +1377,7 @@ int _snd_pcm_hw_param_setinteger(snd_pcm_hw_params_t *params, | |||
| 1302 | } | 1377 | } |
| 1303 | 1378 | ||
| 1304 | #if 0 | 1379 | #if 0 |
| 1305 | /** | 1380 | /* |
| 1306 | * snd_pcm_hw_param_setinteger | 1381 | * snd_pcm_hw_param_setinteger |
| 1307 | * | 1382 | * |
| 1308 | * Inside configuration space defined by PARAMS remove from PAR all | 1383 | * Inside configuration space defined by PARAMS remove from PAR all |
| @@ -1347,6 +1422,10 @@ static int _snd_pcm_hw_param_first(snd_pcm_hw_params_t *params, | |||
| 1347 | 1422 | ||
| 1348 | /** | 1423 | /** |
| 1349 | * snd_pcm_hw_param_first | 1424 | * snd_pcm_hw_param_first |
| 1425 | * @pcm: PCM instance | ||
| 1426 | * @params: the hw_params instance | ||
| 1427 | * @var: parameter to retrieve | ||
| 1428 | * @dir: pointer to the direction (-1,0,1) or NULL | ||
| 1350 | * | 1429 | * |
| 1351 | * Inside configuration space defined by PARAMS remove from PAR all | 1430 | * Inside configuration space defined by PARAMS remove from PAR all |
| 1352 | * values > minimum. Reduce configuration space accordingly. | 1431 | * values > minimum. Reduce configuration space accordingly. |
| @@ -1388,6 +1467,10 @@ static int _snd_pcm_hw_param_last(snd_pcm_hw_params_t *params, | |||
| 1388 | 1467 | ||
| 1389 | /** | 1468 | /** |
| 1390 | * snd_pcm_hw_param_last | 1469 | * snd_pcm_hw_param_last |
| 1470 | * @pcm: PCM instance | ||
| 1471 | * @params: the hw_params instance | ||
| 1472 | * @var: parameter to retrieve | ||
| 1473 | * @dir: pointer to the direction (-1,0,1) or NULL | ||
| 1391 | * | 1474 | * |
| 1392 | * Inside configuration space defined by PARAMS remove from PAR all | 1475 | * Inside configuration space defined by PARAMS remove from PAR all |
| 1393 | * values < maximum. Reduce configuration space accordingly. | 1476 | * values < maximum. Reduce configuration space accordingly. |
| @@ -1439,6 +1522,11 @@ int _snd_pcm_hw_param_min(snd_pcm_hw_params_t *params, | |||
| 1439 | 1522 | ||
| 1440 | /** | 1523 | /** |
| 1441 | * snd_pcm_hw_param_min | 1524 | * snd_pcm_hw_param_min |
| 1525 | * @pcm: PCM instance | ||
| 1526 | * @params: the hw_params instance | ||
| 1527 | * @var: parameter to retrieve | ||
| 1528 | * @val: minimal value | ||
| 1529 | * @dir: pointer to the direction (-1,0,1) or NULL | ||
| 1442 | * | 1530 | * |
| 1443 | * Inside configuration space defined by PARAMS remove from PAR all | 1531 | * Inside configuration space defined by PARAMS remove from PAR all |
| 1444 | * values < VAL. Reduce configuration space accordingly. | 1532 | * values < VAL. Reduce configuration space accordingly. |
| @@ -1494,6 +1582,11 @@ static int _snd_pcm_hw_param_max(snd_pcm_hw_params_t *params, | |||
| 1494 | 1582 | ||
| 1495 | /** | 1583 | /** |
| 1496 | * snd_pcm_hw_param_max | 1584 | * snd_pcm_hw_param_max |
| 1585 | * @pcm: PCM instance | ||
| 1586 | * @params: the hw_params instance | ||
| 1587 | * @var: parameter to retrieve | ||
| 1588 | * @val: maximal value | ||
| 1589 | * @dir: pointer to the direction (-1,0,1) or NULL | ||
| 1497 | * | 1590 | * |
| 1498 | * Inside configuration space defined by PARAMS remove from PAR all | 1591 | * Inside configuration space defined by PARAMS remove from PAR all |
| 1499 | * values >= VAL + 1. Reduce configuration space accordingly. | 1592 | * values >= VAL + 1. Reduce configuration space accordingly. |
| @@ -1565,6 +1658,11 @@ int _snd_pcm_hw_param_set(snd_pcm_hw_params_t *params, | |||
| 1565 | 1658 | ||
| 1566 | /** | 1659 | /** |
| 1567 | * snd_pcm_hw_param_set | 1660 | * snd_pcm_hw_param_set |
| 1661 | * @pcm: PCM instance | ||
| 1662 | * @params: the hw_params instance | ||
| 1663 | * @var: parameter to retrieve | ||
| 1664 | * @val: value to set | ||
| 1665 | * @dir: pointer to the direction (-1,0,1) or NULL | ||
| 1568 | * | 1666 | * |
| 1569 | * Inside configuration space defined by PARAMS remove from PAR all | 1667 | * Inside configuration space defined by PARAMS remove from PAR all |
| 1570 | * values != VAL. Reduce configuration space accordingly. | 1668 | * values != VAL. Reduce configuration space accordingly. |
| @@ -1599,6 +1697,10 @@ static int _snd_pcm_hw_param_mask(snd_pcm_hw_params_t *params, | |||
| 1599 | 1697 | ||
| 1600 | /** | 1698 | /** |
| 1601 | * snd_pcm_hw_param_mask | 1699 | * snd_pcm_hw_param_mask |
| 1700 | * @pcm: PCM instance | ||
| 1701 | * @params: the hw_params instance | ||
| 1702 | * @var: parameter to retrieve | ||
| 1703 | * @val: mask to apply | ||
| 1602 | * | 1704 | * |
| 1603 | * Inside configuration space defined by PARAMS remove from PAR all values | 1705 | * Inside configuration space defined by PARAMS remove from PAR all values |
| 1604 | * not contained in MASK. Reduce configuration space accordingly. | 1706 | * not contained in MASK. Reduce configuration space accordingly. |
| @@ -1671,6 +1773,11 @@ static int boundary_nearer(int min, int mindir, | |||
| 1671 | 1773 | ||
| 1672 | /** | 1774 | /** |
| 1673 | * snd_pcm_hw_param_near | 1775 | * snd_pcm_hw_param_near |
| 1776 | * @pcm: PCM instance | ||
| 1777 | * @params: the hw_params instance | ||
| 1778 | * @var: parameter to retrieve | ||
| 1779 | * @best: value to set | ||
| 1780 | * @dir: pointer to the direction (-1,0,1) or NULL | ||
| 1674 | * | 1781 | * |
| 1675 | * Inside configuration space defined by PARAMS set PAR to the available value | 1782 | * Inside configuration space defined by PARAMS set PAR to the available value |
| 1676 | * nearest to VAL. Reduce configuration space accordingly. | 1783 | * nearest to VAL. Reduce configuration space accordingly. |
| @@ -1747,6 +1854,8 @@ int snd_pcm_hw_param_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, | |||
| 1747 | 1854 | ||
| 1748 | /** | 1855 | /** |
| 1749 | * snd_pcm_hw_param_choose | 1856 | * snd_pcm_hw_param_choose |
| 1857 | * @pcm: PCM instance | ||
| 1858 | * @params: the hw_params instance | ||
| 1750 | * | 1859 | * |
| 1751 | * Choose one configuration from configuration space defined by PARAMS | 1860 | * Choose one configuration from configuration space defined by PARAMS |
| 1752 | * The configuration chosen is that obtained fixing in this order: | 1861 | * The configuration chosen is that obtained fixing in this order: |
diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c index 9a174fb96565..5df76738470a 100644 --- a/sound/core/pcm_memory.c +++ b/sound/core/pcm_memory.c | |||
| @@ -244,7 +244,7 @@ int snd_pcm_lib_preallocate_pages(snd_pcm_substream_t *substream, | |||
| 244 | 244 | ||
| 245 | /** | 245 | /** |
| 246 | * snd_pcm_lib_preallocate_pages_for_all - pre-allocation for continous memory type (all substreams) | 246 | * snd_pcm_lib_preallocate_pages_for_all - pre-allocation for continous memory type (all substreams) |
| 247 | * @substream: the pcm substream instance | 247 | * @pcm: the pcm instance |
| 248 | * @type: DMA type (SNDRV_DMA_TYPE_*) | 248 | * @type: DMA type (SNDRV_DMA_TYPE_*) |
| 249 | * @data: DMA type dependant data | 249 | * @data: DMA type dependant data |
| 250 | * @size: the requested pre-allocation size in bytes | 250 | * @size: the requested pre-allocation size in bytes |
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 03c17159dd8e..b829a2727559 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c | |||
| @@ -859,6 +859,7 @@ static struct action_ops snd_pcm_action_start = { | |||
| 859 | 859 | ||
| 860 | /** | 860 | /** |
| 861 | * snd_pcm_start | 861 | * snd_pcm_start |
| 862 | * @substream: the PCM substream instance | ||
| 862 | * | 863 | * |
| 863 | * Start all linked streams. | 864 | * Start all linked streams. |
| 864 | */ | 865 | */ |
| @@ -908,6 +909,8 @@ static struct action_ops snd_pcm_action_stop = { | |||
| 908 | 909 | ||
| 909 | /** | 910 | /** |
| 910 | * snd_pcm_stop | 911 | * snd_pcm_stop |
| 912 | * @substream: the PCM substream instance | ||
| 913 | * @state: PCM state after stopping the stream | ||
| 911 | * | 914 | * |
| 912 | * Try to stop all running streams in the substream group. | 915 | * Try to stop all running streams in the substream group. |
| 913 | * The state of each stream is changed to the given value after that unconditionally. | 916 | * The state of each stream is changed to the given value after that unconditionally. |
| @@ -919,6 +922,7 @@ int snd_pcm_stop(snd_pcm_substream_t *substream, int state) | |||
| 919 | 922 | ||
| 920 | /** | 923 | /** |
| 921 | * snd_pcm_drain_done | 924 | * snd_pcm_drain_done |
| 925 | * @substream: the PCM substream | ||
| 922 | * | 926 | * |
| 923 | * Stop the DMA only when the given stream is playback. | 927 | * Stop the DMA only when the given stream is playback. |
| 924 | * The state is changed to SETUP. | 928 | * The state is changed to SETUP. |
| @@ -1040,6 +1044,7 @@ static struct action_ops snd_pcm_action_suspend = { | |||
| 1040 | 1044 | ||
| 1041 | /** | 1045 | /** |
| 1042 | * snd_pcm_suspend | 1046 | * snd_pcm_suspend |
| 1047 | * @substream: the PCM substream | ||
| 1043 | * | 1048 | * |
| 1044 | * Trigger SUSPEND to all linked streams. | 1049 | * Trigger SUSPEND to all linked streams. |
| 1045 | * After this call, all streams are changed to SUSPENDED state. | 1050 | * After this call, all streams are changed to SUSPENDED state. |
| @@ -1057,6 +1062,7 @@ int snd_pcm_suspend(snd_pcm_substream_t *substream) | |||
| 1057 | 1062 | ||
| 1058 | /** | 1063 | /** |
| 1059 | * snd_pcm_suspend_all | 1064 | * snd_pcm_suspend_all |
| 1065 | * @pcm: the PCM instance | ||
| 1060 | * | 1066 | * |
| 1061 | * Trigger SUSPEND to all substreams in the given pcm. | 1067 | * Trigger SUSPEND to all substreams in the given pcm. |
| 1062 | * After this call, all streams are changed to SUSPENDED state. | 1068 | * After this call, all streams are changed to SUSPENDED state. |
| @@ -1272,6 +1278,9 @@ static struct action_ops snd_pcm_action_prepare = { | |||
| 1272 | 1278 | ||
| 1273 | /** | 1279 | /** |
| 1274 | * snd_pcm_prepare | 1280 | * snd_pcm_prepare |
| 1281 | * @substream: the PCM substream instance | ||
| 1282 | * | ||
| 1283 | * Prepare the PCM substream to be triggerable. | ||
| 1275 | */ | 1284 | */ |
| 1276 | int snd_pcm_prepare(snd_pcm_substream_t *substream) | 1285 | int snd_pcm_prepare(snd_pcm_substream_t *substream) |
| 1277 | { | 1286 | { |
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index d705ec79429b..4f4b4101b2f5 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c | |||
| @@ -1109,7 +1109,7 @@ int snd_rawmidi_transmit_ack(snd_rawmidi_substream_t * substream, int count) | |||
| 1109 | /** | 1109 | /** |
| 1110 | * snd_rawmidi_transmit - copy from the buffer to the device | 1110 | * snd_rawmidi_transmit - copy from the buffer to the device |
| 1111 | * @substream: the rawmidi substream | 1111 | * @substream: the rawmidi substream |
| 1112 | * @buf: the buffer pointer | 1112 | * @buffer: the buffer pointer |
| 1113 | * @count: the data size to transfer | 1113 | * @count: the data size to transfer |
| 1114 | * | 1114 | * |
| 1115 | * Copies data from the buffer to the device and advances the pointer. | 1115 | * Copies data from the buffer to the device and advances the pointer. |
