Use chopstx_main_init.

ChangeLog

@@ -1,5 +1,11 @@
 2015-04-18  Niibe Yutaka  <gniibe@fsij.org>
 
+	* chopstx: Upgrade.
+	* src/main.c (main): Call chopstx_main_init.
+	* src/Makefile.in (DEFS): Remove CHX_PRIO_MAIN.
+
+2015-04-17  Niibe Yutaka  <gniibe@fsij.org>
+
 	* src/configure: Fix shell syntax.
 
 2015-03-31  Niibe Yutaka  <gniibe@fsij.org>

src/Makefile.in

@@ -55,7 +55,7 @@ OBJCOPY   = $(CROSS)objcopy
 MCU   = cortex-m3
 CWARN = -Wall -Wextra -Wstrict-prototypes
 # DEFS: Add  
-DEFS  = -DCHX_PRIO_MAIN=5 @KEYGEN_SUPPORT@ @HAVE_SYS_H@
+DEFS  = @KEYGEN_SUPPORT@ @HAVE_SYS_H@
 OPT   = -O3 -Os -g
 LIBS  =
 

src/main.c

@@ -1,7 +1,8 @@
 /*
  * main.c - main routine of Gnuk
  *
- * Copyright (C) 2010, 2011, 2012, 2013 Free Software Initiative of Japan
+ * Copyright (C) 2010, 2011, 2012, 2013, 2015
+ *               Free Software Initiative of Japan
  * Author: NIIBE Yutaka <gniibe@fsij.org>
  *
  * This file is a part of Gnuk, a GnuPG USB Token implementation.
@@ -290,6 +291,7 @@ const size_t __stacksize_usb = (size_t)&__process4_stack_size__;
 
 #define PRIO_CCID 3
 #define PRIO_USB  4
+#define PRIO_MAIN 5 
 
 extern void *usb_intr (void *arg);
 
@@ -343,6 +345,8 @@ main (int argc, char *argv[])
   usb_thd = chopstx_create (PRIO_USB, __stackaddr_usb, __stacksize_usb,
 			    usb_intr, NULL);
 
+  chopstx_main_init (PRIO_MAIN);
+
   while (1)
     {
       if (bDeviceState != UNCONNECTED)