From fd08a853fd42e989c1cf1114cd41ab549fb10d25 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Thu, 2 Jun 2016 11:03:59 +0900
Subject: [PATCH] Fix regnual for new Chopstx

---
 ChangeLog                  |  7 +++++++
 chopstx                    |  2 +-
 regnual/Makefile           | 12 ++++++------
 regnual/regnual.c          |  3 ++-
 regnual/{sys.c => reset.c} |  0
 5 files changed, 16 insertions(+), 8 deletions(-)
 rename regnual/{sys.c => reset.c} (100%)

diff --git a/ChangeLog b/ChangeLog
index 520f81d..0fe540f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-06-02  Niibe Yutaka  <gniibe@fsij.org>
+
+	* regnual/regnual.c (usb_cb_tx_done): Follow the change of USB
+	API.
+
+	* regnual/reset.c: Rename from sys.c.
+
 2016-06-01  Niibe Yutaka  <gniibe@fsij.org>
 
 	* tool/stlinkv2.py (stlinkv2.__init__): Don't
diff --git a/chopstx b/chopstx
index c79a418..78718e5 160000
--- a/chopstx
+++ b/chopstx
@@ -1 +1 @@
-Subproject commit c79a41870a9d473947adb1d2fbc6687b59b9c31b
+Subproject commit 78718e57df6f55c0670cdb6b70337204dd045dba
diff --git a/regnual/Makefile b/regnual/Makefile
index 9fb59c8..48447d5 100644
--- a/regnual/Makefile
+++ b/regnual/Makefile
@@ -2,7 +2,7 @@
 
 PROJECT = regnual
 
-OBJS = regnual.o usb_stm32f103.o sys.o
+OBJS = regnual.o usb-stm32f103.o reset.o
 LDSCRIPT= regnual.ld
 
 ###################################
@@ -23,7 +23,7 @@ DEFS = -DFREE_STANDING
 
 CFLAGS = -O2 -g
 CFLAGS += -Wa,-alms=$(notdir $(<:.c=.lst)) -fpie
-CFLAGS += $(CWARN) -I . -I ../src -fno-common $(MCFLAGS) $(TOPT) $(DEFS)
+CFLAGS += $(CWARN) -I . -I ../chopstx -fno-common $(MCFLAGS) $(TOPT) $(DEFS)
 
 LDFLAGS = -T$(LDSCRIPT) -nostartfiles $(MCFLAGS) $(TOPT)
 
@@ -32,19 +32,19 @@ LDFLAGS = -T$(LDSCRIPT) -nostartfiles $(MCFLAGS) $(TOPT)
 
 all: regnual.hex
 
-regnual.o: regnual.c ../src/sys.h ../src/usb_lld.h
+regnual.o: regnual.c ../chopstx/sys.h ../chopstx/usb_lld.h
 
 regnual.hex: regnual.elf
 	$(OBJCOPY) -Obinary regnual.elf regnual.bin
 	$(OBJCOPY) -Oihex regnual.elf regnual.hex
 
-usb_stm32f103.o: ../src/usb_stm32f103.c
-	$(CC) $(CFLAGS) -c -o usb_stm32f103.o ../src/usb_stm32f103.c
+usb-stm32f103.o: ../chopstx/mcu/usb-stm32f103.c
+	$(CC) $(CFLAGS) -c -o usb-stm32f103.o ../chopstx/mcu/usb-stm32f103.c
 
 regnual.elf: $(OBJS) $(LDSCRIPT)
 	$(CC) $(LDFLAGS) -o regnual.elf $(OBJS)
 
 clean:
-	-rm -f $(OBJS) regnual.elf regnual.hex regnual.bin
+	-rm -f $(OBJS) regnual.elf regnual.hex regnual.bin *.lst
 
 distclean: clean
diff --git a/regnual/regnual.c b/regnual/regnual.c
index 85db14c..01cea34 100644
--- a/regnual/regnual.c
+++ b/regnual/regnual.c
@@ -318,9 +318,10 @@ void usb_cb_rx_ready (uint8_t ep_num)
   (void)ep_num;
 }
 
-void usb_cb_tx_done (uint8_t ep_num)
+void usb_cb_tx_done (uint8_t ep_num, uint32_t len)
 {
   (void)ep_num;
+  (void)len;
 }
 
 static void wait (int count)
diff --git a/regnual/sys.c b/regnual/reset.c
similarity index 100%
rename from regnual/sys.c
rename to regnual/reset.c