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

Fix regnual for new Chopstx

Browse Source
This commit is contained in:
NIIBE Yutaka
2016-06-02 11:03:59 +09:00
parent f882acc1b4
commit fd08a853fd
5 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -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> 2016-06-01 Niibe Yutaka <gniibe@fsij.org>
* tool/stlinkv2.py (stlinkv2.__init__): Don't * tool/stlinkv2.py (stlinkv2.__init__): Don't

2
chopstx

Submodule chopstx updated: c79a41870a...78718e57df

12
regnual/Makefile
View File

@@ -2,7 +2,7 @@
PROJECT = regnual PROJECT = regnual
OBJS = regnual.o usb_stm32f103.o sys.o OBJS = regnual.o usb-stm32f103.o reset.o
LDSCRIPT= regnual.ld LDSCRIPT= regnual.ld
################################### ###################################
@@ -23,7 +23,7 @@ DEFS = -DFREE_STANDING
CFLAGS = -O2 -g CFLAGS = -O2 -g
CFLAGS += -Wa,-alms=$(notdir $(<:.c=.lst)) -fpie 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) LDFLAGS = -T$(LDSCRIPT) -nostartfiles $(MCFLAGS) $(TOPT)
@@ -32,19 +32,19 @@ LDFLAGS = -T$(LDSCRIPT) -nostartfiles $(MCFLAGS) $(TOPT)
all: regnual.hex 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 regnual.hex: regnual.elf
$(OBJCOPY) -Obinary regnual.elf regnual.bin $(OBJCOPY) -Obinary regnual.elf regnual.bin
$(OBJCOPY) -Oihex regnual.elf regnual.hex $(OBJCOPY) -Oihex regnual.elf regnual.hex
usb_stm32f103.o: ../src/usb_stm32f103.c usb-stm32f103.o: ../chopstx/mcu/usb-stm32f103.c
$(CC) $(CFLAGS) -c -o usb_stm32f103.o ../src/usb_stm32f103.c $(CC) $(CFLAGS) -c -o usb-stm32f103.o ../chopstx/mcu/usb-stm32f103.c
regnual.elf: $(OBJS) $(LDSCRIPT) regnual.elf: $(OBJS) $(LDSCRIPT)
$(CC) $(LDFLAGS) -o regnual.elf $(OBJS) $(CC) $(LDFLAGS) -o regnual.elf $(OBJS)
clean: clean:
-rm -f $(OBJS) regnual.elf regnual.hex regnual.bin -rm -f $(OBJS) regnual.elf regnual.hex regnual.bin *.lst
distclean: clean distclean: clean

3
regnual/regnual.c
View File

@@ -318,9 +318,10 @@ void usb_cb_rx_ready (uint8_t ep_num)
(void)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)ep_num;
(void)len;
} }
static void wait (int count) static void wait (int count)

0
regnual/sys.c → regnual/reset.c
View File