mirror of
https://github.com/apache/nuttx-apps.git
synced 2026-08-01 20:29:00 +00:00
!compiler: drop CONFIG_HAVE_LONG_LONG and require long long support
The matching nuttx commit removes CONFIG_HAVE_LONG_LONG; clean up the
remaining users in nuttx-apps so that "long long" is always assumed:
- examples/noteprintf, examples/nxscope:
unconditionally exercise the %lld / long long branch.
- fsutils/mkfatfs/configfat.c:
drop the 32-bit fall-back paths in mkfatfs_nfatsect12/16/32;
always use uint64_t for the FAT-size arithmetic.
- logging/nxscope/nxscope_chan.c:
drop the CONFIG_HAVE_LONG_LONG guard around the 64-bit
sample helpers.
- netutils/ftpd, netutils/ntpclient:
always emit the 64-bit format strings.
- testing/fs/fstest/fstest_main.c:
drop the parallel 32-bit verification path; keep only the
64-bit (long long) random pattern generator.
- system/zmodem/host/nuttx/compiler.h:
remove the host-side CONFIG_HAVE_LONG_LONG stub macro.
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
parent
783957da07
commit
3adb14f12d
8 changed files with 8 additions and 88 deletions
|
|
@ -53,9 +53,7 @@ int main(int argc, FAR char *argv[])
|
|||
short s = 2;
|
||||
int i = 3;
|
||||
long l = 4;
|
||||
#ifdef CONFIG_HAVE_LONG_LONG
|
||||
long long ll = 5;
|
||||
#endif
|
||||
intmax_t im = 6;
|
||||
size_t sz = 7;
|
||||
ptrdiff_t ptr = 8;
|
||||
|
|
@ -78,9 +76,7 @@ int main(int argc, FAR char *argv[])
|
|||
sched_note_printf(NOTE_TAG_ALWAYS, "%hd", s);
|
||||
sched_note_printf(NOTE_TAG_ALWAYS, "%d", i);
|
||||
sched_note_printf(NOTE_TAG_ALWAYS, "%ld", l);
|
||||
#ifdef CONFIG_HAVE_LONG_LONG
|
||||
sched_note_printf(NOTE_TAG_ALWAYS, "%lld", ll);
|
||||
#endif
|
||||
sched_note_printf(NOTE_TAG_ALWAYS, "%jd", im);
|
||||
sched_note_printf(NOTE_TAG_ALWAYS, "%zd", sz);
|
||||
sched_note_printf(NOTE_TAG_ALWAYS, "%td", ptr);
|
||||
|
|
|
|||
|
|
@ -341,7 +341,6 @@ static FAR void *nxscope_samples_thr(FAR void *arg)
|
|||
|
||||
nxscope_put_b16(envp->nxs, 13, ftob16(-1.0f));
|
||||
|
||||
#ifdef CONFIG_HAVE_LONG_LONG
|
||||
/* Channel 14 */
|
||||
|
||||
nxscope_put_ub32(envp->nxs, 14, dtob32(1.0));
|
||||
|
|
@ -349,7 +348,6 @@ static FAR void *nxscope_samples_thr(FAR void *arg)
|
|||
/* Channel 15 */
|
||||
|
||||
nxscope_put_b32(envp->nxs, 15, dtob32(-1.0));
|
||||
#endif
|
||||
|
||||
/* Channel 16 */
|
||||
|
||||
|
|
@ -705,7 +703,6 @@ int main(int argc, FAR char *argv[])
|
|||
u.s.cri = 0;
|
||||
nxscope_chan_init(&nxs, 13, "chan13", u.u8, 1, 0);
|
||||
|
||||
#ifdef CONFIG_HAVE_LONG_LONG
|
||||
u.s.dtype = NXSCOPE_TYPE_UB32;
|
||||
u.s._res = 0;
|
||||
u.s.cri = 0;
|
||||
|
|
@ -715,7 +712,6 @@ int main(int argc, FAR char *argv[])
|
|||
u.s._res = 0;
|
||||
u.s.cri = 0;
|
||||
nxscope_chan_init(&nxs, 15, "chan15", u.u8, 1, 0);
|
||||
#endif
|
||||
|
||||
/* Vector data channel */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue