git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6262 35acf78f-673a-0410-8e92-d51de3d6d3f4

16 files changed, 40 insertions, 42 deletions

diff --git a/os/hal/include/serial_usb.h b/os/hal/include/serial_usb.h
index 5d1a14127..fb4ab25d5 100644
--- a/os/hal/include/serial_usb.h
+++ b/os/hal/include/serial_usb.h
@@ -218,7 +218,7 @@ extern "C" {
   void sduStart(SerialUSBDriver *sdup, const SerialUSBConfig *config);

   void sduStop(SerialUSBDriver *sdup);

   void sduConfigureHookI(SerialUSBDriver *sdup);

-  bool_t sduRequestsHook(USBDriver *usbp);

+  bool sduRequestsHook(USBDriver *usbp);

   void sduDataTransmitted(USBDriver *usbp, usbep_t ep);

   void sduDataReceived(USBDriver *usbp, usbep_t ep);

   void sduInterruptTransmitted(USBDriver *usbp, usbep_t ep);

diff --git a/os/hal/include/usb.h b/os/hal/include/usb.h
index e474a470f..ef470bf23 100644
--- a/os/hal/include/usb.h
+++ b/os/hal/include/usb.h
@@ -319,7 +319,7 @@ typedef void (*usbeventcb_t)(USBDriver *usbp, usbevent_t event);
  * @retval FALSE        Request not recognized by the handler.

  * @retval TRUE         Request handled.

  */

-typedef bool_t (*usbreqhandler_t)(USBDriver *usbp);

+typedef bool (*usbreqhandler_t)(USBDriver *usbp);

 

 /**

  * @brief   Type of an USB descriptor-retrieving callback.

@@ -553,10 +553,10 @@ extern "C" {
                                input_queue_t *iqp, size_t n);

   void usbPrepareQueuedTransmit(USBDriver *usbp, usbep_t ep,

                                 output_queue_t *oqp, size_t n);

-  bool_t usbStartReceiveI(USBDriver *usbp, usbep_t ep);

-  bool_t usbStartTransmitI(USBDriver *usbp, usbep_t ep);

-  bool_t usbStallReceiveI(USBDriver *usbp, usbep_t ep);

-  bool_t usbStallTransmitI(USBDriver *usbp, usbep_t ep);

+  bool usbStartReceiveI(USBDriver *usbp, usbep_t ep);

+  bool usbStartTransmitI(USBDriver *usbp, usbep_t ep);

+  bool usbStallReceiveI(USBDriver *usbp, usbep_t ep);

+  bool usbStallTransmitI(USBDriver *usbp, usbep_t ep);

   void _usb_reset(USBDriver *usbp);

   void _usb_ep0setup(USBDriver *usbp, usbep_t ep);

   void _usb_ep0in(USBDriver *usbp, usbep_t ep);

diff --git a/os/hal/ports/STM32/SPIv2/spi_lld.c b/os/hal/ports/STM32/SPIv2/spi_lld.c
index 3cbcc0fc0..e21f80074 100644
--- a/os/hal/ports/STM32/SPIv2/spi_lld.c
+++ b/os/hal/ports/STM32/SPIv2/spi_lld.c
@@ -216,7 +216,7 @@ void spi_lld_start(SPIDriver *spip) {
   if (spip->state == SPI_STOP) {

 #if STM32_SPI_USE_SPI1

     if (&SPID1 == spip) {

-      bool_t b;

+      bool b;

       b = dmaStreamAllocate(spip->dmarx,

                             STM32_SPI_SPI1_IRQ_PRIORITY,

                             (stm32_dmaisr_t)spi_lld_serve_rx_interrupt,

@@ -232,7 +232,7 @@ void spi_lld_start(SPIDriver *spip) {
 #endif

 #if STM32_SPI_USE_SPI2

     if (&SPID2 == spip) {

-      bool_t b;

+      bool b;

       b = dmaStreamAllocate(spip->dmarx,

                             STM32_SPI_SPI2_IRQ_PRIORITY,

                             (stm32_dmaisr_t)spi_lld_serve_rx_interrupt,

@@ -248,7 +248,7 @@ void spi_lld_start(SPIDriver *spip) {
 #endif

 #if STM32_SPI_USE_SPI3

     if (&SPID3 == spip) {

-      bool_t b;

+      bool b;

       b = dmaStreamAllocate(spip->dmarx,

                             STM32_SPI_SPI3_IRQ_PRIORITY,

                             (stm32_dmaisr_t)spi_lld_serve_rx_interrupt,

diff --git a/os/hal/ports/STM32/USARTv2/uart_lld.c b/os/hal/ports/STM32/USARTv2/uart_lld.c
index 0b85a294c..54a187a39 100644
--- a/os/hal/ports/STM32/USARTv2/uart_lld.c
+++ b/os/hal/ports/STM32/USARTv2/uart_lld.c
@@ -391,7 +391,7 @@ void uart_lld_start(UARTDriver *uartp) {
   if (uartp->state == UART_STOP) {

 #if STM32_UART_USE_USART1

     if (&UARTD1 == uartp) {

-      bool_t b;

+      bool b;

       b = dmaStreamAllocate(uartp->dmarx,

                             STM32_UART_USART1_IRQ_PRIORITY,

                             (stm32_dmaisr_t)uart_lld_serve_rx_end_irq,

@@ -411,7 +411,7 @@ void uart_lld_start(UARTDriver *uartp) {
 

 #if STM32_UART_USE_USART2

     if (&UARTD2 == uartp) {

-      bool_t b;

+      bool b;

       b = dmaStreamAllocate(uartp->dmarx,

                             STM32_UART_USART2_IRQ_PRIORITY,

                             (stm32_dmaisr_t)uart_lld_serve_rx_end_irq,

@@ -431,7 +431,7 @@ void uart_lld_start(UARTDriver *uartp) {
 

 #if STM32_UART_USE_USART3

     if (&UARTD3 == uartp) {

-      bool_t b;

+      bool b;

       b = dmaStreamAllocate(uartp->dmarx,

                             STM32_UART_USART3_IRQ_PRIORITY,

                             (stm32_dmaisr_t)uart_lld_serve_rx_end_irq,

diff --git a/os/hal/ports/STM32/can_lld.c b/os/hal/ports/STM32/can_lld.c
index a53a8fe27..266f87504 100644
--- a/os/hal/ports/STM32/can_lld.c
+++ b/os/hal/ports/STM32/can_lld.c
@@ -484,7 +484,7 @@ void can_lld_stop(CANDriver *canp) {
  *

  * @notapi

  */

-bool_t can_lld_is_tx_empty(CANDriver *canp, canmbx_t mailbox) {

+bool can_lld_is_tx_empty(CANDriver *canp, canmbx_t mailbox) {

 

   switch (mailbox) {

   case CAN_ANY_MAILBOX:

@@ -557,7 +557,7 @@ void can_lld_transmit(CANDriver *canp,
  *

  * @notapi

  */

-bool_t can_lld_is_rx_nonempty(CANDriver *canp, canmbx_t mailbox) {

+bool can_lld_is_rx_nonempty(CANDriver *canp, canmbx_t mailbox) {

 

   switch (mailbox) {

   case CAN_ANY_MAILBOX:

diff --git a/os/hal/ports/STM32/can_lld.h b/os/hal/ports/STM32/can_lld.h
index 9f3797029..27da0b3b6 100644
--- a/os/hal/ports/STM32/can_lld.h
+++ b/os/hal/ports/STM32/can_lld.h
@@ -341,13 +341,11 @@ extern "C" {
   void can_lld_init(void);

   void can_lld_start(CANDriver *canp);

   void can_lld_stop(CANDriver *canp);

-  bool_t can_lld_is_tx_empty(CANDriver *canp,

-                             canmbx_t mailbox);

+  bool can_lld_is_tx_empty(CANDriver *canp, canmbx_t mailbox);

   void can_lld_transmit(CANDriver *canp,

                         canmbx_t mailbox,

                         const CANTxFrame *crfp);

-  bool_t can_lld_is_rx_nonempty(CANDriver *canp,

-                                canmbx_t mailbox);

+  bool can_lld_is_rx_nonempty(CANDriver *canp, canmbx_t mailbox);

   void can_lld_receive(CANDriver *canp,

                        canmbx_t mailbox,

                        CANRxFrame *ctfp);

diff --git a/os/hal/ports/STM32F0xx/adc_lld.c b/os/hal/ports/STM32F0xx/adc_lld.c
index 1c4ffce7f..b2aae96f1 100644
--- a/os/hal/ports/STM32F0xx/adc_lld.c
+++ b/os/hal/ports/STM32F0xx/adc_lld.c
@@ -179,7 +179,7 @@ void adc_lld_start(ADCDriver *adcp) {
   if (adcp->state == ADC_STOP) {

 #if STM32_ADC_USE_ADC1

     if (&ADCD1 == adcp) {

-      bool_t b;

+      bool b;

       b = dmaStreamAllocate(adcp->dmastp,

                             STM32_ADC_ADC1_DMA_IRQ_PRIORITY,

                             (stm32_dmaisr_t)adc_lld_serve_rx_interrupt,

diff --git a/os/hal/ports/STM32F0xx/adc_lld.h b/os/hal/ports/STM32F0xx/adc_lld.h
index 635dcefaa..bddb6453a 100644
--- a/os/hal/ports/STM32F0xx/adc_lld.h
+++ b/os/hal/ports/STM32F0xx/adc_lld.h
@@ -194,7 +194,7 @@ typedef struct {
   /**

    * @brief   Enables the circular buffer mode for the group.

    */

-  bool_t                    circular;

+  bool                      circular;

   /**

    * @brief   Number of the analog channels belonging to the conversion group.

    */

diff --git a/os/hal/ports/STM32F0xx/stm32_dma.c b/os/hal/ports/STM32F0xx/stm32_dma.c
index 623c9d11b..f803f0506 100644
--- a/os/hal/ports/STM32F0xx/stm32_dma.c
+++ b/os/hal/ports/STM32F0xx/stm32_dma.c
@@ -223,10 +223,10 @@ void dmaInit(void) {
  *

  * @special

  */

-bool_t dmaStreamAllocate(const stm32_dma_stream_t *dmastp,

-                         uint32_t priority,

-                         stm32_dmaisr_t func,

-                         void *param) {

+bool dmaStreamAllocate(const stm32_dma_stream_t *dmastp,

+                       uint32_t priority,

+                       stm32_dmaisr_t func,

+                       void *param) {

 

   osalDbgCheck(dmastp != NULL);

 

diff --git a/os/hal/ports/STM32F30x/adc_lld.c b/os/hal/ports/STM32F30x/adc_lld.c
index d516cf21b..ff8eb0fec 100644
--- a/os/hal/ports/STM32F30x/adc_lld.c
+++ b/os/hal/ports/STM32F30x/adc_lld.c
@@ -370,7 +370,7 @@ void adc_lld_start(ADCDriver *adcp) {
   if (adcp->state == ADC_STOP) {

 #if STM32_ADC_USE_ADC1

     if (&ADCD1 == adcp) {

-      bool_t b;

+      bool b;

       b = dmaStreamAllocate(adcp->dmastp,

                             STM32_ADC_ADC12_DMA_IRQ_PRIORITY,

                             (stm32_dmaisr_t)adc_lld_serve_dma_interrupt,

@@ -382,7 +382,7 @@ void adc_lld_start(ADCDriver *adcp) {
 

 #if STM32_ADC_USE_ADC3

     if (&ADCD3 == adcp) {

-      bool_t b;

+      bool b;

       b = dmaStreamAllocate(adcp->dmastp,

                             STM32_ADC_ADC34_DMA_IRQ_PRIORITY,

                             (stm32_dmaisr_t)adc_lld_serve_dma_interrupt,

diff --git a/os/hal/ports/STM32F30x/adc_lld.h b/os/hal/ports/STM32F30x/adc_lld.h
index 66c725cdd..1c9ac03e4 100644
--- a/os/hal/ports/STM32F30x/adc_lld.h
+++ b/os/hal/ports/STM32F30x/adc_lld.h
@@ -389,7 +389,7 @@ typedef struct {
   /**

    * @brief   Enables the circular buffer mode for the group.

    */

-  bool_t                    circular;

+  bool                      circular;

   /**

    * @brief   Number of the analog channels belonging to the conversion group.

    */

diff --git a/os/hal/ports/STM32F30x/stm32_dma.c b/os/hal/ports/STM32F30x/stm32_dma.c
index eb73f1b37..9b912e8fb 100644
--- a/os/hal/ports/STM32F30x/stm32_dma.c
+++ b/os/hal/ports/STM32F30x/stm32_dma.c
@@ -373,10 +373,10 @@ void dmaInit(void) {
  *

  * @special

  */

-bool_t dmaStreamAllocate(const stm32_dma_stream_t *dmastp,

-                         uint32_t priority,

-                         stm32_dmaisr_t func,

-                         void *param) {

+bool dmaStreamAllocate(const stm32_dma_stream_t *dmastp,

+                       uint32_t priority,

+                       stm32_dmaisr_t func,

+                       void *param) {

 

   osalDbgCheck(dmastp != NULL);

 

diff --git a/os/hal/ports/STM32F4xx/adc_lld.h b/os/hal/ports/STM32F4xx/adc_lld.h
index c8f0570eb..6b6530a61 100644
--- a/os/hal/ports/STM32F4xx/adc_lld.h
+++ b/os/hal/ports/STM32F4xx/adc_lld.h
@@ -345,7 +345,7 @@ typedef struct {
   /**

    * @brief   Enables the circular buffer mode for the group.

    */

-  bool_t                    circular;

+  bool                      circular;

   /**

    * @brief   Number of the analog channels belonging to the conversion group.

    */

diff --git a/os/hal/ports/STM32F4xx/stm32_dma.c b/os/hal/ports/STM32F4xx/stm32_dma.c
index a3bb26b0d..af3513954 100644
--- a/os/hal/ports/STM32F4xx/stm32_dma.c
+++ b/os/hal/ports/STM32F4xx/stm32_dma.c
@@ -454,10 +454,10 @@ void dmaInit(void) {
  *

  * @special

  */

-bool_t dmaStreamAllocate(const stm32_dma_stream_t *dmastp,

-                         uint32_t priority,

-                         stm32_dmaisr_t func,

-                         void *param) {

+bool dmaStreamAllocate(const stm32_dma_stream_t *dmastp,

+                       uint32_t priority,

+                       stm32_dmaisr_t func,

+                       void *param) {

 

   osalDbgCheck(dmastp != NULL);

 

diff --git a/os/hal/src/serial_usb.c b/os/hal/src/serial_usb.c
index b8764a51a..7a9476250 100644
--- a/os/hal/src/serial_usb.c
+++ b/os/hal/src/serial_usb.c
@@ -289,7 +289,7 @@ void sduConfigureHookI(SerialUSBDriver *sdup) {
  * @retval TRUE         Message handled internally.

  * @retval FALSE        Message not handled.

  */

-bool_t sduRequestsHook(USBDriver *usbp) {

+bool sduRequestsHook(USBDriver *usbp) {

 

   if ((usbp->setup[0] & USB_RTYPE_TYPE_MASK) == USB_RTYPE_TYPE_CLASS) {

     switch (usbp->setup[1]) {

diff --git a/os/hal/src/usb.c b/os/hal/src/usb.c
index 906981db2..a84702b5b 100644
--- a/os/hal/src/usb.c
+++ b/os/hal/src/usb.c
@@ -77,7 +77,7 @@ static void set_address(USBDriver *usbp) {
  * @retval FALSE        Request not recognized by the handler or error.

  * @retval TRUE         Request handled.

  */

-static bool_t default_handler(USBDriver *usbp) {

+static bool default_handler(USBDriver *usbp) {

   const USBDescriptor *dp;

 

   /* Decoding the request.*/

@@ -471,7 +471,7 @@ void usbPrepareQueuedTransmit(USBDriver *usbp, usbep_t ep,
  *

  * @iclass

  */

-bool_t usbStartReceiveI(USBDriver *usbp, usbep_t ep) {

+bool usbStartReceiveI(USBDriver *usbp, usbep_t ep) {

 

   osalDbgCheckClassI();

   osalDbgCheck(usbp != NULL);

@@ -498,7 +498,7 @@ bool_t usbStartReceiveI(USBDriver *usbp, usbep_t ep) {
  *

  * @iclass

  */

-bool_t usbStartTransmitI(USBDriver *usbp, usbep_t ep) {

+bool usbStartTransmitI(USBDriver *usbp, usbep_t ep) {

 

   osalDbgCheckClassI();

   osalDbgCheck(usbp != NULL);

@@ -523,7 +523,7 @@ bool_t usbStartTransmitI(USBDriver *usbp, usbep_t ep) {
  *

  * @iclass

  */

-bool_t usbStallReceiveI(USBDriver *usbp, usbep_t ep) {

+bool usbStallReceiveI(USBDriver *usbp, usbep_t ep) {

 

   osalDbgCheckClassI();

   osalDbgCheck(usbp != NULL);

@@ -547,7 +547,7 @@ bool_t usbStallReceiveI(USBDriver *usbp, usbep_t ep) {
  *

  * @iclass

  */

-bool_t usbStallTransmitI(USBDriver *usbp, usbep_t ep) {

+bool usbStallTransmitI(USBDriver *usbp, usbep_t ep) {

 

   osalDbgCheckClassI();

   osalDbgCheck(usbp != NULL);