diff options
| author | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-07-13 21:09:39 +0000 |
|---|---|---|
| committer | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-07-13 21:09:39 +0000 |
| commit | 5fee9bc344b38d79ff1baf26e6365eeae7d407b5 (patch) | |
| tree | cd03f7ccbdf0a44026bc0f80b6fc87b9a6d361d0 /os/hal/platforms/AT91SAM7 | |
| parent | 2bdd9885e282b8cf26642f4a4b73fc4e61da872c (diff) | |
| parent | 2e5abeebad5e94989f62e05582028f02c5e71dda (diff) | |
| download | ChibiOS-5fee9bc344b38d79ff1baf26e6365eeae7d407b5.tar.gz ChibiOS-5fee9bc344b38d79ff1baf26e6365eeae7d407b5.tar.bz2 ChibiOS-5fee9bc344b38d79ff1baf26e6365eeae7d407b5.zip | |
I2C. Merged changes from trunk.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@3160 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/platforms/AT91SAM7')
| -rw-r--r-- | os/hal/platforms/AT91SAM7/pal_lld.c | 2 | ||||
| -rw-r--r-- | os/hal/platforms/AT91SAM7/pal_lld.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/os/hal/platforms/AT91SAM7/pal_lld.c b/os/hal/platforms/AT91SAM7/pal_lld.c index 0e2136da1..5422756ac 100644 --- a/os/hal/platforms/AT91SAM7/pal_lld.c +++ b/os/hal/platforms/AT91SAM7/pal_lld.c @@ -123,7 +123,7 @@ void _pal_lld_setgroupmode(ioportid_t port, ioportmask_t mask,
uint_fast8_t mode) {
- switch (mode & PAL_MODE_MASK) {
+ switch (mode) {
case PAL_MODE_RESET:
case PAL_MODE_INPUT_PULLUP:
port->PIO_PPUER = mask;
diff --git a/os/hal/platforms/AT91SAM7/pal_lld.h b/os/hal/platforms/AT91SAM7/pal_lld.h index 9c5796a40..7aeb3b933 100644 --- a/os/hal/platforms/AT91SAM7/pal_lld.h +++ b/os/hal/platforms/AT91SAM7/pal_lld.h @@ -87,6 +87,11 @@ typedef struct { typedef uint32_t ioportmask_t;
/**
+ * @brief Digital I/O modes.
+ */
+typedef uint32_t iomode_t;
+
+/**
* @brief Port Identifier.
* @details This type can be a scalar or some kind of pointer, do not make
* any assumption about it, use the provided macros when populating
|