From 350b7b7f2bc2529359c8ec5c65cf9a1a08b3bb91 Mon Sep 17 00:00:00 2001
From: brian crabtree <tehn@monome.org>
Date: Mon, 25 Sep 2017 18:22:11 -0400
Subject: [PATCH] update libavr32, protects spi/etc

---
 libavr32         | 2 +-
 module/config.mk | 1 +
 module/main.c    | 5 +++--
 src/teletype.h   | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/libavr32 b/libavr32
index 85fdd92d..c30e406a 160000
--- a/libavr32
+++ b/libavr32
@@ -1 +1 @@
-Subproject commit 85fdd92df761dd95e34c89b2644267c927d180ab
+Subproject commit c30e406ae5e1c1fb1f7752e8b91326d41c788393
diff --git a/module/config.mk b/module/config.mk
index 7cae0d93..6ec5bd34 100644
--- 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
index 77fb26ce..bccb895c 100644
--- 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
index 76f7c169..b9263953 100644
--- 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 {