From: Pavel Pisa Date: Thu, 28 May 2009 01:24:56 +0000 (+0200) Subject: The streamer should ask for configured default CPU contract. X-Git-Url: https://rtime.felk.cvut.cz/gitweb/frescor/streamer.git/commitdiff_plain/438716c84a3a674911c1c9b7711b936b3438ea57 The streamer should ask for configured default CPU contract. Signed-off-by: Pavel Pisa --- diff --git a/Makefile.omk b/Makefile.omk index 4c62334..3b39b8c 100644 --- a/Makefile.omk +++ b/Makefile.omk @@ -1,6 +1,7 @@ default_CONFIG += CONFIG_STREAMER_WITH_FRSH=y default_CONFIG += CONFIG_AQUOSA=x default_CONFIG += CONFIG_OC_ULUT=x +default_CONFIG += FRSH_CPU_ID_DEFAULT LOCAL_CONFIG_H = streamer_config.h diff --git a/streamer.c b/streamer.c index c3a0569..d082f3a 100644 --- a/streamer.c +++ b/streamer.c @@ -222,7 +222,7 @@ int main(int argc, char *argv[]) FRSH_CT_REGULAR); if (ret) PERROR_AND_EXIT(ret, "frsh_contract_set_basic_params"); ret = frsh_contract_set_resource_and_label(&cpu_contract, - FRSH_RT_PROCESSOR, 0,"aqcpu_cont"); + FRSH_RT_PROCESSOR, FRSH_CPU_ID_DEFAULT, "aqcpu_cont"); if (ret) PERROR_AND_EXIT(ret, "frsh_contract_set_resource_and_label"); ret = frsh_contract_negotiate(&cpu_contract, &cpu_vres);