aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2015-02-05 12:45:05 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2015-02-05 12:45:05 +0000
commitf5a8502a288742f80cbaeb094911d75efff82b28 (patch)
treefd5ba619d678b48da913f3621939b126427d7077 /os
parentbc83d0a40213c0ce58b83f540461aeec471a18ed (diff)
downloadChibiOS-f5a8502a288742f80cbaeb094911d75efff82b28.tar.gz
ChibiOS-f5a8502a288742f80cbaeb094911d75efff82b28.tar.bz2
ChibiOS-f5a8502a288742f80cbaeb094911d75efff82b28.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7656 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
-rw-r--r--os/hal/include/usb.h12
-rw-r--r--os/hal/src/serial_usb.c14
-rw-r--r--os/hal/src/usb.c88
3 files changed, 57 insertions, 57 deletions
diff --git a/os/hal/include/usb.h b/os/hal/include/usb.h
index a52480135..c85506403 100644
--- a/os/hal/include/usb.h
+++ b/os/hal/include/usb.h
@@ -349,8 +349,8 @@ typedef void (*usbeventcb_t)(USBDriver *usbp, usbevent_t event);
* @param[in] usbp pointer to the @p USBDriver object triggering the
* callback
* @return The request handling exit code.
- * @retval FALSE Request not recognized by the handler.
- * @retval TRUE Request handled.
+ * @retval false Request not recognized by the handler.
+ * @retval true Request handled.
*/
typedef bool (*usbreqhandler_t)(USBDriver *usbp);
@@ -425,8 +425,8 @@ typedef const USBDescriptor * (*usbgetdescriptor_t)(USBDriver *usbp,
* @param[in] usbp pointer to the @p USBDriver object
* @param[in] ep endpoint number
* @return The operation status.
- * @retval FALSE Endpoint ready.
- * @retval TRUE Endpoint transmitting.
+ * @retval false Endpoint ready.
+ * @retval true Endpoint transmitting.
*
* @iclass
*/
@@ -438,8 +438,8 @@ typedef const USBDescriptor * (*usbgetdescriptor_t)(USBDriver *usbp,
* @param[in] usbp pointer to the @p USBDriver object
* @param[in] ep endpoint number
* @return The operation status.
- * @retval FALSE Endpoint ready.
- * @retval TRUE Endpoint receiving.
+ * @retval false Endpoint ready.
+ * @retval true Endpoint receiving.
*
* @iclass
*/
diff --git a/os/hal/src/serial_usb.c b/os/hal/src/serial_usb.c
index a4b943f6a..7f837d37d 100644
--- a/os/hal/src/serial_usb.c
+++ b/os/hal/src/serial_usb.c
@@ -289,8 +289,8 @@ void sduConfigureHookI(SerialUSBDriver *sdup) {
*
* @param[in] usbp pointer to the @p USBDriver object
* @return The hook status.
- * @retval TRUE Message handled internally.
- * @retval FALSE Message not handled.
+ * @retval true Message handled internally.
+ * @retval false Message not handled.
*/
bool sduRequestsHook(USBDriver *usbp) {
@@ -298,19 +298,19 @@ bool sduRequestsHook(USBDriver *usbp) {
switch (usbp->setup[1]) {
case CDC_GET_LINE_CODING:
usbSetupTransfer(usbp, (uint8_t *)&linecoding, sizeof(linecoding), NULL);
- return TRUE;
+ return true;
case CDC_SET_LINE_CODING:
usbSetupTransfer(usbp, (uint8_t *)&linecoding, sizeof(linecoding), NULL);
- return TRUE;
+ return true;
case CDC_SET_CONTROL_LINE_STATE:
/* Nothing to do, there are no control lines.*/
usbSetupTransfer(usbp, NULL, 0, NULL);
- return TRUE;
+ return true;
default:
- return FALSE;
+ return false;
}
}
- return FALSE;
+ return false;
}
/**
diff --git a/os/hal/src/usb.c b/os/hal/src/usb.c
index e339af472..602115fbd 100644
--- a/os/hal/src/usb.c
+++ b/os/hal/src/usb.c
@@ -73,8 +73,8 @@ static void set_address(USBDriver *usbp) {
*
* @param[in] usbp pointer to the @p USBDriver object
* @return The request handling exit code.
- * @retval FALSE Request not recognized by the handler or error.
- * @retval TRUE Request handled.
+ * @retval false Request not recognized by the handler or error.
+ * @retval true Request handled.
*/
static bool default_handler(USBDriver *usbp) {
const USBDescriptor *dp;
@@ -86,25 +86,25 @@ static bool default_handler(USBDriver *usbp) {
case USB_RTYPE_RECIPIENT_DEVICE | (USB_REQ_GET_STATUS << 8):
/* Just returns the current status word.*/
usbSetupTransfer(usbp, (uint8_t *)&usbp->status, 2, NULL);
- return TRUE;
+ return true;
case USB_RTYPE_RECIPIENT_DEVICE | (USB_REQ_CLEAR_FEATURE << 8):
/* Only the DEVICE_REMOTE_WAKEUP is handled here, any other feature
number is handled as an error.*/
if (usbp->setup[2] == USB_FEATURE_DEVICE_REMOTE_WAKEUP) {
usbp->status &= ~2;
usbSetupTransfer(usbp, NULL, 0, NULL);
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
case USB_RTYPE_RECIPIENT_DEVICE | (USB_REQ_SET_FEATURE << 8):
/* Only the DEVICE_REMOTE_WAKEUP is handled here, any other feature
number is handled as an error.*/
if (usbp->setup[2] == USB_FEATURE_DEVICE_REMOTE_WAKEUP) {
usbp->status |= 2;
usbSetupTransfer(usbp, NULL, 0, NULL);
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
case USB_RTYPE_RECIPIENT_DEVICE | (USB_REQ_SET_ADDRESS << 8):
/* The SET_ADDRESS handling can be performed here or postponed after
the status packed depending on the USB_SET_ADDRESS_MODE low
@@ -117,20 +117,20 @@ static bool default_handler(USBDriver *usbp) {
#else
usbSetupTransfer(usbp, NULL, 0, set_address);
#endif
- return TRUE;
+ return true;
case USB_RTYPE_RECIPIENT_DEVICE | (USB_REQ_GET_DESCRIPTOR << 8):
/* Handling descriptor requests from the host.*/
dp = usbp->config->get_descriptor_cb(
usbp, usbp->setup[3], usbp->setup[2],
usbFetchWord(&usbp->setup[4]));
if (dp == NULL)
- return FALSE;
+ return false;
usbSetupTransfer(usbp, (uint8_t *)dp->ud_string, dp->ud_size, NULL);
- return TRUE;
+ return true;
case USB_RTYPE_RECIPIENT_DEVICE | (USB_REQ_GET_CONFIGURATION << 8):
/* Returning the last selected configuration.*/
usbSetupTransfer(usbp, &usbp->configuration, 1, NULL);
- return TRUE;
+ return true;
case USB_RTYPE_RECIPIENT_DEVICE | (USB_REQ_SET_CONFIGURATION << 8):
/* Handling configuration selection from the host.*/
usbp->configuration = usbp->setup[2];
@@ -140,43 +140,43 @@ static bool default_handler(USBDriver *usbp) {
usbp->state = USB_ACTIVE;
_usb_isr_invoke_event_cb(usbp, USB_EVENT_CONFIGURED);
usbSetupTransfer(usbp, NULL, 0, NULL);
- return TRUE;
+ return true;
case USB_RTYPE_RECIPIENT_INTERFACE | (USB_REQ_GET_STATUS << 8):
case USB_RTYPE_RECIPIENT_ENDPOINT | (USB_REQ_SYNCH_FRAME << 8):
/* Just sending two zero bytes, the application can change the behavior
using a hook..*/
usbSetupTransfer(usbp, (uint8_t *)zero_status, 2, NULL);
- return TRUE;
+ return true;
case USB_RTYPE_RECIPIENT_ENDPOINT | (USB_REQ_GET_STATUS << 8):
/* Sending the EP status.*/
if (usbp->setup[4] & 0x80) {
switch (usb_lld_get_status_in(usbp, usbp->setup[4] & 0x0F)) {
case EP_STATUS_STALLED:
usbSetupTransfer(usbp, (uint8_t *)halted_status, 2, NULL);
- return TRUE;
+ return true;
case EP_STATUS_ACTIVE:
usbSetupTransfer(usbp, (uint8_t *)active_status, 2, NULL);
- return TRUE;
+ return true;
default:
- return FALSE;
+ return false;
}
}
else {
switch (usb_lld_get_status_out(usbp, usbp->setup[4] & 0x0F)) {
case EP_STATUS_STALLED:
usbSetupTransfer(usbp, (uint8_t *)halted_status, 2, NULL);
- return TRUE;
+ return true;
case EP_STATUS_ACTIVE:
usbSetupTransfer(usbp, (uint8_t *)active_status, 2, NULL);
- return TRUE;
+ return true;
default:
- return FALSE;
+ return false;
}
}
case USB_RTYPE_RECIPIENT_ENDPOINT | (USB_REQ_CLEAR_FEATURE << 8):
/* Only ENDPOINT_HALT is handled as feature.*/
if (usbp->setup[2] != USB_FEATURE_ENDPOINT_HALT)
- return FALSE;
+ return false;
/* Clearing the EP status, not valid for EP0, it is ignored in that case.*/
if ((usbp->setup[4] & 0x0F) > 0) {
if (usbp->setup[4] & 0x80)
@@ -185,11 +185,11 @@ static bool default_handler(USBDriver *usbp) {
usb_lld_clear_out(usbp, usbp->setup[4] & 0x0F);
}
usbSetupTransfer(usbp, NULL, 0, NULL);
- return TRUE;
+ return true;
case USB_RTYPE_RECIPIENT_ENDPOINT | (USB_REQ_SET_FEATURE << 8):
/* Only ENDPOINT_HALT is handled as feature.*/
if (usbp->setup[2] != USB_FEATURE_ENDPOINT_HALT)
- return FALSE;
+ return false;
/* Stalling the EP, not valid for EP0, it is ignored in that case.*/
if ((usbp->setup[4] & 0x0F) > 0) {
if (usbp->setup[4] & 0x80)
@@ -198,7 +198,7 @@ static bool default_handler(USBDriver *usbp) {
usb_lld_stall_out(usbp, usbp->setup[4] & 0x0F);
}
usbSetupTransfer(usbp, NULL, 0, NULL);
- return TRUE;
+ return true;
case USB_RTYPE_RECIPIENT_DEVICE | (USB_REQ_SET_DESCRIPTOR << 8):
case USB_RTYPE_RECIPIENT_INTERFACE | (USB_REQ_CLEAR_FEATURE << 8):
case USB_RTYPE_RECIPIENT_INTERFACE | (USB_REQ_SET_FEATURE << 8):
@@ -207,7 +207,7 @@ static bool default_handler(USBDriver *usbp) {
/* All the above requests are not handled here, if you need them then
use the hook mechanism and provide handling.*/
default:
- return FALSE;
+ return false;
}
}
@@ -367,7 +367,7 @@ void usbDisableEndpointsI(USBDriver *usbp) {
void usbPrepareReceive(USBDriver *usbp, usbep_t ep, uint8_t *buf, size_t n) {
USBOutEndpointState *osp = usbp->epc[ep]->out_state;
- osp->rxqueued = FALSE;
+ osp->rxqueued = false;
osp->mode.linear.rxbuf = buf;
osp->rxsize = n;
osp->rxcnt = 0;
@@ -393,7 +393,7 @@ void usbPrepareTransmit(USBDriver *usbp, usbep_t ep,
const uint8_t *buf, size_t n) {
USBInEndpointState *isp = usbp->epc[ep]->in_state;
- isp->txqueued = FALSE;
+ isp->txqueued = false;
isp->mode.linear.txbuf = buf;
isp->txsize = n;
isp->txcnt = 0;
@@ -422,7 +422,7 @@ void usbPrepareQueuedReceive(USBDriver *usbp, usbep_t ep,
input_queue_t *iqp, size_t n) {
USBOutEndpointState *osp = usbp->epc[ep]->out_state;
- osp->rxqueued = TRUE;
+ osp->rxqueued = true;
osp->mode.queue.rxqueue = iqp;
osp->rxsize = n;
osp->rxcnt = 0;
@@ -448,7 +448,7 @@ void usbPrepareQueuedTransmit(USBDriver *usbp, usbep_t ep,
output_queue_t *oqp, size_t n) {
USBInEndpointState *isp = usbp->epc[ep]->in_state;
- isp->txqueued = TRUE;
+ isp->txqueued = true;
isp->mode.queue.txqueue = oqp;
isp->txsize = n;
isp->txcnt = 0;
@@ -465,8 +465,8 @@ void usbPrepareQueuedTransmit(USBDriver *usbp, usbep_t ep,
* @param[in] ep endpoint number
*
* @return The operation status.
- * @retval FALSE Operation started successfully.
- * @retval TRUE Endpoint busy, operation not started.
+ * @retval false Operation started successfully.
+ * @retval true Endpoint busy, operation not started.
*
* @iclass
*/
@@ -476,11 +476,11 @@ bool usbStartReceiveI(USBDriver *usbp, usbep_t ep) {
osalDbgCheck(usbp != NULL);
if (usbGetReceiveStatusI(usbp, ep))
- return TRUE;
+ return true;
usbp->receiving |= (1 << ep);
usb_lld_start_out(usbp, ep);
- return FALSE;
+ return false;
}
/**
@@ -492,8 +492,8 @@ bool usbStartReceiveI(USBDriver *usbp, usbep_t ep) {
* @param[in] ep endpoint number
*
* @return The operation status.
- * @retval FALSE Operation started successfully.
- * @retval TRUE Endpoint busy, operation not started.
+ * @retval false Operation started successfully.
+ * @retval true Endpoint busy, operation not started.
*
* @iclass
*/
@@ -503,11 +503,11 @@ bool usbStartTransmitI(USBDriver *usbp, usbep_t ep) {
osalDbgCheck(usbp != NULL);
if (usbGetTransmitStatusI(usbp, ep))
- return TRUE;
+ return true;
usbp->transmitting |= (1 << ep);
usb_lld_start_in(usbp, ep);
- return FALSE;
+ return false;
}
/**
@@ -517,8 +517,8 @@ bool usbStartTransmitI(USBDriver *usbp, usbep_t ep) {
* @param[in] ep endpoint number
*
* @return The operation status.
- * @retval FALSE Endpoint stalled.
- * @retval TRUE Endpoint busy, not stalled.
+ * @retval false Endpoint stalled.
+ * @retval true Endpoint busy, not stalled.
*
* @iclass
*/
@@ -528,10 +528,10 @@ bool usbStallReceiveI(USBDriver *usbp, usbep_t ep) {
osalDbgCheck(usbp != NULL);
if (usbGetReceiveStatusI(usbp, ep))
- return TRUE;
+ return true;
usb_lld_stall_out(usbp, ep);
- return FALSE;
+ return false;
}
/**
@@ -541,8 +541,8 @@ bool usbStallReceiveI(USBDriver *usbp, usbep_t ep) {
* @param[in] ep endpoint number
*
* @return The operation status.
- * @retval FALSE Endpoint stalled.
- * @retval TRUE Endpoint busy, not stalled.
+ * @retval false Endpoint stalled.
+ * @retval true Endpoint busy, not stalled.
*
* @iclass
*/
@@ -552,10 +552,10 @@ bool usbStallTransmitI(USBDriver *usbp, usbep_t ep) {
osalDbgCheck(usbp != NULL);
if (usbGetTransmitStatusI(usbp, ep))
- return TRUE;
+ return true;
usb_lld_stall_in(usbp, ep);
- return FALSE;
+ return false;
}
/**