mirror of
https://salsa.debian.org/gnuk-team/gnuk/gnuk.git
synced 2024-09-19 18:30:15 +00:00
Fix regnual for new Chopstx
This commit is contained in:
parent
f882acc1b4
commit
fd08a853fd
@ -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
|
||||
|
2
chopstx
2
chopstx
@ -1 +1 @@
|
||||
Subproject commit c79a41870a9d473947adb1d2fbc6687b59b9c31b
|
||||
Subproject commit 78718e57df6f55c0670cdb6b70337204dd045dba
|
@ -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
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user