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

runtime: RTIO_DDS_COUNT -> CONFIG_RTIO_DDS_COUNT

This commit is contained in:
Sebastien Bourdeauducq 2016-07-27 21:16:19 +08:00
parent 78366ed9db
commit 92338026f6
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/runtime/bridge.c
View File

@ -18,7 +18,7 @@ static void rtio_output_blind(int channel, int addr, int data)
rtio_o_we_write(1); rtio_o_we_write(1);
} }
#if ((defined RTIO_DDS_COUNT) && (RTIO_DDS_COUNT > 0)) #if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
static void dds_write(int bus_channel, int addr, int data) static void dds_write(int bus_channel, int addr, int data)
{ {
rtio_output_blind(bus_channel, addr, data); rtio_output_blind(bus_channel, addr, data);
@ -75,7 +75,7 @@ void bridge_main(void)
mailbox_acknowledge(); mailbox_acknowledge();
break; break;
} }
#if ((defined RTIO_DDS_COUNT) && (RTIO_DDS_COUNT > 0)) #if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
case MESSAGE_TYPE_BRG_DDS_SEL: { case MESSAGE_TYPE_BRG_DDS_SEL: {
struct msg_brg_dds_sel *msg; struct msg_brg_dds_sel *msg;
@ -122,7 +122,7 @@ void bridge_main(void)
mailbox_acknowledge(); mailbox_acknowledge();
break; break;
} }
#endif /* RTIO_DDS_COUNT */ #endif /* CONFIG_RTIO_DDS_COUNT */
default: default:
mailbox_acknowledge(); mailbox_acknowledge();
break; break;

4
artiq/runtime/dds.c
View File

@ -1,6 +1,6 @@
#include <generated/csr.h> #include <generated/csr.h>
#if ((defined RTIO_DDS_COUNT) && (RTIO_DDS_COUNT > 0)) #if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
#include <stdio.h> #include <stdio.h>
@ -225,4 +225,4 @@ void dds_set(long long int timestamp, int bus_channel, int channel,
} }
} }
#endif /* RTIO_DDS_COUNT */ #endif /* CONFIG_RTIO_DDS_COUNT */

4
artiq/runtime/dds.h
View File

@ -5,7 +5,7 @@
#include <generated/csr.h> #include <generated/csr.h>
#include <generated/mem.h> #include <generated/mem.h>
#if ((defined RTIO_DDS_COUNT) && (RTIO_DDS_COUNT > 0)) #if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
/* Maximum number of commands in a batch */ /* Maximum number of commands in a batch */
#define DDS_MAX_BATCH 16 #define DDS_MAX_BATCH 16
@ -62,6 +62,6 @@ void dds_batch_exit(void);
void dds_set(long long int timestamp, int bus_channel, int channel, void dds_set(long long int timestamp, int bus_channel, int channel,
unsigned int ftw, unsigned int pow, int phase_mode, unsigned int amplitude); unsigned int ftw, unsigned int pow, int phase_mode, unsigned int amplitude);
#endif /* RTIO_DDS_COUNT */ #endif /* CONFIG_RTIO_DDS_COUNT */
#endif /* __DDS_H */ #endif /* __DDS_H */

2
artiq/runtime/ksupport.c
View File

@ -119,7 +119,7 @@ static const struct symbol runtime_exports[] = {
{"rtio_input_timestamp", &rtio_input_timestamp}, {"rtio_input_timestamp", &rtio_input_timestamp},
{"rtio_input_data", &rtio_input_data}, {"rtio_input_data", &rtio_input_data},
#if ((defined RTIO_DDS_COUNT) && (RTIO_DDS_COUNT > 0)) #if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
{"dds_init", &dds_init}, {"dds_init", &dds_init},
{"dds_batch_enter", &dds_batch_enter}, {"dds_batch_enter", &dds_batch_enter},
{"dds_batch_exit", &dds_batch_exit}, {"dds_batch_exit", &dds_batch_exit},

4
artiq/runtime/moninj.c
View File

@ -38,7 +38,7 @@ struct monitor_reply {
long long int ttl_overrides; long long int ttl_overrides;
unsigned short int dds_rtio_first_channel; unsigned short int dds_rtio_first_channel;
unsigned short int dds_channels_per_bus; unsigned short int dds_channels_per_bus;
#if ((defined RTIO_DDS_COUNT) && (RTIO_DDS_COUNT > 0)) #if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
unsigned int dds_ftws[CONFIG_RTIO_DDS_COUNT*CONFIG_DDS_CHANNELS_PER_BUS]; unsigned int dds_ftws[CONFIG_RTIO_DDS_COUNT*CONFIG_DDS_CHANNELS_PER_BUS];
#endif #endif
} __attribute__((packed)); } __attribute__((packed));
@ -68,7 +68,7 @@ static void moninj_monitor(const ip_addr_t *addr, u16_t port)
reply.ttl_overrides |= 1LL << i; reply.ttl_overrides |= 1LL << i;
} }
#if ((defined RTIO_DDS_COUNT) && (RTIO_DDS_COUNT > 0)) #if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
int j; int j;
reply.dds_rtio_first_channel = CONFIG_RTIO_FIRST_DDS_CHANNEL; reply.dds_rtio_first_channel = CONFIG_RTIO_FIRST_DDS_CHANNEL;

6
artiq/runtime/test_mode.c
View File

@ -108,7 +108,7 @@ static void ttlo(char *n, char *value)
brg_ttlo(n2, value2); brg_ttlo(n2, value2);
} }
#if ((defined RTIO_DDS_COUNT) && (RTIO_DDS_COUNT > 0)) #if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
static int bus_channel = CONFIG_RTIO_FIRST_DDS_CHANNEL; static int bus_channel = CONFIG_RTIO_FIRST_DDS_CHANNEL;
@ -362,7 +362,7 @@ static void ddstest(char *n, char *channel)
do_ddstest_one(j); do_ddstest_one(j);
} }
} }
#endif /* RTIO_DDS_COUNT */ #endif /* CONFIG_RTIO_DDS_COUNT */
#if (defined CSR_SPIFLASH_BASE && defined CONFIG_SPIFLASH_PAGE_SIZE) #if (defined CSR_SPIFLASH_BASE && defined CONFIG_SPIFLASH_PAGE_SIZE)
static void fsread(char *key) static void fsread(char *key)
@ -662,7 +662,7 @@ static void do_command(char *c)
else if(strcmp(token, "ttloe") == 0) ttloe(get_token(&c), get_token(&c)); else if(strcmp(token, "ttloe") == 0) ttloe(get_token(&c), get_token(&c));
else if(strcmp(token, "ttlo") == 0) ttlo(get_token(&c), get_token(&c)); else if(strcmp(token, "ttlo") == 0) ttlo(get_token(&c), get_token(&c));
#if ((defined RTIO_DDS_COUNT) && (RTIO_DDS_COUNT > 0)) #if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
else if(strcmp(token, "ddsbus") == 0) ddsbus(get_token(&c)); else if(strcmp(token, "ddsbus") == 0) ddsbus(get_token(&c));
else if(strcmp(token, "ddssel") == 0) ddssel(get_token(&c)); else if(strcmp(token, "ddssel") == 0) ddssel(get_token(&c));
else if(strcmp(token, "ddsw") == 0) ddsw(get_token(&c), get_token(&c)); else if(strcmp(token, "ddsw") == 0) ddsw(get_token(&c), get_token(&c));