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

Some VSN changes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3354 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2011-03-09 02:44:30 +00:00
parent 8c4356ac9d
commit a60051cb30
4 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/x86/src/qemu/qemu_fullcontextrestore.S
+1 -3
View File
@@ -115,8 +115,6 @@ up_fullcontextrestore:
push %ebx push %ebx
movl (4*REG_EAX)(%eax), %ebx movl (4*REG_EAX)(%eax), %ebx
push %ebx push %ebx
movl (4*REG_EBX)(%eax), %ebx
push %ebx
/* Now restore the remaining registers */ /* Now restore the remaining registers */
@@ -125,6 +123,7 @@ up_fullcontextrestore:
movl (4*REG_EBP)(%eax), %ebp movl (4*REG_EBP)(%eax), %ebp
movl (4*REG_EDX)(%eax), %edx movl (4*REG_EDX)(%eax), %edx
movl (4*REG_ECX)(%eax), %ecx movl (4*REG_ECX)(%eax), %ecx
movl (4*REG_EBX)(%eax), %ebx
/* Restore the segment registers */ /* Restore the segment registers */
@@ -134,7 +133,6 @@ up_fullcontextrestore:
/* Restore the correct value of EAX, EBX, and the EFLAGS then return */ /* Restore the correct value of EAX, EBX, and the EFLAGS then return */
popl %ebx
popl %eax popl %eax
popf popf
ret ret
configs/vsn/nsh/defconfig
+1 -1
View File
@@ -345,7 +345,7 @@ CONFIG_JULIAN_TIME=n
CONFIG_DEV_CONSOLE=y CONFIG_DEV_CONSOLE=y
CONFIG_DEV_LOWCONSOLE=n CONFIG_DEV_LOWCONSOLE=n
CONFIG_MUTEX_TYPES=n CONFIG_MUTEX_TYPES=n
CONFIG_PRIORITY_INHERITANCE=n CONFIG_PRIORITY_INHERITANCE=y
CONFIG_SEM_PREALLOCHOLDERS=0 CONFIG_SEM_PREALLOCHOLDERS=0
CONFIG_SEM_NNESTPRIO=0 CONFIG_SEM_NNESTPRIO=0
CONFIG_FDCLONE_DISABLE=n CONFIG_FDCLONE_DISABLE=n
configs/vsn/src/ramtron.c
+7 -8
View File
@@ -62,26 +62,25 @@ int up_ramtron(void)
/* Get the SPI port */ /* Get the SPI port */
message("nsh_archinitialize: Initializing SPI port 3\n");
spi = up_spiinitialize(3); spi = up_spiinitialize(3);
if (!spi) if (!spi)
{ {
message("nsh_archinitialize: Failed to initialize SPI port 3\n"); message("RAMTRON: Failed to initialize SPI3\n");
return -ENODEV; return -ENODEV;
} }
message("nsh_archinitialize: Successfully initialized SPI port 3\n"); message("RAMTRON: Initialized SPI3\n");
message("nsh_archinitialize: Bind SPI to the SPI flash driver\n");
mtd = ramtron_initialize(spi); mtd = ramtron_initialize(spi);
if (!mtd) if (!mtd)
{ {
message("nsh_archinitialize: Failed to bind SPI port 0 to the SPI FLASH driver\n"); message("RAMTRON: Device not found\n");
return -ENODEV; return -ENODEV;
} }
message("nsh_archinitialize: Successfully bound SPI port 0 to the SPI FLASH driver\n"); message("RAMTRON: FM25V10 of size 128 kB\n");
//message("RAMTRON: %s of size %d B\n", ramtron_getpart(mtd), ramtron_getsize(mtd) );
retval = ftl_initialize(0,NULL, mtd); retval = ftl_initialize(0, NULL, mtd);
message("FTL returned with %d\n", retval); message("RAMTRON: FTL Initialized (returns with %d)\n", retval);
#endif #endif
return OK; return OK;
} }
configs/vsn/src/sdcard.c
+4 -8
View File
@@ -86,27 +86,23 @@ int up_sdcard(void)
/* First, get an instance of the SDIO interface */ /* First, get an instance of the SDIO interface */
message("nsh_archinitialize: Initializing SDIO slot %d\n",
CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
sdio = sdio_initialize(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO); sdio = sdio_initialize(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
if (!sdio) if (!sdio)
{ {
message("nsh_archinitialize: Failed to initialize SDIO slot %d\n", message("SDIO: Failed to initialize slot %d\n", CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
return -ENODEV; return -ENODEV;
} }
message("SDIO: Initialized slot %d\n", CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
/* Now bind the SPI interface to the MMC/SD driver */ /* Now bind the SPI interface to the MMC/SD driver */
message("nsh_archinitialize: Bind SDIO to the MMC/SD driver, minor=%d\n",
CONFIG_EXAMPLES_NSH_MMCSDMINOR);
ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, sdio); ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, sdio);
if (ret != OK) if (ret != OK)
{ {
message("nsh_archinitialize: Failed to bind SDIO to the MMC/SD driver: %d\n", ret); message("SDIO: Failed to bind to the MMC/SD driver: %d\n", ret);
return ret; return ret;
} }
message("nsh_archinitialize: Successfully bound SDIO to the MMC/SD driver\n"); message("SDIO: Successfully bound to the MMC/SD driver\n");
/* Then let's guess and say that there is a card in the slot. I need to check to /* Then let's guess and say that there is a card in the slot. I need to check to
* see if the VSN board supports a GPIO to detect if there is a card in * see if the VSN board supports a GPIO to detect if there is a card in