c3gl: Made c3gl_program_load public

[simavr] / simavr / cores / sim_core_declare.h

diff --git a/simavr/cores/sim_core_declare.h b/simavr/cores/sim_core_declare.h
index fcbc145..9c07612 100644 (file)
--- a/simavr/cores/sim_core_declare.h
+++ b/simavr/cores/sim_core_declare.h
@@ -21,10 +21,16 @@
 #ifndef __SIM_CORE_DECLARE_H__
 #define __SIM_CORE_DECLARE_H__
 
+/* we have to declare this, as none of the distro but debian has a modern
+ * toolchain and avr-libc. This affects a lot of names, like MCUSR etc
+ */
+#define __AVR_LIBC_DEPRECATED_ENABLE__
+
 /*
  * The macros "fake" the ones in the real avrlib
  */
 #define _SFR_IO8(v) ((v)+32)
+#define _SFR_IO16(v) ((v)+32)
 #define _SFR_MEM8(v) (v)
 #define _BV(v) (v)
 #define _VECTOR(v) (v)
@@ -33,13 +39,20 @@
  * This declares a typical AVR core, using constants what appears
  * to be in every io*.h file...
  */
+#ifdef SIGNATURE_0
 #define DEFAULT_CORE(_vector_size) \
        .ramend = RAMEND, \
        .flashend = FLASHEND, \
        .e2end = E2END, \
        .vector_size = _vector_size, \
-       .fuse = { LFUSE_DEFAULT, HFUSE_DEFAULT, EFUSE_DEFAULT }
+       .fuse = { LFUSE_DEFAULT, HFUSE_DEFAULT, EFUSE_DEFAULT }, \
+       .signature = { SIGNATURE_0,SIGNATURE_1,SIGNATURE_2 }
+#else
 // Disable signature for now, for ubuntu, gentoo and other using old avr toolchain
-//     .signature = { SIGNATURE_0,SIGNATURE_1,SIGNATURE_2 }, 
-
+#define DEFAULT_CORE(_vector_size) \
+       .ramend = RAMEND, \
+       .flashend = FLASHEND, \
+       .e2end = E2END, \
+       .vector_size = _vector_size
+#endif
 #endif /* __SIM_CORE_DECLARE_H__ */