diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-20 16:19:06 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-20 16:19:06 -0600 |
| commit | 566f0495d8401cdaf7fc8bc69bb32fe5a19b2e0e (patch) | |
| tree | 657d9199912e75b82056b9ca41c9971952f32028 | |
| parent | 228de550da1c412e9194aad0f251513a0c2140d9 (diff) | |
| download | nuttx-566f0495d8401cdaf7fc8bc69bb32fe5a19b2e0e.tar.gz nuttx-566f0495d8401cdaf7fc8bc69bb32fe5a19b2e0e.tar.bz2 nuttx-566f0495d8401cdaf7fc8bc69bb32fe5a19b2e0e.zip | |
Changes to get an NxWM configuration building correctly after all of the naming changes
| -rw-r--r-- | NxWidgets/nxwm/include/cnxterm.hxx (renamed from NxWidgets/nxwm/include/cnxterm.h) | 2 | ||||
| -rw-r--r-- | NxWidgets/nxwm/src/cmediaplayer.cxx | 1 | ||||
| -rw-r--r-- | nuttx/configs/sama5d4-ek/nxwm/defconfig | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/NxWidgets/nxwm/include/cnxterm.h b/NxWidgets/nxwm/include/cnxterm.hxx index ab188f237..0b35f5449 100644 --- a/NxWidgets/nxwm/include/cnxterm.h +++ b/NxWidgets/nxwm/include/cnxterm.hxx @@ -80,7 +80,7 @@ namespace NxWM private: CTaskbar *m_taskbar; /**< Reference to the "parent" taskbar */ CApplicationWindow *m_window; /**< Reference to the application window */ - NXTERMi m_nxterm; /**< NxTerm handle */ + NXTERM m_nxterm; /**< NxTerm handle */ pid_t m_pid; /**< Task ID of the NxTerm thread */ /** diff --git a/NxWidgets/nxwm/src/cmediaplayer.cxx b/NxWidgets/nxwm/src/cmediaplayer.cxx index 32c67c807..f173fb56f 100644 --- a/NxWidgets/nxwm/src/cmediaplayer.cxx +++ b/NxWidgets/nxwm/src/cmediaplayer.cxx @@ -461,6 +461,7 @@ bool CMediaPlayer::getMediaFile(const NXWidgets::CListBoxDataItem *item) { int errcode = errno; dbg("ERROR: Could not stat file %s: %d\n", filePath, errcode); + UNUSED(errcode); // Make sure there is no previous file information diff --git a/nuttx/configs/sama5d4-ek/nxwm/defconfig b/nuttx/configs/sama5d4-ek/nxwm/defconfig index 31a7209ba..c7eca5968 100644 --- a/nuttx/configs/sama5d4-ek/nxwm/defconfig +++ b/nuttx/configs/sama5d4-ek/nxwm/defconfig @@ -417,6 +417,7 @@ CONFIG_NSH_MMCSDSLOTNO=0 # Board-Specific Options # CONFIG_SAMA5D4_MB_REVC=y +# CONFIG_SAMA5D4_MB_REVE is not set # CONFIG_SAMA5D4EK_384MHZ is not set # CONFIG_SAMA5D4EK_396MHZ is not set CONFIG_SAMA5D4EK_528MHZ=y @@ -427,6 +428,7 @@ CONFIG_SAMA5D4EK_HSMCI0_AUTOMOUNT_BLKDEV="/dev/mmcsd0" CONFIG_SAMA5D4EK_HSMCI0_AUTOMOUNT_MOUNTPOINT="/mnt/sdcard" CONFIG_SAMA5D4EK_HSMCI0_AUTOMOUNT_DDELAY=1000 CONFIG_SAMA5D4EK_HSMCI0_AUTOMOUNT_UDELAY=2000 +# CONFIG_SAMA5D4EK_ROMFS_MOUNT is not set CONFIG_SAMA5D4EK_MXT_I2CFREQUENCY=400000 CONFIG_SAMA5D4EK_MXT_DEVMINOR=0 # CONFIG_SAMA5D4EK_SLOWCLOCK is not set @@ -458,6 +460,9 @@ CONFIG_PREALLOC_TIMERS=4 # # Tasks and Scheduling # +# CONFIG_INIT_NONE is not set +CONFIG_INIT_ENTRYPOINT=y +# CONFIG_INIT_FILEPATH is not set CONFIG_USER_ENTRYPOINT="nxwm_main" CONFIG_RR_INTERVAL=200 CONFIG_TASK_NAME_SIZE=32 |