diff options
| -rw-r--r-- | nuttx/arch/x86/src/qemu/qemu_fullcontextrestore.S | 4 | ||||
| -rwxr-xr-x | nuttx/configs/vsn/nsh/defconfig | 2 | ||||
| -rw-r--r-- | nuttx/configs/vsn/src/ramtron.c | 15 | ||||
| -rw-r--r-- | nuttx/configs/vsn/src/sdcard.c | 12 |
4 files changed, 13 insertions, 20 deletions
diff --git a/nuttx/arch/x86/src/qemu/qemu_fullcontextrestore.S b/nuttx/arch/x86/src/qemu/qemu_fullcontextrestore.S index 0396753f7..6f15662dd 100644 --- a/nuttx/arch/x86/src/qemu/qemu_fullcontextrestore.S +++ b/nuttx/arch/x86/src/qemu/qemu_fullcontextrestore.S @@ -115,8 +115,6 @@ up_fullcontextrestore: push %ebx movl (4*REG_EAX)(%eax), %ebx push %ebx - movl (4*REG_EBX)(%eax), %ebx - push %ebx /* Now restore the remaining registers */ @@ -125,6 +123,7 @@ up_fullcontextrestore: movl (4*REG_EBP)(%eax), %ebp movl (4*REG_EDX)(%eax), %edx movl (4*REG_ECX)(%eax), %ecx + movl (4*REG_EBX)(%eax), %ebx /* Restore the segment registers */ @@ -134,7 +133,6 @@ up_fullcontextrestore: /* Restore the correct value of EAX, EBX, and the EFLAGS then return */ - popl %ebx popl %eax popf ret diff --git a/nuttx/configs/vsn/nsh/defconfig b/nuttx/configs/vsn/nsh/defconfig index 0f1d946b5..7842e5213 100755 --- a/nuttx/configs/vsn/nsh/defconfig +++ b/nuttx/configs/vsn/nsh/defconfig @@ -345,7 +345,7 @@ CONFIG_JULIAN_TIME=n CONFIG_DEV_CONSOLE=y CONFIG_DEV_LOWCONSOLE=n CONFIG_MUTEX_TYPES=n -CONFIG_PRIORITY_INHERITANCE=n +CONFIG_PRIORITY_INHERITANCE=y CONFIG_SEM_PREALLOCHOLDERS=0 CONFIG_SEM_NNESTPRIO=0 CONFIG_FDCLONE_DISABLE=n diff --git a/nuttx/configs/vsn/src/ramtron.c b/nuttx/configs/vsn/src/ramtron.c index 545289f7c..24f43d0ff 100644 --- a/nuttx/configs/vsn/src/ramtron.c +++ b/nuttx/configs/vsn/src/ramtron.c @@ -62,26 +62,25 @@ int up_ramtron(void) /* Get the SPI port */ - message("nsh_archinitialize: Initializing SPI port 3\n"); spi = up_spiinitialize(3); if (!spi) { - message("nsh_archinitialize: Failed to initialize SPI port 3\n"); + message("RAMTRON: Failed to initialize SPI3\n"); 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); 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; } - 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); - message("FTL returned with %d\n", retval); + retval = ftl_initialize(0, NULL, mtd); + message("RAMTRON: FTL Initialized (returns with %d)\n", retval); #endif return OK; } diff --git a/nuttx/configs/vsn/src/sdcard.c b/nuttx/configs/vsn/src/sdcard.c index 3b20913df..367e4150b 100644 --- a/nuttx/configs/vsn/src/sdcard.c +++ b/nuttx/configs/vsn/src/sdcard.c @@ -86,27 +86,23 @@ int up_sdcard(void) /* 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); if (!sdio) { - message("nsh_archinitialize: Failed to initialize SDIO slot %d\n", - CONFIG_EXAMPLES_NSH_MMCSDSLOTNO); + message("SDIO: Failed to initialize slot %d\n", CONFIG_EXAMPLES_NSH_MMCSDSLOTNO); return -ENODEV; } + message("SDIO: Initialized slot %d\n", CONFIG_EXAMPLES_NSH_MMCSDSLOTNO); /* 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); 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; } - 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 * see if the VSN board supports a GPIO to detect if there is a card in |