Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

(1) Fix a critical memory leak in the TCP read-ahead buffering logic; Add an option to suppress SDIO multi-block transfers in order to work around a buggy SDIO driver

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4415 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-02-23 02:07:38 +00:00
parent 95476a03ea
commit e23ce28ce7
9 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/README.txt
+3
View File
@@ -710,6 +710,9 @@ defconfig -- This is a configuration file similar to the Linux
or hardware resources are shared with other drivers. or hardware resources are shared with other drivers.
CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode. Default: CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode. Default:
4-bit transfer mode. 4-bit transfer mode.
CONFIG_MMCSD_MULTIBLOCK_DISABLE - Use only the single block transfer method.
This setting is used to work around buggy SDIO drivers that cannot handle
multiple block transfers.
SDIO-based MMC/SD driver SDIO-based MMC/SD driver
configs/stm3240g-eval/dhcpd/defconfig
+4
View File
@@ -699,6 +699,9 @@ CONFIG_FS_WRITEBUFFER=n
# Default: Medium # Default: Medium
# CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode. Default: # CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode. Default:
# 4-bit transfer mode. # 4-bit transfer mode.
# CONFIG_MMCSD_MULTIBLOCK_DISABLE - Use only the single block transfer method.
# This setting is used to work around buggy drivers that cannot handle
# multiple block transfers.
# CONFIG_MMCSD_MMCSUPPORT # CONFIG_MMCSD_MMCSUPPORT
# Enable support for MMC cards # Enable support for MMC cards
# CONFIG_MMCSD_HAVECARDDETECT # CONFIG_MMCSD_HAVECARDDETECT
@@ -708,6 +711,7 @@ CONFIG_SDIO_DMA=n
#CONFIG_SDIO_PRI=128 #CONFIG_SDIO_PRI=128
#CONFIG_SDIO_DMAPRIO #CONFIG_SDIO_DMAPRIO
#CONFIG_SDIO_WIDTH_D1_ONLY #CONFIG_SDIO_WIDTH_D1_ONLY
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_MMCSUPPORT=n CONFIG_MMCSD_MMCSUPPORT=n
CONFIG_MMCSD_HAVECARDDETECT=n CONFIG_MMCSD_HAVECARDDETECT=n
configs/stm3240g-eval/nettest/defconfig
+4
View File
@@ -699,6 +699,9 @@ CONFIG_FS_WRITEBUFFER=n
# Default: Medium # Default: Medium
# CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode. Default: # CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode. Default:
# 4-bit transfer mode. # 4-bit transfer mode.
# CONFIG_MMCSD_MULTIBLOCK_DISABLE - Use only the single block transfer method.
# This setting is used to work around buggy drivers that cannot handle
# multiple block transfers.
# CONFIG_MMCSD_MMCSUPPORT # CONFIG_MMCSD_MMCSUPPORT
# Enable support for MMC cards # Enable support for MMC cards
# CONFIG_MMCSD_HAVECARDDETECT # CONFIG_MMCSD_HAVECARDDETECT
@@ -708,6 +711,7 @@ CONFIG_SDIO_DMA=n
#CONFIG_SDIO_PRI=128 #CONFIG_SDIO_PRI=128
#CONFIG_SDIO_DMAPRIO #CONFIG_SDIO_DMAPRIO
#CONFIG_SDIO_WIDTH_D1_ONLY #CONFIG_SDIO_WIDTH_D1_ONLY
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_MMCSUPPORT=n CONFIG_MMCSD_MMCSUPPORT=n
CONFIG_MMCSD_HAVECARDDETECT=n CONFIG_MMCSD_HAVECARDDETECT=n
configs/stm3240g-eval/nsh/defconfig
+5 -1
View File
@@ -776,6 +776,9 @@ CONFIG_FS_WRITEBUFFER=n
# Default: Medium # Default: Medium
# CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode. Default: # CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode. Default:
# 4-bit transfer mode. # 4-bit transfer mode.
# CONFIG_MMCSD_MULTIBLOCK_DISABLE - Use only the single block transfer method.
# This setting is used to work around buggy drivers that cannot handle
# multiple block transfers.
# CONFIG_MMCSD_MMCSUPPORT # CONFIG_MMCSD_MMCSUPPORT
# Enable support for MMC cards # Enable support for MMC cards
# CONFIG_MMCSD_HAVECARDDETECT # CONFIG_MMCSD_HAVECARDDETECT
@@ -785,6 +788,7 @@ CONFIG_SDIO_DMA=n
#CONFIG_SDIO_PRI=128 #CONFIG_SDIO_PRI=128
#CONFIG_SDIO_DMAPRIO #CONFIG_SDIO_DMAPRIO
#CONFIG_SDIO_WIDTH_D1_ONLY #CONFIG_SDIO_WIDTH_D1_ONLY
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_MMCSUPPORT=n CONFIG_MMCSD_MMCSUPPORT=n
CONFIG_MMCSD_HAVECARDDETECT=n CONFIG_MMCSD_HAVECARDDETECT=n
@@ -876,7 +880,7 @@ CONFIG_NET_RESOLV_ENTRIES=4
# CONFIG_DISABLE_PTHREAD - pthread support is required # CONFIG_DISABLE_PTHREAD - pthread support is required
# CONFIG_DISABLE_POLL - poll() support is required # CONFIG_DISABLE_POLL - poll() support is required
# #
CONFIG_FTPD_CMDBUFFERSIZE=512 CONFIG_FTPD_CMDBUFFERSIZE=2048
# #
# RTC Configuration # RTC Configuration
configs/stm3240g-eval/nsh2/defconfig
+5 -1
View File
@@ -777,6 +777,9 @@ CONFIG_FS_WRITEBUFFER=n
# Default: Medium # Default: Medium
# CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode. Default: # CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode. Default:
# 4-bit transfer mode. # 4-bit transfer mode.
# CONFIG_MMCSD_MULTIBLOCK_DISABLE - Use only the single block transfer method.
# This setting is used to work around buggy drivers that cannot handle
# multiple block transfers.
# CONFIG_MMCSD_MMCSUPPORT # CONFIG_MMCSD_MMCSUPPORT
# Enable support for MMC cards # Enable support for MMC cards
# CONFIG_MMCSD_HAVECARDDETECT # CONFIG_MMCSD_HAVECARDDETECT
@@ -786,6 +789,7 @@ CONFIG_SDIO_DMA=y
#CONFIG_SDIO_PRI=128 #CONFIG_SDIO_PRI=128
#CONFIG_SDIO_DMAPRIO #CONFIG_SDIO_DMAPRIO
#CONFIG_SDIO_WIDTH_D1_ONLY #CONFIG_SDIO_WIDTH_D1_ONLY
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_MMCSUPPORT=n CONFIG_MMCSD_MMCSUPPORT=n
CONFIG_MMCSD_HAVECARDDETECT=n CONFIG_MMCSD_HAVECARDDETECT=n
@@ -877,7 +881,7 @@ CONFIG_NET_RESOLV_ENTRIES=4
# CONFIG_DISABLE_PTHREAD - pthread support is required # CONFIG_DISABLE_PTHREAD - pthread support is required
# CONFIG_DISABLE_POLL - poll() support is required # CONFIG_DISABLE_POLL - poll() support is required
# #
CONFIG_FTPD_CMDBUFFERSIZE=512 CONFIG_FTPD_CMDBUFFERSIZE=2048
# #
# RTC Configuration # RTC Configuration
configs/stm3240g-eval/ostest/defconfig
+4
View File
@@ -687,6 +687,9 @@ CONFIG_FS_WRITEBUFFER=n
# Default: Medium # Default: Medium
# CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode. Default: # CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode. Default:
# 4-bit transfer mode. # 4-bit transfer mode.
# CONFIG_MMCSD_MULTIBLOCK_DISABLE - Use only the single block transfer method.
# This setting is used to work around buggy drivers that cannot handle
# multiple block transfers.
# CONFIG_MMCSD_MMCSUPPORT # CONFIG_MMCSD_MMCSUPPORT
# Enable support for MMC cards # Enable support for MMC cards
# CONFIG_MMCSD_HAVECARDDETECT # CONFIG_MMCSD_HAVECARDDETECT
@@ -696,6 +699,7 @@ CONFIG_SDIO_DMA=n
#CONFIG_SDIO_PRI=128 #CONFIG_SDIO_PRI=128
#CONFIG_SDIO_DMAPRIO #CONFIG_SDIO_DMAPRIO
#CONFIG_SDIO_WIDTH_D1_ONLY #CONFIG_SDIO_WIDTH_D1_ONLY
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_MMCSUPPORT=n CONFIG_MMCSD_MMCSUPPORT=n
CONFIG_MMCSD_HAVECARDDETECT=n CONFIG_MMCSD_HAVECARDDETECT=n
configs/stm3240g-eval/telnetd/defconfig
+4
View File
@@ -699,6 +699,9 @@ CONFIG_FS_WRITEBUFFER=n
# Default: Medium # Default: Medium
# CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode. Default: # CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode. Default:
# 4-bit transfer mode. # 4-bit transfer mode.
# CONFIG_MMCSD_MULTIBLOCK_DISABLE - Use only the single block transfer method.
# This setting is used to work around buggy drivers that cannot handle
# multiple block transfers.
# CONFIG_MMCSD_MMCSUPPORT # CONFIG_MMCSD_MMCSUPPORT
# Enable support for MMC cards # Enable support for MMC cards
# CONFIG_MMCSD_HAVECARDDETECT # CONFIG_MMCSD_HAVECARDDETECT
@@ -708,6 +711,7 @@ CONFIG_SDIO_DMA=n
#CONFIG_SDIO_PRI=128 #CONFIG_SDIO_PRI=128
#CONFIG_SDIO_DMAPRIO #CONFIG_SDIO_DMAPRIO
#CONFIG_SDIO_WIDTH_D1_ONLY #CONFIG_SDIO_WIDTH_D1_ONLY
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_MMCSUPPORT=n CONFIG_MMCSD_MMCSUPPORT=n
CONFIG_MMCSD_HAVECARDDETECT=n CONFIG_MMCSD_HAVECARDDETECT=n
configs/stm32f4discovery/nsh/defconfig
+4
View File
@@ -706,6 +706,9 @@ CONFIG_FS_WRITEBUFFER=n
# Default: Medium # Default: Medium
# CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode. Default: # CONFIG_SDIO_WIDTH_D1_ONLY - Select 1-bit transfer mode. Default:
# 4-bit transfer mode. # 4-bit transfer mode.
# CONFIG_MMCSD_MULTIBLOCK_DISABLE - Use only the single block transfer method.
# This setting is used to work around buggy drivers that cannot handle
# multiple block transfers.
# CONFIG_MMCSD_MMCSUPPORT # CONFIG_MMCSD_MMCSUPPORT
# Enable support for MMC cards # Enable support for MMC cards
# CONFIG_MMCSD_HAVECARDDETECT # CONFIG_MMCSD_HAVECARDDETECT
@@ -715,6 +718,7 @@ CONFIG_SDIO_DMA=n
#CONFIG_SDIO_PRI=128 #CONFIG_SDIO_PRI=128
#CONFIG_SDIO_DMAPRIO #CONFIG_SDIO_DMAPRIO
#CONFIG_SDIO_WIDTH_D1_ONLY #CONFIG_SDIO_WIDTH_D1_ONLY
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_MMCSUPPORT=n CONFIG_MMCSD_MMCSUPPORT=n
CONFIG_MMCSD_HAVECARDDETECT=n CONFIG_MMCSD_HAVECARDDETECT=n
configs/stm32f4discovery/ostest/defconfig
+4
View File
@@ -672,12 +672,16 @@ CONFIG_FS_WRITEBUFFER=n
# #
# CONFIG_SDIO_DMA # CONFIG_SDIO_DMA
# SDIO driver supports DMA # SDIO driver supports DMA
# CONFIG_MMCSD_MULTIBLOCK_DISABLE - Use only the single block transfer method.
# This setting is used to work around buggy drivers that cannot handle
# multiple block transfers.
# CONFIG_MMCSD_MMCSUPPORT # CONFIG_MMCSD_MMCSUPPORT
# Enable support for MMC cards # Enable support for MMC cards
# CONFIG_MMCSD_HAVECARDDETECT # CONFIG_MMCSD_HAVECARDDETECT
# SDIO driver card detection is 100% accurate # SDIO driver card detection is 100% accurate
# #
CONFIG_SDIO_DMA=n CONFIG_SDIO_DMA=n
CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
CONFIG_MMCSD_MMCSUPPORT=n CONFIG_MMCSD_MMCSUPPORT=n
CONFIG_MMCSD_HAVECARDDETECT=n CONFIG_MMCSD_HAVECARDDETECT=n