update libavr32, protects spi/etc

monome · Sep 25, 2017 · 350b7b7 · 350b7b7
1 parent c791f70
commit 350b7b7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/libavr32 b/libavr32
diff --git a/module/config.mk b/module/config.mk
@@ -105,6 +105,7 @@ CSRCS = \
 	../libavr32/src/i2c.c					\
 	../libavr32/src/init_teletype.c				\
 	../libavr32/src/init_common.c				\
+	../libavr32/src/interrupts.c				\
 	../libavr32/src/kbd.c					\
 	../libavr32/src/region.c				\
 	../libavr32/src/screen.c				\

diff --git a/module/main.c b/module/main.c
@@ -22,6 +22,7 @@
 #include "i2c.h"
 #include "init_common.h"
 #include "init_teletype.h"
+#include "interrupts.h"
 #include "kbd.h"
 #include "region.h"
 #include "screen.h"
@@ -316,7 +317,7 @@ void handler_MscConnect(int32_t data) {
     assign_msc_event_handlers();
 
     // disable timers
-    timers_pause();
+    u8 flags = irqs_pause();
 
     // clear screen
     for (size_t i = 0; i < 8; i++) {
@@ -330,7 +331,7 @@ void handler_MscConnect(int32_t data) {
     // renable teletype
     set_mode(M_LIVE);
     assign_main_event_handlers();
-    timers_resume();
+    irqs_resume(flags);
 }
 
 void handler_Trigger(int32_t data) {

diff --git a/src/teletype.h b/src/teletype.h
@@ -8,7 +8,7 @@
 #include "command.h"
 #include "state.h"
 
-#define TELETYPE_VERSION "TELETYPE 2.0.0"
+#define TELETYPE_VERSION "TELETYPE 2.0.1"
 #define TELE_ERROR_MSG_LENGTH 16
 
 typedef enum {
+39 −0		README.md
+1 −1		conf/conf_tc_irq.h
+1 −1		conf/teletype/conf_board.h
+1 −1		conf/trilogy/conf_board.h
+4 −0		src/adc.c
+6 −6		src/arp.c
+5 −1		src/dac.c
+12 −14		src/events.c
+4 −0		src/init_ansible.c
+2 −0		src/init_ansible.h
+4 −0		src/init_teletype.c
+2 −0		src/init_teletype.h
+4 −0		src/init_trilogy.c
+2 −0		src/init_trilogy.h
+33 −0		src/interrupts.c
+9 −0		src/interrupts.h
+10 −0		src/screen.c
+14 −33		src/timers.c
+0 −4		src/timers.h