diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-02-20 20:02:53 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-02-20 20:02:53 +0000 |
| commit | e6245a246845ad83452e02223beab432b479990d (patch) | |
| tree | 1b5480fa99de7eede290abe9fb58c1b15807803f /nuttx/drivers | |
| parent | 56959ae057f6711bdd709758b798e64489e8af60 (diff) | |
| download | px4-nuttx-e6245a246845ad83452e02223beab432b479990d.tar.gz px4-nuttx-e6245a246845ad83452e02223beab432b479990d.tar.bz2 px4-nuttx-e6245a246845ad83452e02223beab432b479990d.zip | |
Various STM32 SDIO and DMA fixes (SDIO DMA still does not work)
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4406 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers')
| -rw-r--r-- | nuttx/drivers/mmcsd/mmcsd_sdio.c | 4 | ||||
| -rw-r--r-- | nuttx/drivers/ramlog.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/nuttx/drivers/mmcsd/mmcsd_sdio.c b/nuttx/drivers/mmcsd/mmcsd_sdio.c index b30610ca5..09c4efedf 100644 --- a/nuttx/drivers/mmcsd/mmcsd_sdio.c +++ b/nuttx/drivers/mmcsd/mmcsd_sdio.c @@ -1,8 +1,8 @@ /**************************************************************************** * drivers/mmcsd/mmcsd_sdio.c * - * Copyright (C) 2009-2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Copyright (C) 2009-2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/nuttx/drivers/ramlog.c b/nuttx/drivers/ramlog.c index e3cd057a7..c6bb07b15 100644 --- a/nuttx/drivers/ramlog.c +++ b/nuttx/drivers/ramlog.c @@ -484,11 +484,14 @@ static ssize_t ramlog_write(FAR struct file *filep, FAR const char *buffer, size #if !defined(CONFIG_RAMLOG_NONBLOCKING) || !defined(CONFIG_DISABLE_POLL) if (nwritten > 0) { + irqstate_t flags; +#ifndef CONFIG_RAMLOG_NONBLOCKING int i; +#endif /* Are there threads waiting for read data? */ - irqstate_t flags = irqsave(); + flags = irqsave(); #ifndef CONFIG_RAMLOG_NONBLOCKING for (i = 0; i < priv->rl_nwaiters; i++) { |