Added abstract port setup to PAL and to the MSP430 port.

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

2 files changed, 221 insertions, 11 deletions

diff --git a/ports/MSP430/pal_lld.c b/ports/MSP430/pal_lld.c
new file mode 100644
index 000000000..a81b152c8
--- /dev/null
+++ b/ports/MSP430/pal_lld.c
@@ -0,0 +1,113 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.

+

+    This file is part of ChibiOS/RT.

+

+    ChibiOS/RT is free software; you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation; either version 3 of the License, or

+    (at your option) any later version.

+

+    ChibiOS/RT is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

+*/

+

+/**

+ * @file ports/MSP430/pal_lld.c

+ * @brief MSP430 Digital I/O low level driver code

+ * @addtogroup MSP430_PAL

+ * @{

+ */

+

+#include <ch.h>

+#include <pal.h>

+

+/**

+ * @brief MSP430 I/O ports configuration.

+ *

+ * @param[in] the MSP430 ports configuration

+ *

+ * @note The @p PxIFG, @p PxIE and @p PxSEL registers are cleared. @p PxOUT

+ *       and @p PxDIR are configured as specified.

+ */

+void _pal_lld_init(const MSP430DIOConfig *config) {

+

+#if defined(__MSP430_HAS_PORT1__) || defined(__MSP430_HAS_PORT1_R__)

+  IOPORT_A->iop_full.ie.reg_p = 0;

+  IOPORT_A->iop_full.ifg.reg_p = 0;

+  IOPORT_A->iop_full.sel.reg_p = 0;

+  IOPORT_A->iop_common.out = config->P1Data.out;

+  IOPORT_A->iop_common.dir = config->P1Data.dir;

+#endif

+

+#if defined(__MSP430_HAS_PORT2__) || defined(__MSP430_HAS_PORT2_R__)

+  IOPORT_B->iop_full.ie.reg_p = 0;

+  IOPORT_B->iop_full.ifg.reg_p = 0;

+  IOPORT_B->iop_full.sel.reg_p = 0;

+  IOPORT_B->iop_common.out = config->P2Data.out;

+  IOPORT_B->iop_common.dir = config->P2Data.dir;

+#endif

+

+#if defined(__MSP430_HAS_PORT3__) || defined(__MSP430_HAS_PORT3_R__)

+  IOPORT_C->iop_simple.sel.reg_p = 0;

+  IOPORT_C->iop_common.out = config->P3Data.out;

+  IOPORT_C->iop_common.dir = config->P3Data.dir;

+#endif

+

+#if defined(__MSP430_HAS_PORT4__) || defined(__MSP430_HAS_PORT4_R__)

+  IOPORT_D->iop_simple.sel.reg_p = 0;

+  IOPORT_D->iop_common.out = config->P4Data.out;

+  IOPORT_D->iop_common.dir = config->P4Data.dir;

+#endif

+

+#if defined(__MSP430_HAS_PORT5__) || defined(__MSP430_HAS_PORT5_R__)

+  IOPORT_E->iop_simple.sel.reg_p = 0;

+  IOPORT_E->iop_common.out = config->P5Data.out;

+  IOPORT_E->iop_common.dir = config->P5Data.dir;

+#endif

+

+#if defined(__MSP430_HAS_PORT6__) || defined(__MSP430_HAS_PORT6_R__)

+  IOPORT_F->iop_simple.sel.reg_p = 0;

+  IOPORT_F->iop_common.out = config->P6Data.out;

+  IOPORT_F->iop_common.dir = config->P6Data.dir;

+#endif

+}

+

+/**

+ * @brief Pads mode setup.

+ * @details This function programs a pads group belonging to the same port

+ *          with the specified mode.

+ *

+ * @param[in] port the port identifier

+ * @param[in] mask the group mask

+ * @param[in] mode the setup mode

+ *

+ * @note This function is not meant to be invoked directly by the application

+ *       code.

+ * @note @p PAL_MODE_UNCONNECTED is implemented as output as recommended by

+ *       the MSP430x1xx Family User's Guide. Unconnected pads are set to

+ *       high logic state by default.

+ * @note This function does not alter the @p PxSEL registers. Alternate

+ *       functions setup must be handled by device-specific code.

+ */

+void _pal_lld_setmode(ioportid_t port, ioportmask_t mask, uint_fast8_t mode) {

+

+  switch (mode) {

+  case PAL_MODE_RESET:

+  case PAL_MODE_INPUT:

+    port->iop_common.dir.reg_p &= ~mask;

+    break;

+  case PAL_MODE_UNCONNECTED:

+    port->iop_common.out.reg_p |= mask;

+  case PAL_MODE_OUTPUT_PUSHPULL:

+    port->iop_common.dir.reg_p |= mask;

+    break;

+  }

+}

+

+/** @} */

diff --git a/ports/MSP430/pal_lld.h b/ports/MSP430/pal_lld.h
index cf8a8a62f..940d3f7bd 100644
--- a/ports/MSP430/pal_lld.h
+++ b/ports/MSP430/pal_lld.h
@@ -19,7 +19,7 @@
 

 /**

  * @file ports/MSP430/pal_lld.h

- * @brief MSP430 Digital I/O low level driver

+ * @brief MSP430 Digital I/O low level driver header

  * @addtogroup MSP430_PAL

  * @{

  */

@@ -30,28 +30,103 @@
 #include <msp430x16x.h>

 

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

+/* Unsupported modes and specific modes                                      */

+/*===========================================================================*/

+

+#undef PAL_MODE_INPUT_PULLUP

+#undef PAL_MODE_INPUT_PULLDOWN

+#undef PAL_MODE_OUTPUT_OPENDRAIN

+

+/*===========================================================================*/

 /* I/O Ports Types and constants.                                            */

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

 

 /**

+ * @brief Simplified MSP430 I/O port representation.

+ * @details This structure represents the common part of all the MSP430 I/O

+ *          ports.
+ */

+struct port_common_t {

+  ioregister_t  in;

+  ioregister_t  out;

+  ioregister_t  dir;

+};

+

+/**

  * @brief Generic MSP430 I/O port.
  */

 union __ioport {

-  struct {

-    ioregister_t  in;

-    ioregister_t  out;

-    ioregister_t  dir;

-  } iop_common;

+  struct port_common_t iop_common;

   struct port_simple_t iop_simple;

   struct port_full_t iop_full;

 };

 

 /**

+ * @brief Setup registers common to all the MSP430 ports.
+ */

+struct port_setup_t {

+  ioregister_t  out;

+  ioregister_t  dir;

+};

+

+/**

+ * @brief MSP430 I/O ports static initializer.

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

+ *          system startup time in order to initialized the digital I/O

+ *          subsystem. This represents only the initial setup, specific pads

+ *          or whole ports can be reprogrammed at later time.
+ */

+typedef struct {

+#if defined(__MSP430_HAS_PORT1__) ||                                    \

+    defined(__MSP430_HAS_PORT1_R__) ||                                  \

+    defined(__DOXYGEN__)

+  /** @brief Port 1 setup data.*/

+  struct port_setup_t   P1Data;

+#endif

+#if defined(__MSP430_HAS_PORT2__) ||                                    \

+    defined(__MSP430_HAS_PORT2_R__) ||                                  \

+    defined(__DOXYGEN__)

+  /** @brief Port 2 setup data.*/

+  struct port_setup_t   P2Data;

+#endif

+#if defined(__MSP430_HAS_PORT3__) ||                                    \

+    defined(__MSP430_HAS_PORT3_R__) ||                                  \

+    defined(__DOXYGEN__)

+  /** @brief Port 3 setup data.*/

+  struct port_setup_t   P3Data;

+#endif

+#if defined(__MSP430_HAS_PORT4__) ||                                    \

+    defined(__MSP430_HAS_PORT4_R__) ||                                  \

+    defined(__DOXYGEN__)

+  /** @brief Port 4 setup data.*/

+  struct port_setup_t   P4Data;

+#endif

+#if defined(__MSP430_HAS_PORT5__) ||                                    \

+    defined(__MSP430_HAS_PORT5_R__) ||                                  \

+    defined(__DOXYGEN__)

+  /** @brief Port 5 setup data.*/

+  struct port_setup_t   P5Data;

+#endif

+#if defined(__MSP430_HAS_PORT6__) ||                                    \

+    defined(__MSP430_HAS_PORT6_R__) ||                                  \

+    defined(__DOXYGEN__)

+  /** @brief Port 6 setup data.*/

+  struct port_setup_t   P6Data;

+#endif

+} MSP430DIOConfig;

+

+/**

  * @brief Width, in bits, of an I/O port.
  */

 #define PAL_IOPORTS_WIDTH 8

 

 /**

+ * @brief Whole port mask.

+ * @brief This macro specifies all the valid bits into a port.

+ */

+#define PAL_WHOLE_PORT ((ioportmask_t)0xFF)

+

+/**

  * @brief Digital I/O port sized unsigned type.
  */

 typedef uint8_t ioportmask_t;

@@ -135,8 +210,11 @@ typedef union __ioport * ioportid_t;
 

 /**

  * @brief Low level PAL subsystem initialization.

+ * @details In MSP430 programs all the ports as input.

+ *

+ * @param[in] the MSP430 ports configuration

  */

-#define pal_lld_init()

+#define pal_lld_init(config) _pal_lld_init(config)

 

 /**

  * @brief Reads the physical I/O port states.

@@ -180,12 +258,31 @@ typedef union __ioport * ioportid_t;
 }

 

 /**

- * @brief Set pins direction.

- * @details This function programs the pins direction within a port.

+ * @brief Pads mode setup.

+ * @details This function programs a pads group belonging to the same port

+ *          with the specified mode.

+ *

+ * @param[in] port the port identifier

+ * @param[in] mask the group mask

+ * @param[in] mode the setup mode

+ *

+ * @note This function is not meant to be invoked directly by the application

+ *       code.

+ * @note @p PAL_MODE_UNCONNECTED is implemented as output as recommended by

+ *       the MSP430x1xx Family User's Guide.

+ * @note This function does not alter the @p PxSEL registers. Alternate

+ *       functions setup must be handled by device-specific code.

  */

-#define pal_lld_msp430_set_direction(port, dirmask) {                   \

-  (port)->iop_common.dir.reg_p = (dirmask);                             \

+#define pal_lld_setmode(port, mask, mode) _pal_lld_setmode(port, mask, mode)

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+  void _pal_lld_init(const MSP430DIOConfig *config);

+  void _pal_lld_setmode(ioportid_t port, ioportmask_t mask, uint_fast8_t mode);

+#ifdef __cplusplus

 }

+#endif

 

 #endif /* _PAL_LLD_H_ */