Version 1.12.

AUTHORS

@@ -27,19 +27,30 @@ Mateusz Zalega:
 
 NIIBE Yutaka:
     Wrote the library:
-	chopstx.c, entry.c, eventflag.c,
-	chopstx.h, eventflag.h
+	chopstx.c, chopstx.h,
+	chopstx-cortex-m.c, chopstx-cortex-m.h,
+	chopstx-gnu-linux.c, chopstx-gnu-linux.h,
+	entry.c,
+	eventflag.c, eventflag.h
     Wrote the drivers mcu/*:
+	chx-gnu-linux.c, chx-mkl27z.c, chx-stm32f0.c, chx-stm32f103.c,
     	clk_gpio_init-mkl27z.c, clk_gpio_init-stm32.c,
-	sys-stm32f103.c, sys-stm32f030.c, sys-mkl27z.c,
-	adc-stm32f103.c, adc-mkl27z.c
+	cortex-m.h, mkl27z.h, stm32.h, stm32f103.h,
+	sys-gnu-linux.c,sys-gnu-linux.h,
+	sys-mkl27z.c, sys-mkl27z.h,
+	sys-stm32f0.c, sys-stm32f0.h
+	sys-stm32f103.c, sys-stm32f103.h,
+	usb-stm32f103.c, usb-mkl27z.c
+    Wrote the drivers:
+	controb/adc-mkl27z.c
     Drew the logo:
 	chopstx.svg, chopstx.png
     Wrote examples:
 	example-led, example-cdc, example-fsm-55, example-fs-bb48,
-	example-usb-serial
+	example-usb-serial, example-cdc-gnu-linux
     Wrote board/*:
-	board-fst-01.h, board-fst-01-00.h,
+        board-fst-01sz.h,
+	board-fst-01g.h, board-fst-01.h, board-fst-01-00.h,
 	board-olimex-stm32-h103.h, board-stm8s-discovery.h
 	board-cq-starm.h, board-stbee-mini.h, board-stbee.h,
 
@@ -47,9 +58,14 @@ NIIBE Yutaka:
 
 	board-fs-bb48.h
 
+    For Free Software Initiative of Japan, wrote:
+	contrib/adc-stm32f103.c,
+	contrib/adc-gnu-linux.c
+
     Under contract of g10 Code GmbH, wrote:
 	mcu/usb-usbip.c
 	contrib/usart-stm32f103.c
+	contrib/ackbtn-stm32f103.c
 
 Paul Fertser:
     Added Blue Pill support.

ChangeLog

@@ -1,3 +1,16 @@
+2018-11-12  NIIBE Yutaka  <gniibe@fsij.org>
+
+	* VERSION: 1.12.
+	* doc/chopstx.texi (VERSION): 1.12.
+
+	* contrib/ackbtn-stm32f103.c (ackbtn_init): Support FST-01 and
+	FST-01G, using PA2.
+	(ackbtn_disable): Fix to correctly clear pending interrupt.
+
+2018-11-09  NIIBE Yutaka  <gniibe@fsij.org>
+
+	* eventflag.c (eventflag_set_mask): New.
+
 2018-10-02  NIIBE Yutaka  <gniibe@fsij.org>
 
 	* VERSION: 1.11.

NEWS

@@ -1,6 +1,21 @@
 NEWS - Noteworthy changes
 
 
+* Major changes in Chopstx 1.12
+
+  Released 2018-11-12
+
+** Enhance API of eventflag
+New function eventflag_set_mask is added, so that we can only handle
+specified events.  See Gnuk 1.2.12 for an example (while USB Tx is
+busy, the USB thread only accepts EV_TX_FINISHED event, leaving
+other events).
+
+** Acknowledge button support for FST-01 and FST-01G
+While FST-01 and FST-01G don't have any button in the original design,
+it may be PA2 when user put a hall sensor or a switch.
+
+
 * Major changes in Chopstx 1.11
 
   Released 2018-10-02
@@ -17,7 +32,7 @@ Now, the edge detector is disabled by ackbtn_disable, and it is
 enabled by ackbtn_enable.  So, the status is cleared correctly.
 
 ** New board support: FST-01SZ
-It's still under development.  Programming-wise, it will keep same.
+It's still under development.  Programming-wise, it will be kept same.
 
 
 * Major changes in Chopstx 1.10

README

@@ -1,6 +1,6 @@
 Chopstx - Threads and only Threads
-							Version 1.11
-							  2018-10-02
+							Version 1.12
+							  2018-11-12
 							Niibe Yutaka
 					     Flying Stone Technology
 

VERSION

@@ -1 +1 @@
-release/1.11
+release/1.12

contrib/ackbtn-stm32f103.c

@@ -34,6 +34,14 @@
 #include "board.h"
 #include "sys.h"
 
+/*
+ * All EXTI registers (EXTI_IMR, EXTI_EMR, EXTI_PR , EXTI_RTSR, and
+ * EXTI_FTSR) have same structure, where each bit of X is used for
+ * line X, from 0 up to 19.
+ *
+ * We use 31-bit of PIN_CONFIG to represent if it's for rising edge or
+ * falling edge.
+ */
 static uint32_t pin_config;
 #define PINCFG_EDGE        0x80000000
 #define PINCFG_EDGE_RISING PINCFG_EDGE
@@ -47,6 +55,16 @@ ackbtn_init (chopstx_intr_t *intr)
 
   switch (SYS_BOARD_ID)
     {
+    case BOARD_ID_FST_01:
+    case BOARD_ID_FST_01G:
+      /* PA2 can be connected to a hall sensor or a switch */
+      afio_exticr_index = 0;
+      afio_exticr_extiX_pY = AFIO_EXTICR1_EXTI2_PA;
+      irq_num = EXTI2_IRQ;
+      pin_config = 0x0004; /* EXTI_PR_PR2 == EXTI_IMR_MR2 == EXTI_RTSR_TR2 */
+      pin_config |= PINCFG_EDGE_RISING;
+      break;
+
     case BOARD_ID_FST_01SZ:
     default:
       /* PA3 is connected to a hall sensor DRV5032FA */
@@ -88,7 +106,8 @@ ackbtn_disable (void)
 {
   /* Disable interrupt having the mask */
   EXTI->IMR &= ~(pin_config & ~PINCFG_EDGE);
- /* Clear pending interrupt */
+  /* Clear pending interrupt */
+  EXTI->PR |= (pin_config & ~PINCFG_EDGE);
 
   /* Disable edge detection */
   EXTI->RTSR &= ~(pin_config & ~PINCFG_EDGE);

doc/chopstx.texi

@@ -1,7 +1,7 @@
 \input texinfo                      @c -*-texinfo-*-
 @c %**start of header
 @setfilename chopstx.info
-@set VERSION 1.11
+@set VERSION 1.12
 @settitle Chopstx Reference Manual
 @c Unify some of the indices.
 @syncodeindex tp fn

eventflag.c

@@ -1,7 +1,7 @@
 /*
  * eventflag.c - Eventflag
  *
- * Copyright (C) 2013, 2016  Flying Stone Technology
+ * Copyright (C) 2013, 2016, 2018  Flying Stone Technology
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Chopstx, a thread library for embedded.
@@ -36,17 +36,29 @@ void
 eventflag_init (struct eventflag *ev)
 {
   ev->flags = 0;
+  ev->mask = ~0;
   chopstx_cond_init (&ev->cond);
   chopstx_mutex_init (&ev->mutex);
 }
 
 
+void
+eventflag_set_mask (struct eventflag *ev, eventmask_t m)
+{
+  chopstx_mutex_lock (&ev->mutex);
+  ev->mask = m;
+  if ((ev->flags & ev->mask))
+    chopstx_cond_signal (&ev->cond);
+  chopstx_mutex_unlock (&ev->mutex);
+}
+
+
 static int
 eventflag_check (void *arg)
 {
   struct eventflag *ev = arg;
 
-  return ev->flags != 0;
+  return (ev->flags & ev->mask) != 0;
 }
 
 
@@ -69,7 +81,7 @@ eventflag_get (struct eventflag *ev)
   eventmask_t m;
 
   chopstx_mutex_lock (&ev->mutex);
-  n = __builtin_ffs (ev->flags);
+  n = __builtin_ffs ((ev->flags & ev->mask));
   if (n)
     {
       m = (1 << (n - 1));
@@ -90,10 +102,10 @@ eventflag_wait (struct eventflag *ev)
   eventmask_t m;
 
   chopstx_mutex_lock (&ev->mutex);
-  if (!ev->flags)
+  while (!(ev->flags & ev->mask))
     chopstx_cond_wait (&ev->cond, &ev->mutex);
 
-  n = __builtin_ffs (ev->flags);
+  n = __builtin_ffs ((ev->flags & ev->mask));
   if (n) /* Always n > 0 when waked up, but make sure no bad things.  */
     {
       m = (1 << (n - 1));
@@ -124,6 +136,7 @@ eventflag_signal (struct eventflag *ev, eventmask_t m)
 {
   chopstx_mutex_lock (&ev->mutex);
   ev->flags |= m;
-  chopstx_cond_signal (&ev->cond);
+  if ((ev->flags & ev->mask))
+    chopstx_cond_signal (&ev->cond);
   chopstx_mutex_unlock (&ev->mutex);
 }

eventflag.h

@@ -2,11 +2,13 @@ typedef uint32_t eventmask_t;
 
 struct eventflag {
   eventmask_t flags;
+  eventmask_t mask;
   chopstx_mutex_t mutex;
   chopstx_cond_t cond;
 };
 
 void eventflag_init (struct eventflag *ev);
+void eventflag_set_mask (struct eventflag *ev, eventmask_t m);
 eventmask_t eventflag_wait (struct eventflag *ev);
 eventmask_t eventflag_wait_timeout (struct eventflag *ev, uint32_t usec);
 void eventflag_signal (struct eventflag *ev, eventmask_t m);