Skip to content

M
Mock Turtle
Commit f31d074f authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

sw:*: fix stupid declaration in config-rom structure 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent cb1f405f
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
software/include/hw/mockturtle_config.h
View file @ f31d074f
......@@ -45,8 +45,8 @@ struct trtl_config_rom {
uint32_t n_hmq[TRTL_MAX_CPU]; /**< number of HMQ for each CPU */
uint32_t n_rmq[TRTL_MAX_CPU]; /**< number of RMQ for each CPU */
uint32_t pad2[96];
struct trtl_config_rom_mq hmq[TRTL_MAX_CPU * TRTL_MAX_MQ_CHAN];
struct trtl_config_rom_mq rmq[TRTL_MAX_CPU * TRTL_MAX_MQ_CHAN];
struct trtl_config_rom_mq hmq[TRTL_MAX_CPU][TRTL_MAX_MQ_CHAN];
struct trtl_config_rom_mq rmq[TRTL_MAX_CPU][TRTL_MAX_MQ_CHAN];
};
#endif
software/kernel/mockturtle-hmq.c
View file @ f31d074f
......@@ -1094,7 +1094,7 @@ int trtl_probe_hmq(struct trtl_cpu *cpu, unsigned int hmq_idx)
return err;
hmq->cfg = &trtl->cfgrom.hmq[cpu->index * TRTL_MAX_MQ_CHAN + hmq->index];
hmq->cfg = &trtl->cfgrom.hmq[cpu->index][hmq->index];
hmq->base_in = trtl->base_hmq + TRTL_MQ_BASE_IN;
err = trtl_hmq_buf_init(&hmq->buf_in);
......
software/lib/PyMockTurtle/PyMockTurtle/PyMockTurtle.py
View file @ f31d074f
......@@ -51,8 +51,8 @@ class TrtlConfig(Structure):
("n_hmq", c_uint32 * TRTL_CONFIG_ROM_MAX_CPU),
("n_rmq", c_uint32 * TRTL_CONFIG_ROM_MAX_CPU),
("pad2", c_uint32 * 96),
("hmq", TrtlConfigHmq * (TRTL_CONFIG_ROM_MAX_CPU * TRTL_CONFIG_ROM_MAX_HMQ)),
("rmq", TrtlConfigHmq * (TRTL_CONFIG_ROM_MAX_CPU * TRTL_CONFIG_ROM_MAX_HMQ)),
("hmq", TRTL_CONFIG_ROM_MAX_CPU * (TrtlConfigHmq * TRTL_CONFIG_ROM_MAX_HMQ)),
("rmq", TRTL_CONFIG_ROM_MAX_CPU * (TrtlConfigHmq * TRTL_CONFIG_ROM_MAX_HMQ)),
]
class TrtlMessageInternal(Structure):
......
software/tools/lsmockturtle.c
View file @ f31d074f
......@@ -54,7 +54,7 @@ static void trtl_list_device_info(struct trtl_dev *trtl)
fprintf(stdout, "\t mem-size: %d\n", cfg->mem_size[i]);
fprintf(stdout, "\t hmq:\n");
for (k = 0; k < cfg->n_hmq[i]; ++k) {
uint32_t sizes = cfg->hmq[i * TRTL_MAX_MQ_CHAN + k].sizes;
uint32_t sizes = cfg->hmq[i][k].sizes;
fprintf(stdout, "\t\t- index: %d\n", k);
fprintf(stdout, "\t\t width-header: %"PRId32"\n",
......@@ -64,11 +64,11 @@ static void trtl_list_device_info(struct trtl_dev *trtl)
fprintf(stdout, "\t\t depth: %"PRId32"\n",
TRTL_CONFIG_ROM_MQ_SIZE_ENTRIES(sizes));
fprintf(stdout, "\t\t endpoint-id: %"PRId32"\n",
cfg->hmq[i * TRTL_MAX_MQ_CHAN + k].endpoint_id);
cfg->hmq[i][k].endpoint_id);
}
fprintf(stdout, "\t rmq:\n");
for (k = 0; k < cfg->n_rmq[i]; ++k) {
uint32_t sizes = cfg->rmq[i * TRTL_MAX_MQ_CHAN + k].sizes;
uint32_t sizes = cfg->rmq[i][k].sizes;
fprintf(stdout, "\t\t- index: %d\n", k);
fprintf(stdout, "\t\t width-header: %"PRId32"\n",
......@@ -78,7 +78,7 @@ static void trtl_list_device_info(struct trtl_dev *trtl)
fprintf(stdout, "\t\t depth: %"PRId32"\n",
TRTL_CONFIG_ROM_MQ_SIZE_ENTRIES(sizes));
fprintf(stdout, "\t\t endpoint-id: %"PRId32"\n",
cfg->hmq[i * TRTL_MAX_MQ_CHAN + k].endpoint_id);
cfg->hmq[i][k].endpoint_id);
}
}
}
......
tests/firmware/config_rom/config_rom.c
View file @ f31d074f
......@@ -12,7 +12,7 @@ int main()
pr_debug("CONFIG ROM\r\n");
cpu = 0;
size = TRTL_CONFIG_ROM_MQ_SIZE_PAYLOAD(cfgrom->hmq[cpu * TRTL_MAX_CPU].sizes);
size = TRTL_CONFIG_ROM_MQ_SIZE_PAYLOAD(cfgrom->hmq[cpu][0].sizes);
for (i = 0; i < (n_word / size) + 1; ++i) {
mq_claim(TRTL_HMQ, 0);
hdr = mq_map_out_header(TRTL_HMQ, 0);
......
tests/firmware/hmq-async-recv/hmq-async-recv.c
View file @ f31d074f
......@@ -15,7 +15,7 @@ int main()
mq_purge(TRTL_HMQ, hmq);
for (hmq = 0; hmq < cfgrom->n_hmq[cpu]; ++hmq) {
sizes = cfgrom->hmq[cpu * TRTL_MAX_MQ_CHAN + hmq].sizes;
sizes = cfgrom->hmq[cpu][hmq].sizes;
n_word = TRTL_CONFIG_ROM_MQ_SIZE_PAYLOAD(sizes);
depth = TRTL_CONFIG_ROM_MQ_SIZE_ENTRIES(sizes);
for (slot = 0; slot < depth; ++slot) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment