From 6765511f32792eff65c1c82b33bb3a41162e2f50 Mon Sep 17 00:00:00 2001 From: Michel Pollet Date: Fri, 2 Mar 2012 14:33:03 +0000 Subject: [PATCH] simavr: Now use the generated config files Removed the statis tables, use the generated config Also updated .gitignore Signed-off-by: Michel Pollet --- simavr/.gitignore | 2 ++ simavr/sim/run_avr.c | 2 +- simavr/sim/sim_avr.c | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 simavr/.gitignore diff --git a/simavr/.gitignore b/simavr/.gitignore new file mode 100644 index 0000000..aba978b --- /dev/null +++ b/simavr/.gitignore @@ -0,0 +1,2 @@ +sim_core_decl.h +sim_core_config.h diff --git a/simavr/sim/run_avr.c b/simavr/sim/run_avr.c index 0c1fddd..c0ade48 100644 --- a/simavr/sim/run_avr.c +++ b/simavr/sim/run_avr.c @@ -30,7 +30,7 @@ #include "sim_gdb.h" #include "sim_hex.h" -extern avr_kind_t * avr_kind[]; +#include "sim_core_decl.h" void display_usage(char * app) { diff --git a/simavr/sim/sim_avr.c b/simavr/sim/sim_avr.c index 1ecc208..5ebd540 100644 --- a/simavr/sim/sim_avr.c +++ b/simavr/sim/sim_avr.c @@ -31,6 +31,8 @@ #include "sim_vcd_file.h" #include "avr_mcu_section.h" +#define AVR_KIND_DECL +#include "sim_core_decl.h" int avr_init(avr_t * avr) { @@ -291,7 +293,7 @@ int avr_run(avr_t * avr) return avr->state; } - +#if 0 extern avr_kind_t tiny13; extern avr_kind_t tiny2313; extern avr_kind_t tiny25,tiny45,tiny85; @@ -318,6 +320,7 @@ avr_kind_t * avr_kind[] = { &usb162, NULL }; +#endif avr_t * avr_make_mcu_by_name(const char *name) { -- 2.39.5