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/src | |
| 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/src')
| -rw-r--r-- | os/hal/src/pal.c | 2 | ||||
| -rw-r--r-- | os/hal/src/sdc.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/os/hal/src/pal.c b/os/hal/src/pal.c index 534935a55..10e57e284 100644 --- a/os/hal/src/pal.c +++ b/os/hal/src/pal.c @@ -110,7 +110,7 @@ void palWriteBus(IOBus *bus, ioportmask_t bits) { *
* @api
*/
-void palSetBusMode(IOBus *bus, uint_fast8_t mode) {
+void palSetBusMode(IOBus *bus, iomode_t mode) {
chDbgCheck((bus != NULL) &&
(bus->offset < PAL_IOPORTS_WIDTH), "palSetBusMode");
diff --git a/os/hal/src/sdc.c b/os/hal/src/sdc.c index 283a0ee75..59d7db005 100644 --- a/os/hal/src/sdc.c +++ b/os/hal/src/sdc.c @@ -184,7 +184,7 @@ bool_t sdcConnect(SDCDriver *sdcp) { /* V2.0 cards detection.*/
if (!sdc_lld_send_cmd_short_crc(sdcp, SDC_CMD_SEND_IF_COND,
- SDC_CMD8_PATTERN, resp))
+ SDC_CMD8_PATTERN, resp)) {
sdcp->cardmode = SDC_MODE_CARDTYPE_SDV20;
/* Voltage verification.*/
if (((resp[0] >> 8) & 0xF) != 1)
@@ -192,6 +192,7 @@ bool_t sdcConnect(SDCDriver *sdcp) { if (sdc_lld_send_cmd_short_crc(sdcp, SDC_CMD_APP_CMD, 0, resp) ||
SDC_R1_ERROR(resp[0]))
goto failed;
+ }
else {
#if SDC_MMC_SUPPORT
/* MMC or SD V1.1 detection.*/
|