From de202dd376ea3109e21f535554647689dda23c7b Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Mon, 28 Dec 2015 11:16:40 +0000
Subject: New USB API finalized, updated OTGv1, USBv1 not yet updated.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8653 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/include/usb.h | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'os/hal/include')

diff --git a/os/hal/include/usb.h b/os/hal/include/usb.h
index 4aed90a08..cd2384b26 100644
--- a/os/hal/include/usb.h
+++ b/os/hal/include/usb.h
@@ -412,9 +412,9 @@ typedef const USBDescriptor * (*usbgetdescriptor_t)(USBDriver *usbp,
  * @param[in] usbp      pointer to the @p USBDriver object
  * @return              The current frame number.
  *
- * @api
+ * @xclass
  */
-#define usbGetFrameNumber(usbp) usb_lld_get_frame_number(usbp)
+#define usbGetFrameNumberX(usbp) usb_lld_get_frame_number(usbp)
 
 /**
  * @brief   Returns the status of an IN endpoint.
@@ -454,9 +454,9 @@ typedef const USBDescriptor * (*usbgetdescriptor_t)(USBDriver *usbp,
  * @param[in] ep        endpoint number
  * @return              Received data size.
  *
- * @iclass
+ * @xclass
  */
-#define usbGetReceiveTransactionSizeI(usbp, ep)                             \
+#define usbGetReceiveTransactionSizeX(usbp, ep)                             \
   usb_lld_get_transaction_size(usbp, ep)
 
 /**
@@ -469,7 +469,7 @@ typedef const USBDescriptor * (*usbgetdescriptor_t)(USBDriver *usbp,
  * @param[in] n         number of bytes to be transferred
  * @param[in] endcb     callback to be invoked after the transfer or @p NULL
  *
- * @api
+ * @special
  */
 #define usbSetupTransfer(usbp, buf, n, endcb) {                             \
   (usbp)->ep0next  = (buf);                                                 \
@@ -580,7 +580,7 @@ typedef const USBDescriptor * (*usbgetdescriptor_t)(USBDriver *usbp,
   }                                                                         \
   osalSysLockFromISR();                                                     \
   osalThreadResumeI(&(usbp)->epc[ep]->out_state->thread,                    \
-                    usbGetReceiveTransactionSizeI(usbp, ep));               \
+                    usbGetReceiveTransactionSizeX(usbp, ep));               \
   osalSysUnlockFromISR();                                                   \
 }
 #else
@@ -608,12 +608,10 @@ extern "C" {
                         const USBEndpointConfig *epcp);
   void usbDisableEndpointsI(USBDriver *usbp);
   void usbReadSetupI(USBDriver *usbp, usbep_t ep, uint8_t *buf);
-  void usbPrepareReceive(USBDriver *usbp, usbep_t ep,
-                         uint8_t *buf, size_t n);
-  void usbPrepareTransmit(USBDriver *usbp, usbep_t ep,
-                          const uint8_t *buf, size_t n);
-  bool usbStartReceiveI(USBDriver *usbp, usbep_t ep);
-  bool usbStartTransmitI(USBDriver *usbp, usbep_t ep);
+  void usbStartReceiveI(USBDriver *usbp, usbep_t ep,
+                        uint8_t *buf, size_t n);
+  void usbStartTransmitI(USBDriver *usbp, usbep_t ep,
+                         const uint8_t *buf, size_t n);
 #if USB_USE_WAIT == TRUE
   msg_t usbReceive(USBDriver *usbp, usbep_t ep, uint8_t *buf, size_t n);
   msg_t usbTransmit(USBDriver *usbp, usbep_t ep, const uint8_t *buf, size_t n);
-- 
cgit v1.2.3