diff --git a/artiq/runtime/analyzer.c b/artiq/runtime/analyzer.c index f40188ab6..c6519eae0 100644 --- a/artiq/runtime/analyzer.c +++ b/artiq/runtime/analyzer.c @@ -73,7 +73,7 @@ void analyzer_start(void) analyzer_header.overflow_occured = rtio_analyzer_message_encoder_overflow_read(); analyzer_header.log_channel = CONFIG_RTIO_LOG_CHANNEL; analyzer_header.dds_channel = CONFIG_RTIO_DDS_CHANNEL; -#ifdef DDS_ONEHOT_SEL +#ifdef CONFIG_DDS_ONEHOT_SEL analyzer_header.dds_onehot_sel = 1; #else analyzer_header.dds_onehot_sel = 0; diff --git a/artiq/runtime/dds.c b/artiq/runtime/dds.c index 93ade0569..1e9d5cf16 100644 --- a/artiq/runtime/dds.c +++ b/artiq/runtime/dds.c @@ -41,7 +41,7 @@ void dds_init(long long int timestamp, int channel) now = timestamp - DURATION_INIT; -#ifdef DDS_ONEHOT_SEL +#ifdef CONFIG_DDS_ONEHOT_SEL channel = 1 << channel; #endif channel <<= 1; @@ -98,7 +98,7 @@ static void dds_set_one(long long int now, long long int ref_time, unsigned int log("Attempted to set invalid DDS channel"); return; } -#ifdef DDS_ONEHOT_SEL +#ifdef CONFIG_DDS_ONEHOT_SEL channel_enc = 1 << channel; #else channel_enc = channel; diff --git a/artiq/runtime/test_mode.c b/artiq/runtime/test_mode.c index 8c7f47c0c..9789ad11c 100644 --- a/artiq/runtime/test_mode.c +++ b/artiq/runtime/test_mode.c @@ -120,7 +120,7 @@ static void ddssel(char *n) return; } -#ifdef DDS_ONEHOT_SEL +#ifdef CONFIG_DDS_ONEHOT_SEL n2 = 1 << n2; #endif brg_ddssel(n2); @@ -200,7 +200,7 @@ static void ddsftw(char *n, char *ftw) return; } -#ifdef DDS_ONEHOT_SEL +#ifdef CONFIG_DDS_ONEHOT_SEL n2 = 1 << n2; #endif brg_ddssel(n2); @@ -264,7 +264,7 @@ static void do_ddstest_one(unsigned int i) }; unsigned int f, g, j; -#ifdef DDS_ONEHOT_SEL +#ifdef CONFIG_DDS_ONEHOT_SEL brg_ddssel(1 << i); #else brg_ddssel(i);