Skip to content

Commit 9233802

Browse files
sbourdeauducqsbourdeauducq
committedJul 27, 2016
runtime: RTIO_DDS_COUNT -> CONFIG_RTIO_DDS_COUNT
·
8.02.0rc1
1 parent 78366ed commit 9233802

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed
 

Diff for: ‎artiq/runtime/bridge.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ static void rtio_output_blind(int channel, int addr, int data)
1818
rtio_o_we_write(1);
1919
}
2020

21-
#if ((defined RTIO_DDS_COUNT) && (RTIO_DDS_COUNT > 0))
21+
#if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
2222
static void dds_write(int bus_channel, int addr, int data)
2323
{
2424
rtio_output_blind(bus_channel, addr, data);
@@ -75,7 +75,7 @@ void bridge_main(void)
7575
mailbox_acknowledge();
7676
break;
7777
}
78-
#if ((defined RTIO_DDS_COUNT) && (RTIO_DDS_COUNT > 0))
78+
#if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
7979
case MESSAGE_TYPE_BRG_DDS_SEL: {
8080
struct msg_brg_dds_sel *msg;
8181

@@ -122,7 +122,7 @@ void bridge_main(void)
122122
mailbox_acknowledge();
123123
break;
124124
}
125-
#endif /* RTIO_DDS_COUNT */
125+
#endif /* CONFIG_RTIO_DDS_COUNT */
126126
default:
127127
mailbox_acknowledge();
128128
break;

Diff for: ‎artiq/runtime/dds.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <generated/csr.h>
22

3-
#if ((defined RTIO_DDS_COUNT) && (RTIO_DDS_COUNT > 0))
3+
#if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
44

55
#include <stdio.h>
66

@@ -225,4 +225,4 @@ void dds_set(long long int timestamp, int bus_channel, int channel,
225225
}
226226
}
227227

228-
#endif /* RTIO_DDS_COUNT */
228+
#endif /* CONFIG_RTIO_DDS_COUNT */

Diff for: ‎artiq/runtime/dds.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <generated/csr.h>
66
#include <generated/mem.h>
77

8-
#if ((defined RTIO_DDS_COUNT) && (RTIO_DDS_COUNT > 0))
8+
#if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
99

1010
/* Maximum number of commands in a batch */
1111
#define DDS_MAX_BATCH 16
@@ -62,6 +62,6 @@ void dds_batch_exit(void);
6262
void dds_set(long long int timestamp, int bus_channel, int channel,
6363
unsigned int ftw, unsigned int pow, int phase_mode, unsigned int amplitude);
6464

65-
#endif /* RTIO_DDS_COUNT */
65+
#endif /* CONFIG_RTIO_DDS_COUNT */
6666

6767
#endif /* __DDS_H */

Diff for: ‎artiq/runtime/ksupport.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ static const struct symbol runtime_exports[] = {
119119
{"rtio_input_timestamp", &rtio_input_timestamp},
120120
{"rtio_input_data", &rtio_input_data},
121121

122-
#if ((defined RTIO_DDS_COUNT) && (RTIO_DDS_COUNT > 0))
122+
#if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
123123
{"dds_init", &dds_init},
124124
{"dds_batch_enter", &dds_batch_enter},
125125
{"dds_batch_exit", &dds_batch_exit},

Diff for: ‎artiq/runtime/moninj.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ struct monitor_reply {
3838
long long int ttl_overrides;
3939
unsigned short int dds_rtio_first_channel;
4040
unsigned short int dds_channels_per_bus;
41-
#if ((defined RTIO_DDS_COUNT) && (RTIO_DDS_COUNT > 0))
41+
#if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
4242
unsigned int dds_ftws[CONFIG_RTIO_DDS_COUNT*CONFIG_DDS_CHANNELS_PER_BUS];
4343
#endif
4444
} __attribute__((packed));
@@ -68,7 +68,7 @@ static void moninj_monitor(const ip_addr_t *addr, u16_t port)
6868
reply.ttl_overrides |= 1LL << i;
6969
}
7070

71-
#if ((defined RTIO_DDS_COUNT) && (RTIO_DDS_COUNT > 0))
71+
#if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
7272
int j;
7373

7474
reply.dds_rtio_first_channel = CONFIG_RTIO_FIRST_DDS_CHANNEL;

Diff for: ‎artiq/runtime/test_mode.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ static void ttlo(char *n, char *value)
108108
brg_ttlo(n2, value2);
109109
}
110110

111-
#if ((defined RTIO_DDS_COUNT) && (RTIO_DDS_COUNT > 0))
111+
#if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
112112

113113
static int bus_channel = CONFIG_RTIO_FIRST_DDS_CHANNEL;
114114

@@ -362,7 +362,7 @@ static void ddstest(char *n, char *channel)
362362
do_ddstest_one(j);
363363
}
364364
}
365-
#endif /* RTIO_DDS_COUNT */
365+
#endif /* CONFIG_RTIO_DDS_COUNT */
366366

367367
#if (defined CSR_SPIFLASH_BASE && defined CONFIG_SPIFLASH_PAGE_SIZE)
368368
static void fsread(char *key)
@@ -662,7 +662,7 @@ static void do_command(char *c)
662662
else if(strcmp(token, "ttloe") == 0) ttloe(get_token(&c), get_token(&c));
663663
else if(strcmp(token, "ttlo") == 0) ttlo(get_token(&c), get_token(&c));
664664

665-
#if ((defined RTIO_DDS_COUNT) && (RTIO_DDS_COUNT > 0))
665+
#if ((defined CONFIG_RTIO_DDS_COUNT) && (CONFIG_RTIO_DDS_COUNT > 0))
666666
else if(strcmp(token, "ddsbus") == 0) ddsbus(get_token(&c));
667667
else if(strcmp(token, "ddssel") == 0) ddssel(get_token(&c));
668668
else if(strcmp(token, "ddsw") == 0) ddsw(get_token(&c), get_token(&c));

0 commit comments

Comments
 (0)
Please sign in to comment.