From 72647f01d0e2417e4bacf562409103f30fb82267 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Thu, 27 Sep 2018 10:46:18 +0900
Subject: [PATCH] Remove ack-button.c to use the driver in Chopstx.

---
 chopstx          |  2 +-
 src/Makefile     |  1 -
 src/ack-button.c | 35 -----------------------------------
 src/gnuk.h       |  5 -----
 4 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 src/ack-button.c

diff --git a/chopstx b/chopstx
index 43bbdb4..49b0556 160000
--- a/chopstx
+++ b/chopstx
@@ -1 +1 @@
-Subproject commit 43bbdb44dcb076929d5ebb1f33ca2e7d8301ac2f
+Subproject commit 49b0556a24a9133ee55b06011fd288e264aefc72
diff --git a/src/Makefile b/src/Makefile
index f46738f..b864e60 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -51,7 +51,6 @@ endif
 
 ifeq ($(CHIP),stm32f103)
 CSRC += mcu-stm32f103.c 
-CSRC += ack-button.c
 endif
 
 ###################################
diff --git a/src/ack-button.c b/src/ack-button.c
deleted file mode 100644
index 6de8b7b..0000000
--- a/src/ack-button.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <stdint.h>
-#include <string.h>
-#include <chopstx.h>
-
-#include "board.h"
-#include "mcu/stm32f103.h"
-
-void
-ackbtn_init (chopstx_intr_t *intr)
-{
-  chopstx_claim_irq (intr, INTR_REQ_EXTI);
-
-  /* Configure EXTI line */
-#ifdef AFIO_EXTICR_INDEX
-  AFIO->EXTICR[AFIO_EXTICR_INDEX] = AFIO_EXTICR1_EXTIx_Py;
-#endif
-  EXTI->IMR &= ~EXTI_IMR;
-  EXTI->RTSR |= EXTI_RTSR_TR;
-}
-
-void
-ackbtn_enable (void)
-{
-  EXTI->PR |= EXTI_PR;
-  EXTI->IMR |= EXTI_IMR;
-}
-
-void
-ackbtn_disable (void)
-{
-  EXTI->IMR &= ~EXTI_IMR;
-  EXTI->PR |= EXTI_PR;
-}
-
-
diff --git a/src/gnuk.h b/src/gnuk.h
index bca8af8..8053cbe 100644
--- a/src/gnuk.h
+++ b/src/gnuk.h
@@ -472,11 +472,6 @@ int pinpad_getline (int msg_code, uint32_t timeout_usec);
 
 #endif
 
-struct chx_intr;
-void ackbtn_init (struct chx_intr *intr);
-void ackbtn_enable (void);
-void ackbtn_disable (void);
-
 
 extern uint8_t _regnual_start, __heap_end__[];