summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@ka-ata-killa.ourano.james.local>2021-03-21 11:50:38 +0000
committerroot <root@ka-ata-killa.ourano.james.local>2021-03-21 11:50:38 +0000
commit86d61b9e775d615f210b79e4f69dbc3d62c885ea (patch)
tree7eda037f47671358f3b331f3ae53e1b6cba78f12
parent101b4fbc19a6813ee212afdafc46b652b430c2ba (diff)
downloadclock-86d61b9e775d615f210b79e4f69dbc3d62c885ea.tar.gz
clock-86d61b9e775d615f210b79e4f69dbc3d62c885ea.tar.bz2
clock-86d61b9e775d615f210b79e4f69dbc3d62c885ea.zip
tidy
-rw-r--r--boot/prototypes.h2
-rwxr-xr-xship4
2 files changed, 5 insertions, 1 deletions
diff --git a/boot/prototypes.h b/boot/prototypes.h
index 40ae6c5..84473b1 100644
--- a/boot/prototypes.h
+++ b/boot/prototypes.h
@@ -10,7 +10,7 @@ extern void usb(void);
/* dfu.c */
extern const struct usb_dfu_descriptor dfu_function;
extern const struct usb_interface_descriptor dfu_iface;
-extern enum usbd_request_return_codes usbdfu_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req));
+extern enum usbd_request_return_codes usbdfu_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len, usbd_control_complete_callback *complete);
/* delay.c */
extern void sys_tick_handler(void);
extern void ticker_on(void);
diff --git a/ship b/ship
index 9f79674..69cddf9 100755
--- a/ship
+++ b/ship
@@ -1,6 +1,10 @@
#!/bin/sh
D=$(date +%Y-%m-%d)
+make -C boot protos
+make -C boot clean
+make -C app protos
+make -C app clean
make -C boot bootloader.bin bootloader.hex bootloader.elf