deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support GD32F103.

Browse Source
This commit is contained in:
NIIBE Yutaka
2018-04-26 17:33:48 +09:00
parent 24adc09406
commit 93a2bac94b
4 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2018-04-26 NIIBE Yutaka <gniibe@fsij.org>
* src/usb-ccid.c (usb_event_handle): Ignore sprious "done".
* src/configure (MHZ, def_mhz): New.
2018-04-05 NIIBE Yutaka <gniibe@fsij.org> 2018-04-05 NIIBE Yutaka <gniibe@fsij.org>
* VERSION: 1.2.9. * VERSION: 1.2.9.

2
chopstx

Submodule chopstx updated: aa63ac79bc...32d0b8200d

9
src/configure vendored
View File

@@ -167,6 +167,8 @@ BOARD_HEADER_FILE=board-$(echo $target | tr '_[:upper:]' '-[:lower:]').h
echo "Header file is: $BOARD_HEADER_FILE" echo "Header file is: $BOARD_HEADER_FILE"
ln -sf "../chopstx/board/$BOARD_HEADER_FILE" board.h ln -sf "../chopstx/board/$BOARD_HEADER_FILE" board.h
# Frequency
MHZ=72
# Flash page size in byte # Flash page size in byte
FLASH_PAGE_SIZE=1024 FLASH_PAGE_SIZE=1024
# Flash memory size in KiB # Flash memory size in KiB
@@ -196,6 +198,9 @@ STBEE)
if test "$with_dfu" = "default"; then if test "$with_dfu" = "default"; then
with_dfu=yes; with_dfu=yes;
fi ;; fi ;;
BLUE_PILL_G)
MHZ=96
;;
*) *)
;; ;;
esac esac
@@ -208,6 +213,7 @@ if test "$target" = "GNU_LINUX"; then
mcu="none" mcu="none"
def_emulation="-DGNU_LINUX_EMULATION" def_emulation="-DGNU_LINUX_EMULATION"
def_memory_size="-DMEMORY_SIZE=1024" def_memory_size="-DMEMORY_SIZE=1024"
def_mhz=""
enable_hexoutput="" enable_hexoutput=""
libs="-lpthread" libs="-lpthread"
else else
@@ -218,6 +224,7 @@ else
mcu="cortex-m3" mcu="cortex-m3"
def_emulation="" def_emulation=""
def_memory_size="-DMEMORY_SIZE=$MEMORY_SIZE" def_memory_size="-DMEMORY_SIZE=$MEMORY_SIZE"
def_mhz="-DMHZ=$MHZ"
enable_hexoutput=yes enable_hexoutput=yes
libs="" libs=""
fi fi
@@ -442,7 +449,7 @@ fi
echo "EMULATION=$emulation"; echo "EMULATION=$emulation";
echo "CROSS=$cross"; echo "CROSS=$cross";
echo "MCU=$mcu"; echo "MCU=$mcu";
echo "DEFS=$use_sys3 $flash_override $def_emulation $def_memory_size"; echo "DEFS=$use_sys3 $flash_override $def_emulation $def_memory_size $def_mhz";
echo "LDSCRIPT=$ldscript"; echo "LDSCRIPT=$ldscript";
echo "LIBS=$libs"; echo "LIBS=$libs";
echo "$DEBUG_MAKE_OPTION"; echo "$DEBUG_MAKE_OPTION";

4
src/usb-ccid.c
View File

@@ -1579,6 +1579,10 @@ usb_event_handle (struct usb_dev *dev)
/* Transfer to endpoint (not control endpoint) */ /* Transfer to endpoint (not control endpoint) */
if (ep_num != 0) if (ep_num != 0)
{ {
/* Ignore sprious "Correct Transfer" */
if (bDeviceState != USB_DEVICE_STATE_CONFIGURED)
return 0;
if (USB_EVENT_TXRX (e)) if (USB_EVENT_TXRX (e))
usb_tx_done (ep_num, USB_EVENT_LEN (e)); usb_tx_done (ep_num, USB_EVENT_LEN (e));
else else