RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

infra: use new wrapper

This commit is contained in:
Thomas Schoebel-Theuer 2016-12-31 23:14:34 +01:00 committed by Thomas Schoebel-Theuer
parent 0c76f0f1fd
commit e370af69e1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/sy_old/sy_generic.c
View File

@ -1337,7 +1337,7 @@ int mars_free_brick(struct mars_brick *brick)
struct mars_input *input = brick->inputs[i]; struct mars_input *input = brick->inputs[i];
if (input) { if (input) {
MARS_DBG("disconnecting input %i\n", i); MARS_DBG("disconnecting input %i\n", i);
generic_disconnect((void*)input); mars_disconnect(input);
} }
} }
@ -1493,10 +1493,10 @@ int mars_kill_brick(struct mars_brick *brick)
*brick->kill_ptr = NULL; *brick->kill_ptr = NULL;
for (i = 0; i < max_inputs; i++) { for (i = 0; i < max_inputs; i++) {
struct generic_input *input = (void*)brick->inputs[i]; struct mars_input *input = brick->inputs[i];
if (!input) if (!input)
continue; continue;
status = generic_disconnect(input); status = mars_disconnect(input);
if (unlikely(status < 0)) { if (unlikely(status < 0)) {
MARS_ERR("brick '%s' '%s' disconnect %d failed, status = %d\n", SAFE_STR(brick->brick_name), SAFE_STR(brick->brick_path), i, status); MARS_ERR("brick '%s' '%s' disconnect %d failed, status = %d\n", SAFE_STR(brick->brick_name), SAFE_STR(brick->brick_path), i, status);
goto done; goto done;
@ -1884,7 +1884,7 @@ struct mars_brick *make_brick_all(
// connect the wires // connect the wires
for (i = 0; i < prev_count; i++) { for (i = 0; i < prev_count; i++) {
int status; int status;
status = generic_connect((void*)brick->inputs[i], (void*)prev[i]->outputs[0]); status = mars_connect(brick->inputs[i], prev[i]->outputs[0]);
if (unlikely(status < 0)) { if (unlikely(status < 0)) {
MARS_ERR("'%s' '%s' cannot connect input %d\n", new_path, new_name, i); MARS_ERR("'%s' '%s' cannot connect input %d\n", new_path, new_name, i);
goto err; goto err;