zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
gdisirio 2009-06-07 13:40:36 +00:00
parent 4fc5b696fa
commit e1ce260439
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ports/ARMCM3-STM32F103/pal_lld.h
View File

@ -198,8 +198,8 @@ typedef GPIO_TypeDef * ioportid_t;
* code. * code.
*/ */
#define pal_lld_writegroup(port, mask, offset, bits) { \ #define pal_lld_writegroup(port, mask, offset, bits) { \
(bus)->bus_portid->BSRR = ((~(bits) & (mask)) << (16 + (offset))) | \ (port)->BSRR = ((~(bits) & (mask)) << (16 + (offset))) | \
((bits) & (mask)) << (offset); \ (((bits) & (mask)) << (offset)); \
} }
/** /**
@ -207,15 +207,12 @@ typedef GPIO_TypeDef * ioportid_t;
* *
* @param[in] port the port identifier * @param[in] port the port identifier
* @param[in] pad the pad number within the port * @param[in] pad the pad number within the port
* @param[out] value the logical value, the value must be @p 0 or @p 1 * @param[out] bit the logical value, the value must be @p 0 or @p 1
* *
* @note This function is not meant to be invoked directly by the application * @note This function is not meant to be invoked directly by the application
* code. * code.
*/ */
#define pal_lld_writepad(port, pad, value) { \ #define pal_lld_writepad(port, pad, bit) pal_lld_writegroup(port, 1, pad, bit)
(bus)->bus_portid->BSRR = (((~(value) & 1) << ((pad) + 16)) | \
((((value) & 1) << (pad))); \
}
/** /**
* @brief GPIO port setup. * @brief GPIO port setup.

18
src/lib/pal.h
View File

@ -31,6 +31,16 @@
#include "pal_lld.h" #include "pal_lld.h"
#endif #endif
/**
* @brief Logical low state.
*/
#define PAL_LOW 0
/**
* @brief Logical high state.
*/
#define PAL_HIGH 1
/** /**
* @brief Port bit helper macro. * @brief Port bit helper macro.
* @details This macro calculates the mask of a bit within a port. * @details This macro calculates the mask of a bit within a port.
@ -241,7 +251,7 @@ typedef struct {
* *
* @param[in] port the port identifier * @param[in] port the port identifier
* @param[in] pad the pad number within the port * @param[in] pad the pad number within the port
* @param[out] value the logical value, the value must be @p 0 or @p 1 * @param[out] bit the logical value, the value must be @p 0 or @p 1
* *
* @note The operation is not guaranteed to be atomic on all the architectures, * @note The operation is not guaranteed to be atomic on all the architectures,
* for atomicity and/or portability reasons you may need to enclose port * for atomicity and/or portability reasons you may need to enclose port
@ -253,12 +263,12 @@ typedef struct {
* @p palWritePort(). * @p palWritePort().
*/ */
#if !defined(pal_lld_writepad) || defined(__DOXYGEN__) #if !defined(pal_lld_writepad) || defined(__DOXYGEN__)
#define palWritePad(port, pad, value) { \ #define palWritePad(port, pad, bit) { \
palWritePort(port, (palReadLatch(port) & ~PAL_PORT_BIT(pad)) | \ palWritePort(port, (palReadLatch(port) & ~PAL_PORT_BIT(pad)) | \
(((value) & 1) << pad)); \ (((bit) & 1) << pad)); \
} }
#else #else
#define palWritePad(port, pad, value) pal_lld_writepad(port, pad, value) #define palWritePad(port, pad, bit) pal_lld_writepad(port, pad, bit)
#endif #endif
/** /**