From 4d7e97028eb967df21c0015ca5f4f4bf9c9a58cd Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Thu, 9 Jun 2016 09:53:15 +0900
Subject: More update of USB API
---
mcu/usb-mkl27z.c | 44 +++++++++++++++++++-------------------------
mcu/usb-stm32f103.c | 44 +++++++++++++++++++-------------------------
2 files changed, 38 insertions(+), 50 deletions(-)
(limited to 'mcu')
diff --git a/mcu/usb-mkl27z.c b/mcu/usb-mkl27z.c
index 2974a32..0b9b049 100644
--- a/mcu/usb-mkl27z.c
+++ b/mcu/usb-mkl27z.c
@@ -326,15 +326,13 @@ usb_lld_ctrl_error (struct usb_dev *dev)
kl27z_ep_stall (ENDP0);
}
-void
-usb_lld_ctrl_good (struct usb_dev *dev)
+int
+usb_lld_ctrl_ack (struct usb_dev *dev)
{
- if (dev->dev_req.len == 0)
- {
- /* Zero length packet for ACK. */
- dev->state = WAIT_STATUS_IN;
- kl27z_prepare_ep0_in (&dev->dev_req, 0, DATA1);
- }
+ /* Zero length packet for ACK. */
+ dev->state = WAIT_STATUS_IN;
+ kl27z_prepare_ep0_in (&dev->dev_req, 0, DATA1);
+ return USB_EVENT_NONE;
}
@@ -394,7 +392,7 @@ usb_lld_event_handler (struct usb_dev *dev)
USB_CTRL1->ISTAT = USB_IS_STALL;
}
- return 0;
+ return USB_EVENT_NONE;
}
@@ -502,7 +500,7 @@ std_get_status (struct usb_dev *dev)
else /* Self-powered */
status_info &= ~1;
- return usb_lld_reply_request (dev, &status_info, 2);
+ return usb_lld_ctrl_send (dev, &status_info, 2);
}
}
else if (rcp == INTERFACE_RECIPIENT)
@@ -523,7 +521,7 @@ std_get_status (struct usb_dev *dev)
return -1;
status_info = kl27z_ep_is_stall (n);
- return usb_lld_reply_request (dev, &status_info, 2);
+ return usb_lld_ctrl_send (dev, &status_info, 2);
}
return -1;
@@ -624,7 +622,7 @@ std_set_address (struct usb_dev *dev)
if (rcp == DEVICE_RECIPIENT && arg->len == 0 && arg->value <= 127
&& arg->index == 0 && dev->configuration == 0)
- return USB_EVENT_NONE;
+ return usb_lld_ctrl_ack (dev);
return -1;
}
@@ -652,7 +650,7 @@ std_get_configuration (struct usb_dev *dev)
return -1;
if (rcp == DEVICE_RECIPIENT)
- return usb_lld_reply_request (dev, &dev->configuration, 1);
+ return usb_lld_ctrl_send (dev, &dev->configuration, 1);
return -1;
}
@@ -735,14 +733,10 @@ handle_setup0 (struct usb_dev *dev)
default: handler = std_none; break;
}
- if ((r = (*handler) (dev)) <= 0)
+ if ((r = (*handler) (dev)) < 0)
{
- /* Handling finished in standard way. */
- if (r == 0)
- usb_lld_ctrl_good (dev);
- else
- usb_lld_ctrl_error (dev);
- return 0;
+ usb_lld_ctrl_error (dev);
+ return USB_EVENT_NONE;
}
else
return r;
@@ -835,7 +829,7 @@ handle_transaction (struct usb_dev *dev, uint8_t stat)
{
handle_out0 (dev, stat);
USB_CTRL1->ISTAT = USB_IS_TOKDNE;
- return 0;
+ return USB_EVENT_NONE;
}
}
else
@@ -959,7 +953,7 @@ usb_lld_current_configuration (struct usb_dev *dev)
}
int
-usb_lld_set_data_to_recv (struct usb_dev *dev, void *p, size_t len)
+usb_lld_ctrl_recv (struct usb_dev *dev, void *p, size_t len)
{
struct ctrl_data *data_p = &dev->ctrl_data;
data_p->addr = (uint8_t *)p;
@@ -969,7 +963,7 @@ usb_lld_set_data_to_recv (struct usb_dev *dev, void *p, size_t len)
kl27z_prepare_ep0_out (p, len, DATA1);
dev->state = OUT_DATA;
- return 0;
+ return USB_EVENT_NONE;
}
/*
@@ -979,7 +973,7 @@ usb_lld_set_data_to_recv (struct usb_dev *dev, void *p, size_t len)
* BUFLEN: size of the data.
*/
int
-usb_lld_reply_request (struct usb_dev *dev, const void *buf, size_t buflen)
+usb_lld_ctrl_send (struct usb_dev *dev, const void *buf, size_t buflen)
{
struct ctrl_data *data_p = &dev->ctrl_data;
uint32_t len_asked = dev->dev_req.len;
@@ -1012,7 +1006,7 @@ usb_lld_reply_request (struct usb_dev *dev, const void *buf, size_t buflen)
data_p->len -= len;
data_p->addr += len;
- return 0;
+ return USB_EVENT_NONE;
}
void
diff --git a/mcu/usb-stm32f103.c b/mcu/usb-stm32f103.c
index 3a0ce48..9091d8d 100644
--- a/mcu/usb-stm32f103.c
+++ b/mcu/usb-stm32f103.c
@@ -353,15 +353,13 @@ usb_lld_ctrl_error (struct usb_dev *dev)
st103_ep_set_rxtx_status (ENDP0, EP_RX_STALL, EP_TX_STALL);
}
-void
-usb_lld_ctrl_good (struct usb_dev *dev)
+int
+usb_lld_ctrl_ack (struct usb_dev *dev)
{
- if (dev->dev_req.len == 0)
- {
- dev->state = WAIT_STATUS_IN;
- st103_set_tx_count (ENDP0, 0);
- st103_ep_set_rxtx_status (ENDP0, EP_RX_NAK, EP_TX_VALID);
- }
+ dev->state = WAIT_STATUS_IN;
+ st103_set_tx_count (ENDP0, 0);
+ st103_ep_set_rxtx_status (ENDP0, EP_RX_NAK, EP_TX_VALID);
+ return USB_EVENT_NONE;
}
void usb_lld_init (struct usb_dev *dev, uint8_t feature)
@@ -418,7 +416,7 @@ usb_lld_event_handler (struct usb_dev *dev)
return usb_handle_transfer (dev, istr_value);
}
- return 0;
+ return USB_EVENT_NONE;
}
static void handle_datastage_out (struct usb_dev *dev)
@@ -522,7 +520,7 @@ static int std_get_status (struct usb_dev *dev)
else /* Self-powered */
status_info &= ~1;
- return usb_lld_reply_request (dev, &status_info, 2);
+ return usb_lld_ctrl_send (dev, &status_info, 2);
}
}
else if (rcp == INTERFACE_RECIPIENT)
@@ -557,7 +555,7 @@ static int std_get_status (struct usb_dev *dev)
status_info |= 1; /* OUT Endpoint stalled */
}
- return usb_lld_reply_request (dev, &status_info, 2);
+ return usb_lld_ctrl_send (dev, &status_info, 2);
}
return -1;
@@ -673,7 +671,7 @@ static int std_set_address (struct usb_dev *dev)
if (rcp == DEVICE_RECIPIENT && arg->len == 0 && arg->value <= 127
&& arg->index == 0 && dev->configuration == 0)
- return USB_EVENT_NONE;
+ return usb_lld_ctrl_ack (dev);
return -1;
}
@@ -699,7 +697,7 @@ static int std_get_configuration (struct usb_dev *dev)
return -1;
if (rcp == DEVICE_RECIPIENT)
- return usb_lld_reply_request (dev, &dev->configuration, 1);
+ return usb_lld_ctrl_send (dev, &dev->configuration, 1);
return -1;
}
@@ -796,14 +794,10 @@ static int handle_setup0 (struct usb_dev *dev)
default: handler = std_none; break;
}
- if ((r = (*handler) (dev)) <= 0)
+ if ((r = (*handler) (dev)) < 0)
{
- /* Handling finished in standard way. */
- if (r == 0)
- usb_lld_ctrl_good (dev);
- else
- usb_lld_ctrl_error (dev);
- return 0;
+ usb_lld_ctrl_error (dev);
+ return USB_EVENT_NONE;
}
else
return r;
@@ -891,7 +885,7 @@ usb_handle_transfer (struct usb_dev *dev, uint16_t istr_value)
else
{
handle_out0 (dev);
- return 0;
+ return USB_EVENT_NONE;
}
}
}
@@ -914,7 +908,7 @@ usb_handle_transfer (struct usb_dev *dev, uint16_t istr_value)
}
}
- return 0;
+ return USB_EVENT_NONE;
}
void usb_lld_reset (struct usb_dev *dev, uint8_t feature)
@@ -1017,12 +1011,12 @@ uint8_t usb_lld_current_configuration (struct usb_dev *dev)
return dev->configuration;
}
-int usb_lld_set_data_to_recv (struct usb_dev *dev, void *p, size_t len)
+int usb_lld_ctrl_recv (struct usb_dev *dev, void *p, size_t len)
{
struct ctrl_data *data_p = &dev->ctrl_data;
data_p->addr = p;
data_p->len = len;
- return 0;
+ return USB_EVENT_NONE;
}
void usb_lld_to_pmabuf (const void *src, uint16_t addr, size_t n)
@@ -1106,7 +1100,7 @@ void usb_lld_from_pmabuf (void *dst, uint16_t addr, size_t n)
* BUFLEN: size of the data.
*/
int
-usb_lld_reply_request (struct usb_dev *dev, const void *buf, size_t buflen)
+usb_lld_ctrl_send (struct usb_dev *dev, const void *buf, size_t buflen)
{
struct ctrl_data *data_p = &dev->ctrl_data;
uint32_t len_asked = dev->dev_req.len;
--
cgit v1.2.3