From 1fa45e32735b410e6373398a707573316f36e691 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Mon, 16 May 2016 22:43:51 +0900 Subject: [PATCH] Fix reGNUal --- ChangeLog | 5 ++++- regnual/regnual.c | 17 ++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 61a2203..489ea21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2016-05-16 Niibe Yutaka + * regnual/regnual.c (usb_cb_rx_ready, usb_cb_tx_done) + (usb_cb_device_reset): Follow the change of USB API. + * chopstx: Update. * src/sys.c: Update from Chopstx. @@ -16,7 +19,7 @@ * src/usb_stm32f103.c: Likewise. * src/usb_ctrl.c (usb_intr): Follow the change of USB API. - * src/main.c (usb_cb_rx_ready, usb_cb_tx_done): Likewise. + (usb_cb_rx_ready, usb_cb_tx_done): Likewise. * src/adc.h: Remove unused declarations. diff --git a/regnual/regnual.c b/regnual/regnual.c index 51e0283..65d8696 100644 --- a/regnual/regnual.c +++ b/regnual/regnual.c @@ -110,13 +110,7 @@ static const uint8_t regnual_string_serial[] = { void usb_cb_device_reset (void) { - /* Set DEVICE as not configured */ - usb_lld_set_configuration (0); - - /* Current Feature initialization */ - usb_lld_set_feature (regnual_config_desc[7]); - - usb_lld_reset (); + usb_lld_reset (regnual_config_desc[7]); /* Initialize Endpoint 0 */ usb_lld_setup_endpoint (ENDP0, EP_CONTROL, 0, ENDP0_RXADDR, ENDP0_TXADDR, @@ -317,6 +311,15 @@ int usb_cb_interface (uint8_t cmd, struct req_args *detail) return USB_UNSUPPORT; } +void usb_cb_rx_ready (uint8_t ep_num) +{ + (void)ep_num; +} + +void usb_cb_tx_done (uint8_t ep_num) +{ + (void)ep_num; +} static void wait (int count) {