mirror of
https://github.com/m-labs/artiq.git
synced 2024-12-25 11:18:27 +08:00
runtime: RTIO_DDS_COUNT -> CONFIG_RTIO_DDS_COUNT
This commit is contained in:
parent
78366ed9db
commit
92338026f6
@ -18,7 +18,7 @@ static void rtio_output_blind(int channel, int addr, int data)
|
||||
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)
|
||||
{
|
||||
rtio_output_blind(bus_channel, addr, data);
|
||||
@ -75,7 +75,7 @@ void bridge_main(void)
|
||||
mailbox_acknowledge();
|
||||
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: {
|
||||
struct msg_brg_dds_sel *msg;
|
||||
|
||||
@ -122,7 +122,7 @@ void bridge_main(void)
|
||||
mailbox_acknowledge();
|
||||
break;
|
||||
}
|
||||
#endif /* RTIO_DDS_COUNT */
|
||||
#endif /* CONFIG_RTIO_DDS_COUNT */
|
||||
default:
|
||||
mailbox_acknowledge();
|
||||
break;
|
||||
|
@ -1,6 +1,6 @@
|
||||
#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>
|
||||
|
||||
@ -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 */
|
||||
|
@ -5,7 +5,7 @@
|
||||
#include <generated/csr.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 */
|
||||
#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,
|
||||
unsigned int ftw, unsigned int pow, int phase_mode, unsigned int amplitude);
|
||||
|
||||
#endif /* RTIO_DDS_COUNT */
|
||||
#endif /* CONFIG_RTIO_DDS_COUNT */
|
||||
|
||||
#endif /* __DDS_H */
|
||||
|
@ -119,7 +119,7 @@ static const struct symbol runtime_exports[] = {
|
||||
{"rtio_input_timestamp", &rtio_input_timestamp},
|
||||
{"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_batch_enter", &dds_batch_enter},
|
||||
{"dds_batch_exit", &dds_batch_exit},
|
||||
|
@ -38,7 +38,7 @@ struct monitor_reply {
|
||||
long long int ttl_overrides;
|
||||
unsigned short int dds_rtio_first_channel;
|
||||
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];
|
||||
#endif
|
||||
} __attribute__((packed));
|
||||
@ -68,7 +68,7 @@ static void moninj_monitor(const ip_addr_t *addr, u16_t port)
|
||||
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;
|
||||
|
||||
reply.dds_rtio_first_channel = CONFIG_RTIO_FIRST_DDS_CHANNEL;
|
||||
|
@ -108,7 +108,7 @@ static void ttlo(char *n, char *value)
|
||||
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;
|
||||
|
||||
@ -362,7 +362,7 @@ static void ddstest(char *n, char *channel)
|
||||
do_ddstest_one(j);
|
||||
}
|
||||
}
|
||||
#endif /* RTIO_DDS_COUNT */
|
||||
#endif /* CONFIG_RTIO_DDS_COUNT */
|
||||
|
||||
#if (defined CSR_SPIFLASH_BASE && defined CONFIG_SPIFLASH_PAGE_SIZE)
|
||||
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, "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, "ddssel") == 0) ddssel(get_token(&c));
|
||||
else if(strcmp(token, "ddsw") == 0) ddsw(get_token(&c), get_token(&c));
|
||||
|
Loading…
Reference in New Issue
Block a user