diff options
author | Robbie King <robking@cisco.com> | 2015-01-14 23:48:19 +0100 |
---|---|---|
committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2015-01-16 17:32:43 +0300 |
commit | 17112e3cb916eec2822f16677c32017100b6dcde (patch) | |
tree | 04792220423c80698ffdcc75411b02cbef4f490b | |
parent | 7e4e3fd2708fb9a554b2f46c15a3f78ed996bac6 (diff) |
api: cpumask: reorder the input vars to match convention
Have the destination variable as the first parameter to match the rest of the
ODP API.
Signed-off-by: Robbie King <robking@cisco.com>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
-rw-r--r-- | platform/linux-generic/include/api/odp_cpumask.h | 20 | ||||
-rw-r--r-- | platform/linux-generic/odp_cpumask.c | 12 | ||||
-rw-r--r-- | test/api_test/odp_common.c | 4 |
3 files changed, 18 insertions, 18 deletions
diff --git a/platform/linux-generic/include/api/odp_cpumask.h b/platform/linux-generic/include/api/odp_cpumask.h index e421d4ddd..2e10c4ef9 100644 --- a/platform/linux-generic/include/api/odp_cpumask.h +++ b/platform/linux-generic/include/api/odp_cpumask.h @@ -40,20 +40,20 @@ typedef struct odp_cpumask_t { /** * Add CPU mask bits from a string * + * @param mask CPU mask to modify * @param str Hexadecimal digits in a string. CPU #0 is located * at the least significant bit (0x1). - * @param mask CPU mask to modify */ -void odp_cpumask_from_str(const char *str, odp_cpumask_t *mask); +void odp_cpumask_from_str(odp_cpumask_t *mask, const char *str); /** * Write CPU mask as a string of hexadecimal digits * + * @param mask CPU mask * @param str String for output * @param len Size of string length (incl. ending zero) - * @param mask CPU mask */ -void odp_cpumask_to_str(char *str, int len, const odp_cpumask_t *mask); +void odp_cpumask_to_str(const odp_cpumask_t *mask, char *str, int len); /** * Clear entire mask @@ -63,25 +63,25 @@ void odp_cpumask_zero(odp_cpumask_t *mask); /** * Add cpu to mask - * @param cpu CPU number * @param mask add cpu number in CPU mask + * @param cpu CPU number */ -void odp_cpumask_set(int cpu, odp_cpumask_t *mask); +void odp_cpumask_set(odp_cpumask_t *mask, int cpu); /** * Remove cpu from mask - * @param cpu CPU number * @param mask clear cpu number from CPU mask + * @param cpu CPU number */ -void odp_cpumask_clr(int cpu, odp_cpumask_t *mask); +void odp_cpumask_clr(odp_cpumask_t *mask, int cpu); /** * Test if cpu is a member of mask - * @param cpu CPU number * @param mask CPU mask to check if cpu num set or not + * @param cpu CPU number * @return non-zero if set otherwise 0 */ -int odp_cpumask_isset(int cpu, const odp_cpumask_t *mask); +int odp_cpumask_isset(const odp_cpumask_t *mask, int cpu); /** * Count number of cpus in mask diff --git a/platform/linux-generic/odp_cpumask.c b/platform/linux-generic/odp_cpumask.c index 1f9d73b38..0f383da9c 100644 --- a/platform/linux-generic/odp_cpumask.c +++ b/platform/linux-generic/odp_cpumask.c @@ -18,7 +18,7 @@ #define MAX_CORE_NUM 64 -void odp_cpumask_from_str(const char *str_in, odp_cpumask_t *mask) +void odp_cpumask_from_str(odp_cpumask_t *mask, const char *str_in) { cpu_set_t cpuset; const char *str = str_in; @@ -68,12 +68,12 @@ static int _odp_cpumask_last(const odp_cpumask_t *mask) int cpu; for (cpu = CPU_SETSIZE - 1; cpu >= 0; cpu--) - if (odp_cpumask_isset(cpu, mask)) + if (odp_cpumask_isset(mask, cpu)) return cpu; return -1; } -void odp_cpumask_to_str(char *str, int len, const odp_cpumask_t *mask) +void odp_cpumask_to_str(const odp_cpumask_t *mask, char *str, int len) { char *p = str; int cpu = _odp_cpumask_last(mask); @@ -130,17 +130,17 @@ void odp_cpumask_zero(odp_cpumask_t *mask) CPU_ZERO(&mask->set); } -void odp_cpumask_set(int cpu, odp_cpumask_t *mask) +void odp_cpumask_set(odp_cpumask_t *mask, int cpu) { CPU_SET(cpu, &mask->set); } -void odp_cpumask_clr(int cpu, odp_cpumask_t *mask) +void odp_cpumask_clr(odp_cpumask_t *mask, int cpu) { CPU_CLR(cpu, &mask->set); } -int odp_cpumask_isset(int cpu, const odp_cpumask_t *mask) +int odp_cpumask_isset(const odp_cpumask_t *mask, int cpu) { return CPU_ISSET(cpu, &mask->set); } diff --git a/test/api_test/odp_common.c b/test/api_test/odp_common.c index 7449a52ba..3ea815ee5 100644 --- a/test/api_test/odp_common.c +++ b/test/api_test/odp_common.c @@ -36,8 +36,8 @@ void odp_print_system_info(void) odp_cpumask_zero(&cpumask); - odp_cpumask_from_str("0x1", &cpumask); - odp_cpumask_to_str(str, sizeof(str), &cpumask); + odp_cpumask_from_str(&cpumask, "0x1"); + odp_cpumask_to_str(&cpumask, str, sizeof(str)); printf("\n"); printf("ODP system info\n"); |