mirror of https://github.com/m-labs/artiq.git
runtime/dds: DDS_ONEHOT_SEL -> CONFIG_DDS_ONEHOT_SEL
This commit is contained in:
parent
5bf257818d
commit
15039e1d74
|
@ -73,7 +73,7 @@ void analyzer_start(void)
|
||||||
analyzer_header.overflow_occured = rtio_analyzer_message_encoder_overflow_read();
|
analyzer_header.overflow_occured = rtio_analyzer_message_encoder_overflow_read();
|
||||||
analyzer_header.log_channel = CONFIG_RTIO_LOG_CHANNEL;
|
analyzer_header.log_channel = CONFIG_RTIO_LOG_CHANNEL;
|
||||||
analyzer_header.dds_channel = CONFIG_RTIO_DDS_CHANNEL;
|
analyzer_header.dds_channel = CONFIG_RTIO_DDS_CHANNEL;
|
||||||
#ifdef DDS_ONEHOT_SEL
|
#ifdef CONFIG_DDS_ONEHOT_SEL
|
||||||
analyzer_header.dds_onehot_sel = 1;
|
analyzer_header.dds_onehot_sel = 1;
|
||||||
#else
|
#else
|
||||||
analyzer_header.dds_onehot_sel = 0;
|
analyzer_header.dds_onehot_sel = 0;
|
||||||
|
|
|
@ -41,7 +41,7 @@ void dds_init(long long int timestamp, int channel)
|
||||||
|
|
||||||
now = timestamp - DURATION_INIT;
|
now = timestamp - DURATION_INIT;
|
||||||
|
|
||||||
#ifdef DDS_ONEHOT_SEL
|
#ifdef CONFIG_DDS_ONEHOT_SEL
|
||||||
channel = 1 << channel;
|
channel = 1 << channel;
|
||||||
#endif
|
#endif
|
||||||
channel <<= 1;
|
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");
|
log("Attempted to set invalid DDS channel");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#ifdef DDS_ONEHOT_SEL
|
#ifdef CONFIG_DDS_ONEHOT_SEL
|
||||||
channel_enc = 1 << channel;
|
channel_enc = 1 << channel;
|
||||||
#else
|
#else
|
||||||
channel_enc = channel;
|
channel_enc = channel;
|
||||||
|
|
|
@ -120,7 +120,7 @@ static void ddssel(char *n)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DDS_ONEHOT_SEL
|
#ifdef CONFIG_DDS_ONEHOT_SEL
|
||||||
n2 = 1 << n2;
|
n2 = 1 << n2;
|
||||||
#endif
|
#endif
|
||||||
brg_ddssel(n2);
|
brg_ddssel(n2);
|
||||||
|
@ -200,7 +200,7 @@ static void ddsftw(char *n, char *ftw)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DDS_ONEHOT_SEL
|
#ifdef CONFIG_DDS_ONEHOT_SEL
|
||||||
n2 = 1 << n2;
|
n2 = 1 << n2;
|
||||||
#endif
|
#endif
|
||||||
brg_ddssel(n2);
|
brg_ddssel(n2);
|
||||||
|
@ -264,7 +264,7 @@ static void do_ddstest_one(unsigned int i)
|
||||||
};
|
};
|
||||||
unsigned int f, g, j;
|
unsigned int f, g, j;
|
||||||
|
|
||||||
#ifdef DDS_ONEHOT_SEL
|
#ifdef CONFIG_DDS_ONEHOT_SEL
|
||||||
brg_ddssel(1 << i);
|
brg_ddssel(1 << i);
|
||||||
#else
|
#else
|
||||||
brg_ddssel(i);
|
brg_ddssel(i);
|
||||||
|
|
Loading…
Reference in New Issue