Skip to content

W
White Rabbit Trigger Distribution
Commit c8d87bbc authored by Tristan Gingold's avatar Tristan Gingold
Browse files
Options

libwrtd: style fixes

parent 09bc0ff6
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 100 deletions
software/lib/libwrtd-attributes.c
View file @ c8d87bbc
......@@ -1073,9 +1073,8 @@ enum wrtd_status wrtd_attr_get_sys_time(struct wrtd_dev *wrtd,
enum wrtd_status status;
struct wrtd_config_msg msg;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
/* Always use CPU #0 (it does exist!). */
status = wrtd_msg_get_config(wrtd, 0, &msg, __func__);
......
software/lib/libwrtd-internal.c
View file @ c8d87bbc
......@@ -39,16 +39,15 @@ enum wrtd_status wrtd_id_copy_buf(struct wrtd_dev *wrtd,
char *dst, int32_t dst_buffer_size,
const char *id, const char *caller_func)
{
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
/* If buffer_size is zero, just report on necessary
buffer size. According to IVI 3.2, section 3.1.2.1. */
if (dst_buffer_size == 0)
return WRTD_ID_LEN;
if(dst == NULL){
if (dst == NULL) {
return wrtd_return_error
(wrtd, WRTD_ERROR_NULL_POINTER,
"Null pointer passed for function %s/%s, "
......@@ -77,9 +76,8 @@ enum wrtd_status wrtd_id_copy_buf(struct wrtd_dev *wrtd,
enum wrtd_status wrtd_validate_id(struct wrtd_dev *wrtd, const char *rep_cap_id,
const char *caller_func)
{
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
if (rep_cap_id[0] == 0 || strlen(rep_cap_id) > WRTD_ID_LEN)
return wrtd_return_error
......@@ -96,9 +94,8 @@ enum wrtd_status wrtd_return_error(struct wrtd_dev *dev,
{
va_list args;
if(dev == NULL){
if (dev == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
va_start(args, format);
dev->err = error_code;
......@@ -116,9 +113,8 @@ enum wrtd_status wrtd_log_read(struct wrtd_dev *wrtd,
struct polltrtl p[WRTD_MAX_CPUS];
int ret, i;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
for (i = 0; i < wrtd->nbr_cpus; ++i) {
p[i].trtl = wrtd->trtl;
......@@ -172,9 +168,8 @@ enum wrtd_status wrtd_msg_get_config(struct wrtd_dev *wrtd, unsigned cpu,
struct trtl_msg msg;
int err;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
memset(&msg.hdr, 0, sizeof(struct trtl_hmq_header));
msg.hdr.flags = TRTL_HMQ_HEADER_FLAG_RPC;
......@@ -209,9 +204,8 @@ enum wrtd_status wrtd_msg_readw(struct wrtd_dev *wrtd, unsigned cpu,
uint32_t addr, uint32_t count,
uint32_t *dest, const char *caller_func)
{
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
while (count > 0) {
uint32_t tlen;
......@@ -262,9 +256,8 @@ enum wrtd_status wrtd_msg_writew(struct wrtd_dev *wrtd, unsigned cpu,
uint32_t addr, uint32_t count,
const uint32_t *src, const char *caller_func)
{
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
while (count > 0) {
uint32_t tlen;
......@@ -314,9 +307,8 @@ enum wrtd_status wrtd_fill_roots(struct wrtd_dev *wrtd, const char *caller_func)
enum wrtd_status status;
unsigned cpu;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
if (wrtd->roots[0].ver_major != 0)
return WRTD_SUCCESS;
......@@ -358,9 +350,8 @@ enum wrtd_status wrtd_fill_alarms(struct wrtd_dev *wrtd, const char *caller_func
unsigned cpu;
unsigned n;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
if (wrtd->alarms != NULL)
return WRTD_SUCCESS;
......@@ -411,9 +402,8 @@ enum wrtd_status wrtd_alloc_rules(struct wrtd_dev *wrtd,
unsigned n;
unsigned cpu;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
rules = (struct wrtd_lib_rule *)
calloc(wrtd->nbr_rules, sizeof(struct wrtd_lib_rule));
......@@ -445,9 +435,8 @@ enum wrtd_status wrtd_fill_rules(struct wrtd_dev *wrtd, const char *caller_func)
unsigned i;
unsigned cpu;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
if (wrtd->rules != NULL)
return WRTD_SUCCESS;
......@@ -492,9 +481,8 @@ enum wrtd_status wrtd_read_rule_stat(struct wrtd_dev *wrtd, unsigned idx,
struct wrtd_lib_rule *rule;
assert(len % 4 == 0);
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
rule = &wrtd->rules[idx];
......@@ -515,9 +503,8 @@ enum wrtd_status wrtd_write_alarm(struct wrtd_dev *wrtd, unsigned idx,
enum wrtd_status status;
struct wrtd_lib_alarm *al;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
al = &wrtd->alarms[idx];
......@@ -537,9 +524,8 @@ enum wrtd_status wrtd_write_rule_conf(struct wrtd_dev *wrtd, unsigned idx,
enum wrtd_status status;
struct wrtd_lib_rule *rule;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
rule = &wrtd->rules[idx];
......@@ -582,9 +568,8 @@ enum wrtd_status wrtd_write_root_flags(struct wrtd_dev *wrtd, unsigned cpu,
{
enum wrtd_status status;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
status = wrtd_msg_writew
(wrtd, cpu,
......@@ -603,9 +588,8 @@ enum wrtd_status wrtd_find_alarm(struct wrtd_dev *wrtd,
enum wrtd_status status;
unsigned i;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
/* 1. Validate rep_cap_id. */
status = wrtd_validate_id(wrtd, rep_cap_id, caller_func);
......@@ -636,9 +620,8 @@ enum wrtd_status wrtd_find_rule(struct wrtd_dev *wrtd,
enum wrtd_status status;
unsigned i;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
/* 1. Validate rep_cap_id. */
status = wrtd_validate_id(wrtd, rep_cap_id, caller_func);
......@@ -688,9 +671,8 @@ enum wrtd_status wrtd_find_fw(struct wrtd_dev *wrtd,
enum wrtd_status status;
unsigned i;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
/* 1. Validate rep_cap_id. */
status = wrtd_validate_id(wrtd, rep_cap_id, caller_func);
......@@ -702,7 +684,7 @@ enum wrtd_status wrtd_find_fw(struct wrtd_dev *wrtd,
/* 3. Search it. */
for (i = 0; i < wrtd->nbr_cpus; i++)
if (!strncmp(wrtd->roots[i].fw_name, rep_cap_id, WRTD_ID_LEN)) {
if (!strncmp(wrtd->roots[i].fw_name, rep_cap_id, WRTD_ID_LEN)) {
*idx = i;
return WRTD_SUCCESS;
}
......
software/lib/libwrtd-private.h
View file @ c8d87bbc
......@@ -11,7 +11,8 @@
#include "mockturtle/libmockturtle.h"
#define WRTD_RETURN_IF_ERROR(status) if(status != WRTD_SUCCESS) return status
#define WRTD_RETURN_IF_ERROR(status) \
do { if (status != WRTD_SUCCESS) return status; } while (0)
#define WRTD_DEFAULT_TIMEOUT 1000
......@@ -21,10 +22,7 @@
static inline int wrtd_node_id_match(uint32_t id)
{
if ((id & WRTD_NODE_ID_MASK) == WRTD_NODE_ID)
return 1;
else
return 0;
return ((id & WRTD_NODE_ID_MASK) == WRTD_NODE_ID);
}
/* Add nanoseconds to an existing wrtd timestamp */
......
software/lib/libwrtd.c
View file @ c8d87bbc
......@@ -191,9 +191,8 @@ wrtd_status wrtd_init(uint32_t node_id,
*/
wrtd_status wrtd_close(wrtd_dev *wrtd)
{
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
trtl_close(wrtd->trtl);
......@@ -214,9 +213,8 @@ wrtd_status wrtd_reset(wrtd_dev *wrtd)
{
wrtd_status status;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
status = wrtd_disable_all_alarms(wrtd);
WRTD_RETURN_IF_ERROR(status);
......@@ -256,9 +254,8 @@ wrtd_status wrtd_get_error(wrtd_dev *wrtd,
wrtd_status status;
int ret;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
char error_message[256];
memset(error_message, 0, 256);
......@@ -274,7 +271,7 @@ wrtd_status wrtd_get_error(wrtd_dev *wrtd,
if (error_description_buffer_size == 0)
return required_buffer_size;
if(error_description == NULL){
if (error_description == NULL) {
return wrtd_return_error
(wrtd, WRTD_ERROR_NULL_POINTER,
"Null pointer passed for function %s, "
......@@ -290,9 +287,8 @@ wrtd_status wrtd_get_error(wrtd_dev *wrtd,
"parameter error_description_buffer_size",
error_description_buffer_size, __func__);
if(error_code != NULL){
if (error_code != NULL)
*error_code = wrtd->err;
}
ret = snprintf(error_description, error_description_buffer_size,
"%s %s", error_message, wrtd->error_msg);
......@@ -445,9 +441,8 @@ wrtd_status wrtd_set_attr_bool(wrtd_dev *wrtd,
{
wrtd_status status;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
status = wrtd_validate_id(wrtd, rep_cap_id, __func__);
WRTD_RETURN_IF_ERROR(status);
......@@ -499,14 +494,13 @@ wrtd_status wrtd_get_attr_bool(wrtd_dev *wrtd,
{
wrtd_status status;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
status = wrtd_validate_id(wrtd, rep_cap_id, __func__);
WRTD_RETURN_IF_ERROR(status);
if(value == NULL){
if (value == NULL) {
return wrtd_return_error
(wrtd, WRTD_ERROR_NULL_POINTER,
"Null pointer passed for function %s, "
......@@ -567,9 +561,8 @@ wrtd_status wrtd_set_attr_int32(wrtd_dev *wrtd,
{
wrtd_status status;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
status = wrtd_validate_id(wrtd, rep_cap_id, __func__);
WRTD_RETURN_IF_ERROR(status);
......@@ -631,14 +624,13 @@ wrtd_status wrtd_get_attr_int32(wrtd_dev *wrtd,
{
wrtd_status status;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
status = wrtd_validate_id(wrtd, rep_cap_id, __func__);
WRTD_RETURN_IF_ERROR(status);
if(value == NULL){
if (value == NULL) {
return wrtd_return_error
(wrtd, WRTD_ERROR_NULL_POINTER,
"Null pointer passed for function %s, "
......@@ -766,9 +758,8 @@ wrtd_status wrtd_set_attr_string(wrtd_dev *wrtd,
{
wrtd_status status;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
status = wrtd_validate_id(wrtd, rep_cap_id, __func__);
WRTD_RETURN_IF_ERROR(status);
......@@ -815,9 +806,8 @@ wrtd_status wrtd_get_attr_string(wrtd_dev *wrtd,
{
wrtd_status status;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
status = wrtd_validate_id(wrtd, rep_cap_id, __func__);
WRTD_RETURN_IF_ERROR(status);
......@@ -862,14 +852,13 @@ wrtd_status wrtd_set_attr_tstamp(wrtd_dev *wrtd,
{
wrtd_status status;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
status = wrtd_validate_id(wrtd, rep_cap_id, __func__);
WRTD_RETURN_IF_ERROR(status);
if(value == NULL){
if (value == NULL) {
return wrtd_return_error
(wrtd, WRTD_ERROR_NULL_POINTER,
"Null pointer passed for function %s, "
......@@ -931,14 +920,13 @@ wrtd_status wrtd_get_attr_tstamp(wrtd_dev *wrtd,
{
wrtd_status status;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
status = wrtd_validate_id(wrtd, rep_cap_id, __func__);
WRTD_RETURN_IF_ERROR(status);
if(value == NULL){
if (value == NULL) {
return wrtd_return_error
(wrtd, WRTD_ERROR_NULL_POINTER,
"Null pointer passed for function %s, "
......@@ -1067,9 +1055,8 @@ wrtd_status wrtd_get_next_event_log_entry(wrtd_dev *wrtd,
struct tm *tm;
time_t t;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
/* Do not retrieve entry from log if buffer_size
is zero. Just report on necessary buffer size.
......@@ -1077,7 +1064,7 @@ wrtd_status wrtd_get_next_event_log_entry(wrtd_dev *wrtd,
if (log_entry_buffer_size == 0)
return WRTD_LOG_ENTRY_SIZE;
if(log_entry == NULL){
if (log_entry == NULL) {
return wrtd_return_error
(wrtd, WRTD_ERROR_NULL_POINTER,
"Null pointer passed for function %s, "
......@@ -1261,9 +1248,8 @@ wrtd_status wrtd_clear_event_log_entries(wrtd_dev *wrtd)
{
int ret, i;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
for (i = 0; i < wrtd->nbr_cpus; ++i) {
ret = trtl_hmq_flush(wrtd->trtl, i, WRTD_HMQ);
......@@ -1305,9 +1291,8 @@ wrtd_status wrtd_add_alarm(wrtd_dev *wrtd,
int idx;
struct wrtd_alarm *alarm;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
/* Validate rep_cap_id. */
status = wrtd_validate_id(wrtd, rep_cap_id, __func__);
......@@ -1374,16 +1359,15 @@ wrtd_status wrtd_disable_all_alarms(wrtd_dev *wrtd)
struct wrtd_alarm *alarm;
int changed = 0;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
status = wrtd_fill_alarms(wrtd, __func__);
WRTD_RETURN_IF_ERROR(status);
for (idx = 0; idx < wrtd->nbr_alarms; idx++) {
alarm = &wrtd->alarms[idx].alarm;
if(alarm->enabled != 0) {
if (alarm->enabled != 0) {
alarm->enabled = 0;
changed = 1;
}
......@@ -1413,9 +1397,8 @@ wrtd_status wrtd_remove_alarm(wrtd_dev *wrtd,
unsigned idx;
struct wrtd_alarm *alarm;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
status = wrtd_find_alarm(wrtd, rep_cap_id, &idx, __func__);
WRTD_RETURN_IF_ERROR(status);
......@@ -1449,9 +1432,8 @@ extern wrtd_status wrtd_remove_all_alarms(wrtd_dev *wrtd)
unsigned idx;
struct wrtd_alarm *alarm;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
status = wrtd_fill_alarms(wrtd, __func__);
WRTD_RETURN_IF_ERROR(status);
......@@ -1500,9 +1482,8 @@ wrtd_status wrtd_get_alarm_name(wrtd_dev *wrtd,
unsigned i;
unsigned n;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
/* Load all alarms. */
status = wrtd_fill_alarms(wrtd, __func__);
......@@ -1623,9 +1604,8 @@ wrtd_status wrtd_disable_all_rules(wrtd_dev *wrtd)
struct wrtd_lib_rule *r;
int changed = 0;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
status = wrtd_fill_rules(wrtd, __func__);
WRTD_RETURN_IF_ERROR(status);
......@@ -1661,9 +1641,8 @@ wrtd_status wrtd_remove_rule(wrtd_dev *wrtd,
unsigned idx;
struct wrtd_rule_config *rule;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
status = wrtd_find_rule(wrtd, rep_cap_id, &idx, __func__);
WRTD_RETURN_IF_ERROR(status);
......@@ -1697,9 +1676,8 @@ wrtd_status wrtd_remove_all_rules(wrtd_dev *wrtd)
unsigned idx;
struct wrtd_rule_config *rule;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
status = wrtd_fill_rules(wrtd, __func__);
WRTD_RETURN_IF_ERROR(status);
......@@ -1750,9 +1728,8 @@ wrtd_status wrtd_get_rule_name(wrtd_dev *wrtd,
unsigned i;
unsigned n;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
/* Load all rules. */
status = wrtd_fill_rules(wrtd, __func__);
......@@ -1845,9 +1822,8 @@ wrtd_status wrtd_get_fw_name(wrtd_dev *wrtd,
wrtd_status status;
unsigned i;
if(wrtd == NULL){
if (wrtd == NULL)
return WRTD_ERROR_NOT_INITIALIZED;
}
/* Load all roots. */
status = wrtd_fill_roots(wrtd, __func__);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment