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

1 files changed, 50 insertions, 38 deletions

diff --git a/os/hal/platforms/LPC214x/serial_lld.h b/os/hal/platforms/LPC214x/serial_lld.h
index cea587935..e8371104a 100644
--- a/os/hal/platforms/LPC214x/serial_lld.h
+++ b/os/hal/platforms/LPC214x/serial_lld.h
@@ -38,16 +38,6 @@
 /*===========================================================================*/

 

 /**

- * @brief Serial buffers size.

- * @details Configuration parameter, you can change the depth of the queue

- * buffers depending on the requirements of your application.

- * @note The default is 128 bytes for both the transmission and receive buffers.

- */

-#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

-#define SERIAL_BUFFERS_SIZE 128

-#endif

-

-/**

  * @brief FIFO preload parameter.

  * @details Configuration parameter, this values defines how many bytes are

  * preloaded in the HW transmit FIFO for each interrupt, the maximum value is

@@ -104,54 +94,76 @@
 /*===========================================================================*/

 

 /**

- * Serial Driver condition flags type.

+ * @brief Serial Driver condition flags type.

  */

 typedef uint32_t sdflags_t;

 

 /**

+ * @brief LPC214x Serial Driver configuration structure.

+ * @details An instance of this structure must be passed to @p sdStart()

+ *          in order to configure and start a serial driver operations.

+ */

+typedef struct {

+  /**

+   * @brief Bit rate.

+   */

+  uint32_t                  sc_speed;

+  /**

+   * @brief Initialization value for the LCR register.

+   */

+  uint32_t                  sc_lcr;

+  /**

+   * @brief Initialization value for the FCR register.

+   */

+  uint32_t                  sc_fcr;

+} SerialConfig;

+

+/**

  * @brief @p SerialDriver specific data.

  */

 struct _serial_driver_data {

   /**

-   * Input queue, incoming data can be read from this input queue by

-   * using the queues APIs.

+   * @brief Driver state.

+   */

+  sdstate_t                 state;

+  /**

+   * @brief Current configuration data.

+   */

+  const SerialConfig        *config;

+  /**

+   * @brief Input queue, incoming data can be read from this input queue by

+   *        using the queues APIs.

+   */

+  InputQueue                iqueue;

+  /**

+   * @brief Output queue, outgoing data can be written to this output queue by

+   *        using the queues APIs.

    */

-  InputQueue            iqueue;

+  OutputQueue               oqueue;

   /**

-   * Output queue, outgoing data can be written to this output queue by

-   * using the queues APIs.

+   * @brief Status Change @p EventSource. This event is generated when one or

+   *        more condition flags change.

    */

-  OutputQueue           oqueue;

+  EventSource               sevent;

   /**

-   * Status Change @p EventSource. This event is generated when one or more

-   * condition flags change.

+   * @brief I/O driver status flags.

    */

-  EventSource           sevent;

+  sdflags_t                 flags;

   /**

-   * I/O driver status flags.

+   * @brief Input circular buffer.

    */

-  sdflags_t             flags;

+  uint8_t                   ib[SERIAL_BUFFERS_SIZE];

   /**

-   * Input circular buffer.
+   * @brief Output circular buffer.

    */

-  uint8_t               ib[SERIAL_BUFFERS_SIZE];

+  uint8_t                   ob[SERIAL_BUFFERS_SIZE];

+  /* End of the mandatory fields.*/

   /**

-   * Output circular buffer.
+   * @brief Pointer to the USART registers block.

    */

-  uint8_t               ob[SERIAL_BUFFERS_SIZE];

+  UART                      *uart;

 };

 

-/**

- * @brief LPC214x Serial Driver configuration structure.

- * @details An instance of this structure must be passed to @p sdStart()

- *          in order to configure and start a serial driver operations.

- */

-typedef struct {

-  uint32_t              speed;

-  uint32_t              lcr;

-  uint32_t              fcr;

-} SerialDriverConfig;

-

 /*===========================================================================*/

 /* Driver macros.                                                            */

 /*===========================================================================*/

@@ -172,7 +184,7 @@ extern SerialDriver SD2;
 extern "C" {

 #endif

   void sd_lld_init(void);

-  void sd_lld_start(SerialDriver *sdp, const SerialDriverConfig *config);

+  void sd_lld_start(SerialDriver *sdp);

   void sd_lld_stop(SerialDriver *sdp);

 #ifdef __cplusplus

 }