mirror of https://github.com/m-labs/artiq.git
runtime: remove confusing variable shadowing.
This commit is contained in:
parent
4e241f10c5
commit
8e2c664e8b
|
@ -368,9 +368,9 @@ int main(void)
|
||||||
|
|
||||||
mailbox_send_and_wait(&load_reply);
|
mailbox_send_and_wait(&load_reply);
|
||||||
|
|
||||||
now = now_init();
|
now_init();
|
||||||
kernel_run();
|
kernel_run();
|
||||||
now_save(now);
|
now_save();
|
||||||
|
|
||||||
attribute_writeback(typeinfo);
|
attribute_writeback(typeinfo);
|
||||||
|
|
||||||
|
@ -404,11 +404,10 @@ void ksupport_abort() {
|
||||||
0, 0, 0);
|
0, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
long long int now_init(void)
|
void now_init(void)
|
||||||
{
|
{
|
||||||
struct msg_base request;
|
struct msg_base request;
|
||||||
struct msg_now_init_reply *reply;
|
struct msg_now_init_reply *reply;
|
||||||
long long int now;
|
|
||||||
|
|
||||||
request.type = MESSAGE_TYPE_NOW_INIT_REQUEST;
|
request.type = MESSAGE_TYPE_NOW_INIT_REQUEST;
|
||||||
mailbox_send_and_wait(&request);
|
mailbox_send_and_wait(&request);
|
||||||
|
@ -426,11 +425,9 @@ long long int now_init(void)
|
||||||
rtio_init();
|
rtio_init();
|
||||||
now = rtio_get_counter() + (272000 << CONFIG_RTIO_FINE_TS_WIDTH);
|
now = rtio_get_counter() + (272000 << CONFIG_RTIO_FINE_TS_WIDTH);
|
||||||
}
|
}
|
||||||
|
|
||||||
return now;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void now_save(long long int now)
|
void now_save(void)
|
||||||
{
|
{
|
||||||
struct msg_now_save request;
|
struct msg_now_save request;
|
||||||
|
|
||||||
|
|
|
@ -6,8 +6,8 @@ struct artiq_list {
|
||||||
int32_t *elements;
|
int32_t *elements;
|
||||||
};
|
};
|
||||||
|
|
||||||
long long int now_init(void);
|
void now_init(void);
|
||||||
void now_save(long long int now);
|
void now_save(void);
|
||||||
int watchdog_set(int ms);
|
int watchdog_set(int ms);
|
||||||
void watchdog_clear(int id);
|
void watchdog_clear(int id);
|
||||||
void send_rpc(int service, const char *tag, ...);
|
void send_rpc(int service, const char *tag, ...);
|
||||||
|
|
Loading…
Reference in New Issue