yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

boards:Use inttypes

Browse Source 
nxp_ucans32k146:Fix constant

spracing_h7extreme:Use inttypes
This commit is contained in:
David Sidrane
2021-04-20 13:07:00 -07:00
committed by Julian Oes
parent 84dd8839a2
commit 62fd132047
16 changed files with 91 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
boards/holybro/can-gps-v1/src/manifest.c
View File

@@ -49,6 +49,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <board_config.h> #include <board_config.h>
#include <inttypes.h>
#include <stdbool.h> #include <stdbool.h>
#include "systemlib/px4_macros.h" #include "systemlib/px4_macros.h"
@@ -136,7 +137,7 @@ __EXPORT px4_hw_mft_item board_query_manifest(px4_hw_mft_item_id_t id)
} }
if (boards_manifest == px4_hw_mft_list_uninitialized) { if (boards_manifest == px4_hw_mft_list_uninitialized) {
syslog(LOG_ERR, "[boot] Board %4x is not supported!\n", ver_rev); syslog(LOG_ERR, "[boot] Board %4" PRIx32 " is not supported!\n", ver_rev);
} }
} }

5
boards/holybro/durandal-v1/src/manifest.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
* *
* Copyright (c) 2018 PX4 Development Team. All rights reserved. * Copyright (c) 2018, 2021 PX4 Development Team. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -49,6 +49,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <board_config.h> #include <board_config.h>
#include <inttypes.h>
#include <stdbool.h> #include <stdbool.h>
#include "systemlib/px4_macros.h" #include "systemlib/px4_macros.h"
@@ -114,7 +115,7 @@ __EXPORT px4_hw_mft_item board_query_manifest(px4_hw_mft_item_id_t id)
} }
if (boards_manifest == px4_hw_mft_list_uninitialized) { if (boards_manifest == px4_hw_mft_list_uninitialized) {
syslog(LOG_ERR, "[boot] Board %4x is not supported!\n", ver_rev); syslog(LOG_ERR, "[boot] Board %4" PRIx32 " is not supported!\n", ver_rev);
} }
} }

5
boards/holybro/pix32v5/src/manifest.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
* *
* Copyright (c) 2018 PX4 Development Team. All rights reserved. * Copyright (c) 2018, 2021 PX4 Development Team. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -49,6 +49,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <board_config.h> #include <board_config.h>
#include <inttypes.h>
#include <stdbool.h> #include <stdbool.h>
#include "systemlib/px4_macros.h" #include "systemlib/px4_macros.h"
@@ -162,7 +163,7 @@ __EXPORT px4_hw_mft_item board_query_manifest(px4_hw_mft_item_id_t id)
} }
if (boards_manifest == px4_hw_mft_list_uninitialized) { if (boards_manifest == px4_hw_mft_list_uninitialized) {
syslog(LOG_ERR, "[boot] Board %4x is not supported!\n", ver_rev); syslog(LOG_ERR, "[boot] Board %4" PRIx32 " is not supported!\n", ver_rev);
} }
} }

5
boards/modalai/fc-v1/src/manifest.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
* *
* Copyright (c) 2018 PX4 Development Team. All rights reserved. * Copyright (c) 2018, 2021 PX4 Development Team. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -49,6 +49,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <board_config.h> #include <board_config.h>
#include <inttypes.h>
#include <stdbool.h> #include <stdbool.h>
#include "systemlib/px4_macros.h" #include "systemlib/px4_macros.h"
@@ -123,7 +124,7 @@ __EXPORT px4_hw_mft_item board_query_manifest(px4_hw_mft_item_id_t id)
} }
if (boards_manifest == px4_hw_mft_list_uninitialized) { if (boards_manifest == px4_hw_mft_list_uninitialized) {
syslog(LOG_ERR, "[boot] Board %4x is not supported!\n", ver_rev); syslog(LOG_ERR, "[boot] Board %4" PRIx32 " is not supported!\n", ver_rev);
} }
} }

3
boards/modalai/fc-v2/src/manifest.c
View File

@@ -49,6 +49,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <board_config.h> #include <board_config.h>
#include <inttypes.h>
#include <stdbool.h> #include <stdbool.h>
#include "systemlib/px4_macros.h" #include "systemlib/px4_macros.h"
@@ -115,7 +116,7 @@ __EXPORT px4_hw_mft_item board_query_manifest(px4_hw_mft_item_id_t id)
} }
if (boards_manifest == px4_hw_mft_list_uninitialized) { if (boards_manifest == px4_hw_mft_list_uninitialized) {
syslog(LOG_ERR, "[boot] Board %4x is not supported!\n", ver_rev); syslog(LOG_ERR, "[boot] Board %4" PRIx32 " is not supported!\n", ver_rev);
} }
} }

4
boards/nxp/fmurt1062-v1/src/manifest.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
* *
* Copyright (c) 2018 PX4 Development Team. All rights reserved. * Copyright (c) 2018, 2021 PX4 Development Team. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -121,7 +121,7 @@ __EXPORT px4_hw_mft_item board_query_manifest(px4_hw_mft_item_id_t id)
} }
if (boards_manifest == px4_hw_mft_list_uninitialized) { if (boards_manifest == px4_hw_mft_list_uninitialized) {
PX4_ERR("Board %4x is not supported!", ver_rev); PX4_ERR("Board %4" PRIx32 " is not supported!", ver_rev);
} }
} }

4
boards/nxp/ucans32k146/src/bringup.c
View File

@@ -138,13 +138,13 @@ int s32k1xx_bringup(void)
i2c = s32k1xx_i2cbus_initialize(0); i2c = s32k1xx_i2cbus_initialize(0);
if (i2c == NULL) { if (i2c == NULL) {
serr("ERROR: Failed to get I2C%d interface\n", bus); serr("ERROR: Failed to get I2C0 interface\n");
} else { } else {
ret = i2c_register(i2c, 0); ret = i2c_register(i2c, 0);
if (ret < 0) { if (ret < 0) {
serr("ERROR: Failed to register I2C%d driver: %d\n", bus, ret); serr("ERROR: Failed to register I2C0 driver: %d\n", ret);
s32k1xx_i2cbus_uninitialize(i2c); s32k1xx_i2cbus_uninitialize(i2c);
} }
} }

5
boards/px4/fmu-v2/src/manifest.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
* *
* Copyright (c) 2018 PX4 Development Team. All rights reserved. * Copyright (c) 2018, 2021 PX4 Development Team. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -50,6 +50,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <board_config.h> #include <board_config.h>
#include <inttypes.h>
#include <stdbool.h> #include <stdbool.h>
#include "systemlib/px4_macros.h" #include "systemlib/px4_macros.h"
@@ -136,7 +137,7 @@ __EXPORT px4_hw_mft_item board_query_manifest(px4_hw_mft_item_id_t id)
} }
if (boards_manifest == px4_hw_mft_list_uninitialized) { if (boards_manifest == px4_hw_mft_list_uninitialized) {
syslog(LOG_ERR, "[boot] Board %4x is not supported!\n", ver_rev); syslog(LOG_ERR, "[boot] Board %4" PRIx32 " is not supported!\n", ver_rev);
} }
} }

5
boards/px4/fmu-v3/src/manifest.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
* *
* Copyright (c) 2018 PX4 Development Team. All rights reserved. * Copyright (c) 2018, 2021 PX4 Development Team. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -50,6 +50,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <board_config.h> #include <board_config.h>
#include <inttypes.h>
#include <stdbool.h> #include <stdbool.h>
#include "systemlib/px4_macros.h" #include "systemlib/px4_macros.h"
@@ -136,7 +137,7 @@ __EXPORT px4_hw_mft_item board_query_manifest(px4_hw_mft_item_id_t id)
} }
if (boards_manifest == px4_hw_mft_list_uninitialized) { if (boards_manifest == px4_hw_mft_list_uninitialized) {
syslog(LOG_ERR, "[boot] Board %4x is not supported!\n", ver_rev); syslog(LOG_ERR, "[boot] Board %4" PRIx32 " is not supported!\n", ver_rev);
} }
} }

5
boards/px4/fmu-v5/src/manifest.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
* *
* Copyright (c) 2018 PX4 Development Team. All rights reserved. * Copyright (c) 2018, 2021 PX4 Development Team. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -49,6 +49,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <board_config.h> #include <board_config.h>
#include <inttypes.h>
#include <stdbool.h> #include <stdbool.h>
#include "systemlib/px4_macros.h" #include "systemlib/px4_macros.h"
@@ -193,7 +194,7 @@ __EXPORT px4_hw_mft_item board_query_manifest(px4_hw_mft_item_id_t id)
} }
if (boards_manifest == px4_hw_mft_list_uninitialized) { if (boards_manifest == px4_hw_mft_list_uninitialized) {
syslog(LOG_ERR, "[boot] Board %4x is not supported!\n", ver_rev); syslog(LOG_ERR, "[boot] Board %4" PRIx32 " is not supported!\n", ver_rev);
} }
} }

5
boards/px4/fmu-v5x/src/manifest.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
* *
* Copyright (c) 2018 PX4 Development Team. All rights reserved. * Copyright (c) 2018, 2021 PX4 Development Team. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -49,6 +49,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <board_config.h> #include <board_config.h>
#include <inttypes.h>
#include <stdbool.h> #include <stdbool.h>
#include "systemlib/px4_macros.h" #include "systemlib/px4_macros.h"
@@ -155,7 +156,7 @@ __EXPORT px4_hw_mft_item board_query_manifest(px4_hw_mft_item_id_t id)
} }
if (boards_manifest == px4_hw_mft_list_uninitialized) { if (boards_manifest == px4_hw_mft_list_uninitialized) {
syslog(LOG_ERR, "[boot] Board %4x is not supported!\n", ver_rev); syslog(LOG_ERR, "[boot] Board %4" PRIx32 " is not supported!\n", ver_rev);
} }
} }

5
boards/px4/fmu-v6u/src/manifest.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
* *
* Copyright (c) 2018 PX4 Development Team. All rights reserved. * Copyright (c) 2018, 2021 PX4 Development Team. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -49,6 +49,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <board_config.h> #include <board_config.h>
#include <inttypes.h>
#include <stdbool.h> #include <stdbool.h>
#include "systemlib/px4_macros.h" #include "systemlib/px4_macros.h"
@@ -114,7 +115,7 @@ __EXPORT px4_hw_mft_item board_query_manifest(px4_hw_mft_item_id_t id)
} }
if (boards_manifest == px4_hw_mft_list_uninitialized) { if (boards_manifest == px4_hw_mft_list_uninitialized) {
syslog(LOG_ERR, "[boot] Board %4x is not supported!\n", ver_rev); syslog(LOG_ERR, "[boot] Board %4" PRIx32 " is not supported!\n", ver_rev);
} }
} }

5
boards/px4/fmu-v6x/src/manifest.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
* *
* Copyright (c) 2018 PX4 Development Team. All rights reserved. * Copyright (c) 2018, 2021 PX4 Development Team. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -49,6 +49,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <board_config.h> #include <board_config.h>
#include <inttypes.h>
#include <stdbool.h> #include <stdbool.h>
#include "systemlib/px4_macros.h" #include "systemlib/px4_macros.h"
@@ -116,7 +117,7 @@ __EXPORT px4_hw_mft_item board_query_manifest(px4_hw_mft_item_id_t id)
} }
if (boards_manifest == px4_hw_mft_list_uninitialized) { if (boards_manifest == px4_hw_mft_list_uninitialized) {
syslog(LOG_ERR, "[boot] Board %4x is not supported!\n", ver_rev); syslog(LOG_ERR, "[boot] Board %4" PRIx32 " is not supported!\n", ver_rev);
} }
} }

16
boards/spracing/h7extreme/src/flash_w25q128.c
View File

@@ -212,7 +212,7 @@ __ramfunc__ int n25qxxx_command(FAR struct qspi_dev_s *qspi, uint8_t cmd)
{ {
struct qspi_cmdinfo_s cmdinfo; struct qspi_cmdinfo_s cmdinfo;
finfo("CMD: %02x\n", cmd); finfo("CMD: %02" PRIx8 "\n", cmd);
cmdinfo.flags = 0; cmdinfo.flags = 0;
cmdinfo.addrlen = 0; cmdinfo.addrlen = 0;
@@ -246,7 +246,7 @@ __ramfunc__ int n25qxxx_command_read(FAR struct qspi_dev_s *qspi, uint8_t cmd,
{ {
struct qspi_cmdinfo_s cmdinfo; struct qspi_cmdinfo_s cmdinfo;
finfo("CMD: %02x buflen: %lu\n", cmd, (unsigned long)buflen); finfo("CMD: %02" PRIx8 " buflen: %zu\n", cmd, buflen);
cmdinfo.flags = QSPICMD_READDATA; cmdinfo.flags = QSPICMD_READDATA;
cmdinfo.addrlen = 0; cmdinfo.addrlen = 0;
@@ -303,7 +303,7 @@ __ramfunc__ int n25qxxx_write_page(struct n25qxxx_dev_s *priv, FAR const uint8_t
int ret = OK; int ret = OK;
unsigned int i; unsigned int i;
finfo("address: %08lx buflen: %u\n", (unsigned long)address, (unsigned)buflen); finfo("address: %08jx buflen: %zu\n", (intmax_t)address, buflen);
pagesize = (1 << priv->pageshift); pagesize = (1 << priv->pageshift);
@@ -378,7 +378,7 @@ __ramfunc__ int n25qxxx_write_one_page(struct n25qxxx_dev_s *priv, struct qspi_m
n25qxxx_write_disable(priv); n25qxxx_write_disable(priv);
if (ret < 0) { if (ret < 0) {
ferr("ERROR: QSPI_MEMORY failed writing address=%06x\n", ferr("ERROR: QSPI_MEMORY failed writing address=%06" PRIx32 "\n",
meminfo->addr); meminfo->addr);
} }
@@ -394,14 +394,14 @@ __ramfunc__ int n25qxxx_erase_sector(struct n25qxxx_dev_s *priv, off_t sector)
off_t address; off_t address;
uint8_t status; uint8_t status;
finfo("sector: %08lx\n", (unsigned long)sector); finfo("sector: %08jx\n", (intmax_t) sector);
/* Check that the flash is ready and unprotected */ /* Check that the flash is ready and unprotected */
status = n25qxxx_read_status(priv); status = n25qxxx_read_status(priv);
if ((status & STATUS_BUSY_MASK) != STATUS_READY) { if ((status & STATUS_BUSY_MASK) != STATUS_READY) {
ferr("ERROR: Flash busy: %02x", status); ferr("ERROR: Flash busy: %02" PRIx8, status);
return -EBUSY; return -EBUSY;
} }
@@ -411,7 +411,7 @@ __ramfunc__ int n25qxxx_erase_sector(struct n25qxxx_dev_s *priv, off_t sector)
if ((status & (STATUS_BP3_MASK | STATUS_BP_MASK)) != 0 && if ((status & (STATUS_BP3_MASK | STATUS_BP_MASK)) != 0 &&
n25qxxx_isprotected(priv, status, address)) { n25qxxx_isprotected(priv, status, address)) {
ferr("ERROR: Flash protected: %02x", status); ferr("ERROR: Flash protected: %02" PRIx8, status);
return -EACCES; return -EACCES;
} }
@@ -488,7 +488,7 @@ __ramfunc__ int n25qxxx_command_address(FAR struct qspi_dev_s *qspi, uint8_t cm
{ {
struct qspi_cmdinfo_s cmdinfo; struct qspi_cmdinfo_s cmdinfo;
finfo("CMD: %02x Address: %04lx addrlen=%d\n", cmd, (unsigned long)addr, addrlen); finfo("CMD: %02" PRIx8 " Address: %04jx addrlen=%" PRIx8 "\n", cmd, (intmax_t) addr, addrlen);
cmdinfo.flags = QSPICMD_ADDRESS; cmdinfo.flags = QSPICMD_ADDRESS;
cmdinfo.addrlen = addrlen; cmdinfo.addrlen = addrlen;

94
boards/spracing/h7extreme/src/qspi.c
View File

@@ -457,7 +457,7 @@ inline uint32_t qspi_getreg(struct stm32h7_qspidev_s *priv, unsigned int offset)
#ifdef CONFIG_STM32H7_QSPI_REGDEBUG #ifdef CONFIG_STM32H7_QSPI_REGDEBUG
if (qspi_checkreg(priv, false, value, address)) { if (qspi_checkreg(priv, false, value, address)) {
spiinfo("%08x->%08x\n", address, value); spiinfo("%08" PRIx32 "->%08" PRIx32 "\n", address, value);
} }
#endif #endif
@@ -481,7 +481,7 @@ static inline void qspi_putreg(struct stm32h7_qspidev_s *priv, uint32_t value,
#ifdef CONFIG_STM32H7_QSPI_REGDEBUG #ifdef CONFIG_STM32H7_QSPI_REGDEBUG
if (qspi_checkreg(priv, true, value, address)) { if (qspi_checkreg(priv, true, value, address)) {
spiinfo("%08x<-%08x\n", address, value); spiinfo("%08" PRIx32 "<-%08" PRIx32 "\n", address, value);
} }
#endif #endif
@@ -516,11 +516,11 @@ QUADSPI_RAMFUNC void qspi_dumpregs(struct stm32h7_qspidev_s *priv, const char *m
*/ */
regval = getreg32(priv->base + STM32_QUADSPI_CR_OFFSET); /* Control Register */ regval = getreg32(priv->base + STM32_QUADSPI_CR_OFFSET); /* Control Register */
spiinfo("CR:%08x\n", regval); spiinfo("CR:%08" PRIx32 "\n", regval);
spiinfo(" EN:%1d ABORT:%1d DMAEN:%1d TCEN:%1d SSHIFT:%1d\n" spiinfo(" EN:%1d ABORT:%1d DMAEN:%1d TCEN:%1d SSHIFT:%1d\n"
" FTHRES: %d\n" " FTHRES: %d\n"
" TEIE:%1d TCIE:%1d FTIE:%1d SMIE:%1d TOIE:%1d APMS:%1d PMM:%1d\n" " TEIE:%1d TCIE:%1d FTIE:%1d SMIE:%1d TOIE:%1d APMS:%1d PMM:%1d\n"
" PRESCALER: %d\n", " PRESCALER: %" PRId32 "\n",
(regval & QSPI_CR_EN) ? 1 : 0, (regval & QSPI_CR_EN) ? 1 : 0,
(regval & QSPI_CR_ABORT) ? 1 : 0, (regval & QSPI_CR_ABORT) ? 1 : 0,
(regval & QSPI_CR_DMAEN) ? 1 : 0, (regval & QSPI_CR_DMAEN) ? 1 : 0,
@@ -537,16 +537,16 @@ QUADSPI_RAMFUNC void qspi_dumpregs(struct stm32h7_qspidev_s *priv, const char *m
(regval & QSPI_CR_PRESCALER_MASK) >> QSPI_CR_PRESCALER_SHIFT); (regval & QSPI_CR_PRESCALER_MASK) >> QSPI_CR_PRESCALER_SHIFT);
regval = getreg32(priv->base + STM32_QUADSPI_DCR_OFFSET); /* Device Configuration Register */ regval = getreg32(priv->base + STM32_QUADSPI_DCR_OFFSET); /* Device Configuration Register */
spiinfo("DCR:%08x\n", regval); spiinfo("DCR:%08" PRIx32 "\n", regval);
spiinfo(" CKMODE:%1d CSHT:%d FSIZE:%d\n", spiinfo(" CKMODE:%1d CSHT:%" PRId32 " FSIZE:%" PRId32 "\n",
(regval & QSPI_DCR_CKMODE) ? 1 : 0, (regval & QSPI_DCR_CKMODE) ? 1 : 0,
(regval & QSPI_DCR_CSHT_MASK) >> QSPI_DCR_CSHT_SHIFT, (regval & QSPI_DCR_CSHT_MASK) >> QSPI_DCR_CSHT_SHIFT,
(regval & QSPI_DCR_FSIZE_MASK) >> QSPI_DCR_FSIZE_SHIFT); (regval & QSPI_DCR_FSIZE_MASK) >> QSPI_DCR_FSIZE_SHIFT);
regval = getreg32(priv->base + STM32_QUADSPI_CCR_OFFSET); /* Communication Configuration Register */ regval = getreg32(priv->base + STM32_QUADSPI_CCR_OFFSET); /* Communication Configuration Register */
spiinfo("CCR:%08x\n", regval); spiinfo("CCR:%08" PRIx32 "\n", regval);
spiinfo(" INST:%02x IMODE:%d ADMODE:%d ADSIZE:%d ABMODE:%d\n" spiinfo(" INST:%02" PRId32 " IMODE:%" PRId32 " ADMODE:%" PRId32 " ADSIZE:%" PRId32 " ABMODE:%" PRId32 "\n"
" ABSIZE:%d DCYC:%d DMODE:%d FMODE:%d\n" " ABSIZE:%" PRId32 " DCYC:%" PRId32 " DMODE:%" PRId32 " FMODE:%" PRId32 "\n"
" SIOO:%1d DDRM:%1d\n", " SIOO:%1d DDRM:%1d\n",
(regval & QSPI_CCR_INSTRUCTION_MASK) >> QSPI_CCR_INSTRUCTION_SHIFT, (regval & QSPI_CCR_INSTRUCTION_MASK) >> QSPI_CCR_INSTRUCTION_SHIFT,
(regval & QSPI_CCR_IMODE_MASK) >> QSPI_CCR_IMODE_SHIFT, (regval & QSPI_CCR_IMODE_MASK) >> QSPI_CCR_IMODE_SHIFT,
@@ -561,8 +561,8 @@ QUADSPI_RAMFUNC void qspi_dumpregs(struct stm32h7_qspidev_s *priv, const char *m
(regval & QSPI_CCR_DDRM) ? 1 : 0); (regval & QSPI_CCR_DDRM) ? 1 : 0);
regval = getreg32(priv->base + STM32_QUADSPI_SR_OFFSET); /* Status Register */ regval = getreg32(priv->base + STM32_QUADSPI_SR_OFFSET); /* Status Register */
spiinfo("SR:%08x\n", regval); spiinfo("SR:%08" PRIx32 "\n", regval);
spiinfo(" TEF:%1d TCF:%1d FTF:%1d SMF:%1d TOF:%1d BUSY:%1d FLEVEL:%d\n", spiinfo(" TEF:%1d TCF:%1d FTF:%1d SMF:%1d TOF:%1d BUSY:%1d FLEVEL:%" PRId32 "\n",
(regval & QSPI_SR_TEF) ? 1 : 0, (regval & QSPI_SR_TEF) ? 1 : 0,
(regval & QSPI_SR_TCF) ? 1 : 0, (regval & QSPI_SR_TCF) ? 1 : 0,
(regval & QSPI_SR_FTF) ? 1 : 0, (regval & QSPI_SR_FTF) ? 1 : 0,
@@ -572,17 +572,17 @@ QUADSPI_RAMFUNC void qspi_dumpregs(struct stm32h7_qspidev_s *priv, const char *m
(regval & QSPI_SR_FLEVEL_MASK) >> QSPI_SR_FLEVEL_SHIFT); (regval & QSPI_SR_FLEVEL_MASK) >> QSPI_SR_FLEVEL_SHIFT);
#else #else
spiinfo(" CR:%08x DCR:%08x CCR:%08x SR:%08x\n", spiinfo(" CR:%08" PRIx32 " DCR:%08" PRIx32 " CCR:%08" PRIx32 " SR:%08" PRIx32 "\n",
getreg32(priv->base + STM32_QUADSPI_CR_OFFSET), /* Control Register */ getreg32(priv->base + STM32_QUADSPI_CR_OFFSET), /* Control Register */
getreg32(priv->base + STM32_QUADSPI_DCR_OFFSET), /* Device Configuration Register */ getreg32(priv->base + STM32_QUADSPI_DCR_OFFSET), /* Device Configuration Register */
getreg32(priv->base + STM32_QUADSPI_CCR_OFFSET), /* Communication Configuration Register */ getreg32(priv->base + STM32_QUADSPI_CCR_OFFSET), /* Communication Configuration Register */
getreg32(priv->base + STM32_QUADSPI_SR_OFFSET)); /* Status Register */ getreg32(priv->base + STM32_QUADSPI_SR_OFFSET)); /* Status Register */
spiinfo(" DLR:%08x ABR:%08x PSMKR:%08x PSMAR:%08x\n", spiinfo(" DLR:%08" PRIx32 " ABR:%08" PRIx32 " PSMKR:%08" PRIx32 " PSMAR:%08" PRIx32 "\n",
getreg32(priv->base + STM32_QUADSPI_DLR_OFFSET), /* Data Length Register */ getreg32(priv->base + STM32_QUADSPI_DLR_OFFSET), /* Data Length Register */
getreg32(priv->base + STM32_QUADSPI_ABR_OFFSET), /* Alternate Bytes Register */ getreg32(priv->base + STM32_QUADSPI_ABR_OFFSET), /* Alternate Bytes Register */
getreg32(priv->base + STM32_QUADSPI_PSMKR_OFFSET), /* Polling Status mask Register */ getreg32(priv->base + STM32_QUADSPI_PSMKR_OFFSET), /* Polling Status mask Register */
getreg32(priv->base + STM32_QUADSPI_PSMAR_OFFSET)); /* Polling Status match Register */ getreg32(priv->base + STM32_QUADSPI_PSMAR_OFFSET)); /* Polling Status match Register */
spiinfo(" PIR:%08x LPTR:%08x\n", spiinfo(" PIR:%08" PRIx32 " LPTR:%08" PRIx32 "\n",
getreg32(priv->base + STM32_QUADSPI_PIR_OFFSET), /* Polling Interval Register */ getreg32(priv->base + STM32_QUADSPI_PIR_OFFSET), /* Polling Interval Register */
getreg32(priv->base + STM32_QUADSPI_LPTR_OFFSET)); /* Low-Power Timeout Register */ getreg32(priv->base + STM32_QUADSPI_LPTR_OFFSET)); /* Low-Power Timeout Register */
(void)regval; (void)regval;
@@ -599,62 +599,62 @@ QUADSPI_RAMFUNC void qspi_dumpgpioconfig(const char *msg)
/* Port B */ /* Port B */
regval = getreg32(STM32_GPIOB_MODER); regval = getreg32(STM32_GPIOB_MODER);
spiinfo("B_MODER:%08x\n", regval); spiinfo("B_MODER:%" PRIx32 "\n", regval);
regval = getreg32(STM32_GPIOB_OTYPER); regval = getreg32(STM32_GPIOB_OTYPER);
spiinfo("B_OTYPER:%08x\n", regval); spiinfo("B_OTYPER:%" PRIx32 "\n", regval);
regval = getreg32(STM32_GPIOB_OSPEED); regval = getreg32(STM32_GPIOB_OSPEED);
spiinfo("B_OSPEED:%08x\n", regval); spiinfo("B_OSPEED:%" PRIx32 "\n", regval);
regval = getreg32(STM32_GPIOB_PUPDR); regval = getreg32(STM32_GPIOB_PUPDR);
spiinfo("B_PUPDR:%08x\n", regval); spiinfo("B_PUPDR:%" PRIx32 "\n", regval);
regval = getreg32(STM32_GPIOB_AFRL); regval = getreg32(STM32_GPIOB_AFRL);
spiinfo("B_AFRL:%08x\n", regval); spiinfo("B_AFRL:%" PRIx32 "\n", regval);
regval = getreg32(STM32_GPIOB_AFRH); regval = getreg32(STM32_GPIOB_AFRH);
spiinfo("B_AFRH:%08x\n", regval); spiinfo("B_AFRH:%" PRIx32 "\n", regval);
/* Port D */ /* Port D */
regval = getreg32(STM32_GPIOD_MODER); regval = getreg32(STM32_GPIOD_MODER);
spiinfo("D_MODER:%08x\n", regval); spiinfo("D_MODER:%" PRIx32 "\n", regval);
regval = getreg32(STM32_GPIOD_OTYPER); regval = getreg32(STM32_GPIOD_OTYPER);
spiinfo("D_OTYPER:%08x\n", regval); spiinfo("D_OTYPER:%" PRIx32 "\n", regval);
regval = getreg32(STM32_GPIOD_OSPEED); regval = getreg32(STM32_GPIOD_OSPEED);
spiinfo("D_OSPEED:%08x\n", regval); spiinfo("D_OSPEED:%" PRIx32 "\n", regval);
regval = getreg32(STM32_GPIOD_PUPDR); regval = getreg32(STM32_GPIOD_PUPDR);
spiinfo("D_PUPDR:%08x\n", regval); spiinfo("D_PUPDR:%" PRIx32 "\n", regval);
regval = getreg32(STM32_GPIOD_AFRL); regval = getreg32(STM32_GPIOD_AFRL);
spiinfo("D_AFRL:%08x\n", regval); spiinfo("D_AFRL:%" PRIx32 "\n", regval);
regval = getreg32(STM32_GPIOD_AFRH); regval = getreg32(STM32_GPIOD_AFRH);
spiinfo("D_AFRH:%08x\n", regval); spiinfo("D_AFRH:%" PRIx32 "\n", regval);
/* Port E */ /* Port E */
regval = getreg32(STM32_GPIOE_MODER); regval = getreg32(STM32_GPIOE_MODER);
spiinfo("E_MODER:%08x\n", regval); spiinfo("E_MODER:%" PRIx32 "\n", regval);
regval = getreg32(STM32_GPIOE_OTYPER); regval = getreg32(STM32_GPIOE_OTYPER);
spiinfo("E_OTYPER:%08x\n", regval); spiinfo("E_OTYPER:%" PRIx32 "\n", regval);
regval = getreg32(STM32_GPIOE_OSPEED); regval = getreg32(STM32_GPIOE_OSPEED);
spiinfo("E_OSPEED:%08x\n", regval); spiinfo("E_OSPEED:%" PRIx32 "\n", regval);
regval = getreg32(STM32_GPIOE_PUPDR); regval = getreg32(STM32_GPIOE_PUPDR);
spiinfo("E_PUPDR:%08x\n", regval); spiinfo("E_PUPDR:%" PRIx32 "\n", regval);
regval = getreg32(STM32_GPIOE_AFRL); regval = getreg32(STM32_GPIOE_AFRL);
spiinfo("E_AFRL:%08x\n", regval); spiinfo("E_AFRL:%" PRIx32 "\n", regval);
regval = getreg32(STM32_GPIOE_AFRH); regval = getreg32(STM32_GPIOE_AFRH);
spiinfo("E_AFRH:%08x\n", regval); spiinfo("E_AFRH:%" PRIx32 "\n", regval);
} }
#endif #endif
@@ -766,18 +766,18 @@ QUADSPI_RAMFUNC int qspi_setupxctnfromcmd(struct qspi_xctnspec_s *xctn,
#ifdef CONFIG_DEBUG_SPI_INFO #ifdef CONFIG_DEBUG_SPI_INFO
spiinfo("Transfer:\n"); spiinfo("Transfer:\n");
spiinfo(" flags: %02x\n", cmdinfo->flags); spiinfo(" flags: %02" PRIx8 "\n", cmdinfo->flags);
spiinfo(" cmd: %04x\n", cmdinfo->cmd); spiinfo(" cmd: %04" PRIx16 "\n", cmdinfo->cmd);
if (QSPICMD_ISADDRESS(cmdinfo->flags)) { if (QSPICMD_ISADDRESS(cmdinfo->flags)) {
spiinfo(" address/length: %08lx/%d\n", spiinfo(" address/length: %08" PRIx32 "/%" PRId8 "\n",
(unsigned long)cmdinfo->addr, cmdinfo->addrlen); cmdinfo->addr, cmdinfo->addrlen);
} }
if (QSPICMD_ISDATA(cmdinfo->flags)) { if (QSPICMD_ISDATA(cmdinfo->flags)) {
spiinfo(" %s Data:\n", spiinfo(" %s Data:\n",
QSPICMD_ISWRITE(cmdinfo->flags) ? "Write" : "Read"); QSPICMD_ISWRITE(cmdinfo->flags) ? "Write" : "Read");
spiinfo(" buffer/length: %p/%d\n", spiinfo(" buffer/length: %p/%" PRId16 "\n",
cmdinfo->buffer, cmdinfo->buflen); cmdinfo->buffer, cmdinfo->buflen);
} }
@@ -895,13 +895,13 @@ QUADSPI_RAMFUNC int qspi_setupxctnfrommem(struct qspi_xctnspec_s *xctn,
#ifdef CONFIG_DEBUG_SPI_INFO #ifdef CONFIG_DEBUG_SPI_INFO
spiinfo("Transfer:\n"); spiinfo("Transfer:\n");
spiinfo(" flags: %02x\n", meminfo->flags); spiinfo(" flags: %02" PRIx32 "\n", meminfo->flags);
spiinfo(" cmd: %04x\n", meminfo->cmd); spiinfo(" cmd: %04" PRIx16 "\n", meminfo->cmd);
spiinfo(" address/length: %08lx/%d\n", spiinfo(" address/length: %08" PRIx32 "/%" PRId8 "\n",
(unsigned long)meminfo->addr, meminfo->addrlen); meminfo->addr, meminfo->addrlen);
spiinfo(" %s Data:\n", QSPIMEM_ISWRITE(meminfo->flags) ? spiinfo(" %s Data:\n", QSPIMEM_ISWRITE(meminfo->flags) ?
"Write" : "Read"); "Write" : "Read");
spiinfo(" buffer/length: %p/%d\n", meminfo->buffer, meminfo->buflen); spiinfo(" buffer/length: %p/%" PRId32 "\n", meminfo->buffer, meminfo->buflen);
#endif #endif
DEBUGASSERT(meminfo->cmd < 256); DEBUGASSERT(meminfo->cmd < 256);
@@ -1789,7 +1789,7 @@ QUADSPI_RAMFUNC uint32_t qspi_setfrequency(struct qspi_dev_s *dev,
return 0; return 0;
} }
spiinfo("frequency=%d\n", frequency); spiinfo("frequency=%" PRId32 "\n", frequency);
DEBUGASSERT(priv); DEBUGASSERT(priv);
/* Wait till BUSY flag reset */ /* Wait till BUSY flag reset */
@@ -1840,14 +1840,14 @@ QUADSPI_RAMFUNC uint32_t qspi_setfrequency(struct qspi_dev_s *dev,
/* Calculate the new actual frequency */ /* Calculate the new actual frequency */
actual = QSPI_CLK_FREQUENCY / prescaler; actual = QSPI_CLK_FREQUENCY / prescaler;
spiinfo("prescaler=%d actual=%d\n", prescaler, actual); spiinfo("prescaler=%" PRId32 " actual=%" PRId32 "\n", prescaler, actual);
/* Save the frequency setting */ /* Save the frequency setting */
priv->frequency = frequency; priv->frequency = frequency;
priv->actual = actual; priv->actual = actual;
spiinfo("Frequency %d->%d\n", frequency, actual); spiinfo("Frequency %" PRId32 "->%" PRId32 "\n", frequency, actual);
return actual; return actual;
} }
@@ -1916,7 +1916,7 @@ QUADSPI_RAMFUNC void qspi_setmode(struct qspi_dev_s *dev, enum qspi_mode_e mode)
} }
qspi_putreg(priv, regval, STM32_QUADSPI_DCR_OFFSET); qspi_putreg(priv, regval, STM32_QUADSPI_DCR_OFFSET);
spiinfo("DCR=%08x\n", regval); spiinfo("DCR=%" PRIx32 "\n", regval);
/* Save the mode so that subsequent re-configurations will be faster */ /* Save the mode so that subsequent re-configurations will be faster */
@@ -2587,7 +2587,7 @@ struct qspi_dev_s *stm32h7_qspi_initialize(int intf)
ret = irq_attach(priv->irq, priv->handler, NULL); ret = irq_attach(priv->irq, priv->handler, NULL);
if (ret < 0) { if (ret < 0) {
spierr("ERROR: Failed to attach irq %d\n", priv->irq); spierr("ERROR: Failed to attach irq %" PRId8 "\n", priv->irq);
goto errout_with_dmadog; goto errout_with_dmadog;
} }

1
boards/spracing/h7extreme/src/qspi.h
View File

@@ -43,6 +43,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/spi/qspi.h> #include <nuttx/spi/qspi.h>
#include <inttypes.h>
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>