runtime: fix dds declarations

sbourdeauducq · sbourdeauducq · commit de37487a5c8f · 2016-03-09T18:27:51.000+08:00
diff --git a/artiq/runtime/dds.c b/artiq/runtime/dds.c
@@ -85,7 +85,7 @@ void dds_init(long long int timestamp, int bus_channel, int channel)
 static unsigned int continuous_phase_comp[CONFIG_DDS_CHANNEL_COUNT];
 
 static void dds_set_one(long long int now, long long int ref_time,
-    unsigned int bus_channel, unsigned int channel,
+    int bus_channel, int channel,
     unsigned int ftw, unsigned int pow, int phase_mode, unsigned int amplitude)
 {
     unsigned int channel_enc;
diff --git a/artiq/runtime/dds.h b/artiq/runtime/dds.h
@@ -54,10 +54,10 @@ enum {
     PHASE_MODE_TRACKING = 2
 };
 
-void dds_init(long long int timestamp, int channel);
+void dds_init(long long int timestamp, int bus_channel, int channel);
 void dds_batch_enter(long long int timestamp);
 void dds_batch_exit(void);
-void dds_set(long long int timestamp, 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);
 
 #endif /* __DDS_H */

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ void dds_init(long long int timestamp, int bus_channel, int channel)`
`85`	`85`	`static unsigned int continuous_phase_comp[CONFIG_DDS_CHANNEL_COUNT];`
`86`	`86`
`87`	`87`	`static void dds_set_one(long long int now, long long int ref_time,`
`88`		`- unsigned int bus_channel, unsigned int channel,`
	`88`	`+ int bus_channel, int channel,`
`89`	`89`	`unsigned int ftw, unsigned int pow, int phase_mode, unsigned int amplitude)`
`90`	`90`	`{`
`91`	`91`	`unsigned int channel_enc;`