M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

CSRConstant: also port DDS constants

This commit is contained in:
Robert Jördens 2015-12-04 00:57:40 -07:00 committed by Sebastien Bourdeauducq
parent 5db1f9794e
commit 7886827b80
6 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/gateware/targets/kc705.py
View File

@ -175,7 +175,7 @@ class NIST_QC1(_NIST_QCx):
self.config["RTIO_DDS_CHANNEL"] = len(rtio_channels) self.config["RTIO_DDS_CHANNEL"] = len(rtio_channels)
self.config["DDS_CHANNEL_COUNT"] = 8 self.config["DDS_CHANNEL_COUNT"] = 8
self.add_constant("DDS_AD9858") self.config["DDS_AD9858"] = 1
phy = dds.AD9858(platform.request("dds"), 8) phy = dds.AD9858(platform.request("dds"), 8)
self.submodules += phy self.submodules += phy
rtio_channels.append(rtio.Channel.from_phy(phy, rtio_channels.append(rtio.Channel.from_phy(phy,
@ -219,8 +219,8 @@ class NIST_QC2(_NIST_QCx):
self.config["RTIO_DDS_CHANNEL"] = len(rtio_channels) self.config["RTIO_DDS_CHANNEL"] = len(rtio_channels)
self.config["DDS_CHANNEL_COUNT"] = 11 self.config["DDS_CHANNEL_COUNT"] = 11
self.add_constant("DDS_AD9914") self.config["DDS_AD9914"] = True
self.add_constant("DDS_ONEHOT_SEL") self.config["DDS_ONEHOT_SEL"] = True
phy = dds.AD9914(platform.request("dds"), 11, onehot=True) phy = dds.AD9914(platform.request("dds"), 11, onehot=True)
self.submodules += phy self.submodules += phy
rtio_channels.append(rtio.Channel.from_phy(phy, rtio_channels.append(rtio.Channel.from_phy(phy,

2
artiq/gateware/targets/pipistrello.py
View File

@ -181,7 +181,7 @@ trce -v 12 -fastpaths -tsi {build_name}.tsi -o {build_name}.twr {build_name}.ncd
self.config["RTIO_DDS_CHANNEL"] = len(rtio_channels) self.config["RTIO_DDS_CHANNEL"] = len(rtio_channels)
self.config["DDS_CHANNEL_COUNT"] = 8 self.config["DDS_CHANNEL_COUNT"] = 8
self.add_constant("DDS_AD9858") self.config["DDS_AD9858"] = True
dds_pins = platform.request("dds") dds_pins = platform.request("dds")
self.comb += dds_pins.p.eq(0) self.comb += dds_pins.p.eq(0)
phy = dds.AD9858(dds_pins, 8) phy = dds.AD9858(dds_pins, 8)

4
artiq/runtime/bridge.c
View File

@ -20,10 +20,10 @@ static int dds_read(int addr)
{ {
int r; int r;
#ifdef DDS_AD9858 #ifdef CONFIG_DDS_AD9858
#define DDS_READ_FLAG 128 #define DDS_READ_FLAG 128
#endif #endif
#ifdef DDS_AD9914 #ifdef CONFIG_DDS_AD9914
#define DDS_READ_FLAG 256 #define DDS_READ_FLAG 256
#endif #endif
dds_write(addr | DDS_READ_FLAG, 0); dds_write(addr | DDS_READ_FLAG, 0);

28
artiq/runtime/dds.c
View File

@ -8,12 +8,12 @@
#define DURATION_WRITE (5 << CONFIG_RTIO_FINE_TS_WIDTH) #define DURATION_WRITE (5 << CONFIG_RTIO_FINE_TS_WIDTH)
#if defined DDS_AD9858 #if defined CONFIG_DDS_AD9858
/* Assume 8-bit bus */ /* Assume 8-bit bus */
#define DURATION_INIT (7*DURATION_WRITE) /* not counting FUD */ #define DURATION_INIT (7*DURATION_WRITE) /* not counting FUD */
#define DURATION_PROGRAM (8*DURATION_WRITE) /* not counting FUD */ #define DURATION_PROGRAM (8*DURATION_WRITE) /* not counting FUD */
#elif defined DDS_AD9914 #elif defined CONFIG_DDS_AD9914
/* Assume 16-bit bus */ /* Assume 16-bit bus */
/* DAC calibration takes max. 1ms as per datasheet */ /* DAC calibration takes max. 1ms as per datasheet */
#define DURATION_DAC_CAL (147000 << CONFIG_RTIO_FINE_TS_WIDTH) #define DURATION_DAC_CAL (147000 << CONFIG_RTIO_FINE_TS_WIDTH)
@ -46,7 +46,7 @@ void dds_init(long long int timestamp, int channel)
#endif #endif
channel <<= 1; channel <<= 1;
DDS_WRITE(DDS_GPIO, channel); DDS_WRITE(DDS_GPIO, channel);
#ifndef DDS_AD9914 #ifndef CONFIG_DDS_AD9914
/* /*
* Resetting a AD9914 intermittently crashes it. It does not produce any * Resetting a AD9914 intermittently crashes it. It does not produce any
* output until power-cycled. * output until power-cycled.
@ -58,7 +58,7 @@ void dds_init(long long int timestamp, int channel)
DDS_WRITE(DDS_GPIO, channel); DDS_WRITE(DDS_GPIO, channel);
#endif #endif
#ifdef DDS_AD9858 #ifdef CONFIG_DDS_AD9858
/* /*
* 2GHz divider disable * 2GHz divider disable
* SYNCLK disable * SYNCLK disable
@ -72,7 +72,7 @@ void dds_init(long long int timestamp, int channel)
DDS_WRITE(DDS_FUD, 0); DDS_WRITE(DDS_FUD, 0);
#endif #endif
#ifdef DDS_AD9914 #ifdef CONFIG_DDS_AD9914
DDS_WRITE(DDS_CFR1H, 0x0000); /* Enable cosine output */ DDS_WRITE(DDS_CFR1H, 0x0000); /* Enable cosine output */
DDS_WRITE(DDS_CFR2L, 0x8900); /* Enable matched latency */ DDS_WRITE(DDS_CFR2L, 0x8900); /* Enable matched latency */
DDS_WRITE(DDS_CFR2H, 0x0080); /* Enable profile mode */ DDS_WRITE(DDS_CFR2H, 0x0080); /* Enable profile mode */
@ -105,14 +105,14 @@ static void dds_set_one(long long int now, long long int ref_time, unsigned int
#endif #endif
DDS_WRITE(DDS_GPIO, channel_enc << 1); DDS_WRITE(DDS_GPIO, channel_enc << 1);
#ifdef DDS_AD9858 #ifdef CONFIG_DDS_AD9858
DDS_WRITE(DDS_FTW0, ftw & 0xff); DDS_WRITE(DDS_FTW0, ftw & 0xff);
DDS_WRITE(DDS_FTW1, (ftw >> 8) & 0xff); DDS_WRITE(DDS_FTW1, (ftw >> 8) & 0xff);
DDS_WRITE(DDS_FTW2, (ftw >> 16) & 0xff); DDS_WRITE(DDS_FTW2, (ftw >> 16) & 0xff);
DDS_WRITE(DDS_FTW3, (ftw >> 24) & 0xff); DDS_WRITE(DDS_FTW3, (ftw >> 24) & 0xff);
#endif #endif
#ifdef DDS_AD9914 #ifdef CONFIG_DDS_AD9914
DDS_WRITE(DDS_FTWL, ftw & 0xffff); DDS_WRITE(DDS_FTWL, ftw & 0xffff);
DDS_WRITE(DDS_FTWH, (ftw >> 16) & 0xffff); DDS_WRITE(DDS_FTWH, (ftw >> 16) & 0xffff);
#endif #endif
@ -122,10 +122,10 @@ static void dds_set_one(long long int now, long long int ref_time, unsigned int
*/ */
if(phase_mode == PHASE_MODE_CONTINUOUS) { if(phase_mode == PHASE_MODE_CONTINUOUS) {
/* Do not clear phase accumulator on FUD */ /* Do not clear phase accumulator on FUD */
#ifdef DDS_AD9858 #ifdef CONFIG_DDS_AD9858
DDS_WRITE(DDS_CFR2, 0x00); DDS_WRITE(DDS_CFR2, 0x00);
#endif #endif
#ifdef DDS_AD9914 #ifdef CONFIG_DDS_AD9914
/* Disable autoclear phase accumulator and enables OSK. */ /* Disable autoclear phase accumulator and enables OSK. */
DDS_WRITE(DDS_CFR1L, 0x0108); DDS_WRITE(DDS_CFR1L, 0x0108);
#endif #endif
@ -134,10 +134,10 @@ static void dds_set_one(long long int now, long long int ref_time, unsigned int
long long int fud_time; long long int fud_time;
/* Clear phase accumulator on FUD */ /* Clear phase accumulator on FUD */
#ifdef DDS_AD9858 #ifdef CONFIG_DDS_AD9858
DDS_WRITE(DDS_CFR2, 0x40); DDS_WRITE(DDS_CFR2, 0x40);
#endif #endif
#ifdef DDS_AD9914 #ifdef CONFIG_DDS_AD9914
/* Enable autoclear phase accumulator and enables OSK. */ /* Enable autoclear phase accumulator and enables OSK. */
DDS_WRITE(DDS_CFR1L, 0x2108); DDS_WRITE(DDS_CFR1L, 0x2108);
#endif #endif
@ -148,14 +148,14 @@ static void dds_set_one(long long int now, long long int ref_time, unsigned int
continuous_phase_comp[channel] = pow; continuous_phase_comp[channel] = pow;
} }
#ifdef DDS_AD9858 #ifdef CONFIG_DDS_AD9858
DDS_WRITE(DDS_POW0, pow & 0xff); DDS_WRITE(DDS_POW0, pow & 0xff);
DDS_WRITE(DDS_POW1, (pow >> 8) & 0x3f); DDS_WRITE(DDS_POW1, (pow >> 8) & 0x3f);
#endif #endif
#ifdef DDS_AD9914 #ifdef CONFIG_DDS_AD9914
DDS_WRITE(DDS_POW, pow); DDS_WRITE(DDS_POW, pow);
#endif #endif
#ifdef DDS_AD9914 #ifdef CONFIG_DDS_AD9914
DDS_WRITE(DDS_ASF, amplitude); DDS_WRITE(DDS_ASF, amplitude);
#endif #endif
DDS_WRITE(DDS_FUD, 0); DDS_WRITE(DDS_FUD, 0);

8
artiq/runtime/dds.h
View File

@ -8,7 +8,7 @@
/* Maximum number of commands in a batch */ /* Maximum number of commands in a batch */
#define DDS_MAX_BATCH 16 #define DDS_MAX_BATCH 16
#ifdef DDS_AD9858 #ifdef CONFIG_DDS_AD9858
#define DDS_CFR0 0x00 #define DDS_CFR0 0x00
#define DDS_CFR1 0x01 #define DDS_CFR1 0x01
#define DDS_CFR2 0x02 #define DDS_CFR2 0x02
@ -23,7 +23,7 @@
#define DDS_GPIO 0x41 #define DDS_GPIO 0x41
#endif #endif
#ifdef DDS_AD9914 #ifdef CONFIG_DDS_AD9914
#define DDS_CFR1L 0x01 #define DDS_CFR1L 0x01
#define DDS_CFR1H 0x03 #define DDS_CFR1H 0x03
#define DDS_CFR2L 0x05 #define DDS_CFR2L 0x05
@ -40,11 +40,11 @@
#define DDS_GPIO 0x81 #define DDS_GPIO 0x81
#endif #endif
#ifdef DDS_AD9858 #ifdef CONFIG_DDS_AD9858
#define DDS_POW_WIDTH 14 #define DDS_POW_WIDTH 14
#endif #endif
#ifdef DDS_AD9914 #ifdef CONFIG_DDS_AD9914
#define DDS_POW_WIDTH 16 #define DDS_POW_WIDTH 16
#endif #endif

20
artiq/runtime/test_mode.c
View File

@ -166,10 +166,10 @@ static void ddsr(char *addr)
return; return;
} }
#ifdef DDS_AD9858 #ifdef CONFIG_DDS_AD9858
printf("0x%02x\n", brg_ddsread(addr2)); printf("0x%02x\n", brg_ddsread(addr2));
#endif #endif
#ifdef DDS_AD9914 #ifdef CONFIG_DDS_AD9914
printf("0x%04x\n", brg_ddsread(addr2)); printf("0x%04x\n", brg_ddsread(addr2));
#endif #endif
} }
@ -205,13 +205,13 @@ static void ddsftw(char *n, char *ftw)
#endif #endif
brg_ddssel(n2); brg_ddssel(n2);
#ifdef DDS_AD9858 #ifdef CONFIG_DDS_AD9858
brg_ddswrite(DDS_FTW0, ftw2 & 0xff); brg_ddswrite(DDS_FTW0, ftw2 & 0xff);
brg_ddswrite(DDS_FTW1, (ftw2 >> 8) & 0xff); brg_ddswrite(DDS_FTW1, (ftw2 >> 8) & 0xff);
brg_ddswrite(DDS_FTW2, (ftw2 >> 16) & 0xff); brg_ddswrite(DDS_FTW2, (ftw2 >> 16) & 0xff);
brg_ddswrite(DDS_FTW3, (ftw2 >> 24) & 0xff); brg_ddswrite(DDS_FTW3, (ftw2 >> 24) & 0xff);
#endif #endif
#ifdef DDS_AD9914 #ifdef CONFIG_DDS_AD9914
brg_ddswrite(DDS_FTWL, ftw2 & 0xffff); brg_ddswrite(DDS_FTWL, ftw2 & 0xffff);
brg_ddswrite(DDS_FTWH, (ftw2 >> 16) & 0xffff); brg_ddswrite(DDS_FTWH, (ftw2 >> 16) & 0xffff);
#endif #endif
@ -224,7 +224,7 @@ static void ddsreset(void)
brg_ddsreset(); brg_ddsreset();
} }
#ifdef DDS_AD9858 #ifdef CONFIG_DDS_AD9858
static void ddsinit(void) static void ddsinit(void)
{ {
brg_ddsreset(); brg_ddsreset();
@ -236,7 +236,7 @@ static void ddsinit(void)
} }
#endif #endif
#ifdef DDS_AD9914 #ifdef CONFIG_DDS_AD9914
static void ddsinit(void) static void ddsinit(void)
{ {
long long int t; long long int t;
@ -273,24 +273,24 @@ static void do_ddstest_one(unsigned int i)
for(j=0; j<12; j++) { for(j=0; j<12; j++) {
f = v[j]; f = v[j];
#ifdef DDS_AD9858 #ifdef CONFIG_DDS_AD9858
brg_ddswrite(DDS_FTW0, f & 0xff); brg_ddswrite(DDS_FTW0, f & 0xff);
brg_ddswrite(DDS_FTW1, (f >> 8) & 0xff); brg_ddswrite(DDS_FTW1, (f >> 8) & 0xff);
brg_ddswrite(DDS_FTW2, (f >> 16) & 0xff); brg_ddswrite(DDS_FTW2, (f >> 16) & 0xff);
brg_ddswrite(DDS_FTW3, (f >> 24) & 0xff); brg_ddswrite(DDS_FTW3, (f >> 24) & 0xff);
#endif #endif
#ifdef DDS_AD9914 #ifdef CONFIG_DDS_AD9914
brg_ddswrite(DDS_FTWL, f & 0xffff); brg_ddswrite(DDS_FTWL, f & 0xffff);
brg_ddswrite(DDS_FTWH, (f >> 16) & 0xffff); brg_ddswrite(DDS_FTWH, (f >> 16) & 0xffff);
#endif #endif
brg_ddsfud(); brg_ddsfud();
#ifdef DDS_AD9858 #ifdef CONFIG_DDS_AD9858
g = brg_ddsread(DDS_FTW0); g = brg_ddsread(DDS_FTW0);
g |= brg_ddsread(DDS_FTW1) << 8; g |= brg_ddsread(DDS_FTW1) << 8;
g |= brg_ddsread(DDS_FTW2) << 16; g |= brg_ddsread(DDS_FTW2) << 16;
g |= brg_ddsread(DDS_FTW3) << 24; g |= brg_ddsread(DDS_FTW3) << 24;
#endif #endif
#ifdef DDS_AD9914 #ifdef CONFIG_DDS_AD9914
g = brg_ddsread(DDS_FTWL); g = brg_ddsread(DDS_FTWL);
g |= brg_ddsread(DDS_FTWH) << 16; g |= brg_ddsread(DDS_FTWH) << 16;
#endif #endif