do not use XSPI on STM32U5

fix style check errors

Author: wdx04

storage/blockdevice/COMPONENT_OSPIF/include/OSPIF/OSPIFBlockDevice.h

@@ -474,11 +474,12 @@ class OSPIFBlockDevice : public mbed::BlockDevice {
     uint8_t _dummy_cycles; //Number of Dummy cycles required by Current Bus Mode
     ospi_bus_width_t _data_width; //Bus width for Data phase
 
-    ospif_soft_reset_mode _soft_reset_mode; // Soft Reset mode
-
     uint32_t _init_ref_count;
     bool _is_initialized;
-#ifdef MX_FLASH_SUPPORT_RWW
+
+    ospif_soft_reset_mode _soft_reset_mode; // Soft Reset mode
+
+    #ifdef MX_FLASH_SUPPORT_RWW
     enum wait_flag {
         NOT_STARTED,         // no wait is started
         WRITE_WAIT_STARTED,  // write wait is started

storage/blockdevice/COMPONENT_OSPIF/source/OSPIFBlockDevice.cpp

@@ -1367,17 +1367,17 @@ int OSPIFBlockDevice::_soft_reset()
         case OSPIF_DIERCT_SOFT_RESET:
             // Issue instruction 0xF0 to reset the device
             ospi_status = _ospi_send_general_command(0xF0, OSPI_NO_ADDRESS_COMMAND, // Send reset instruction
-                                                                NULL, 0, NULL, 0);
+                                                     NULL, 0, NULL, 0);
             status = (ospi_status == OSPI_STATUS_OK) ? OSPIF_BD_ERROR_OK : OSPIF_BD_ERROR_PARSING_FAILED;
             break;
         case OSPIF_ENABLE_AND_SOFT_RESET:
             // Issue instruction 66h to enable resets on the device
             // Then issue instruction 99h to reset the device
             ospi_status = _ospi_send_general_command(0x66, OSPI_NO_ADDRESS_COMMAND, // Send reset enable instruction
-                                                                NULL, 0, NULL, 0);
+                                                     NULL, 0, NULL, 0);
             if (ospi_status == OSPI_STATUS_OK) {
                 ospi_status = _ospi_send_general_command(0x99, OSPI_NO_ADDRESS_COMMAND, // Send reset instruction
-                                                        NULL, 0, NULL, 0);
+                                                         NULL, 0, NULL, 0);
             }
             status = (ospi_status == OSPI_STATUS_OK) ? OSPIF_BD_ERROR_OK : OSPIF_BD_ERROR_PARSING_FAILED;
             break;
@@ -1394,7 +1394,7 @@ int OSPIFBlockDevice::_soft_reset()
         _data_width = OSPI_CFG_BUS_SINGLE;
 
         _ospi.configure_format(_inst_width, _inst_size, _address_width, _address_size, OSPI_CFG_BUS_SINGLE,
-                                0, _data_width, _dummy_cycles);
+                               0, _data_width, _dummy_cycles);
 
         if (false == _is_mem_ready()) {
             tr_error("Device not ready, reset failed");

targets/TARGET_STM/ospi_api.c

@@ -81,7 +81,7 @@ ospi_status_t ospi_prepare_command(const ospi_command_t *command, OSPI_RegularCm
 #if defined(HAL_OSPI_DUALQUAD_DISABLE)
     st_command->FlashId = HAL_OSPI_FLASH_ID_1;
 #endif
-#if defined(HAL_XSPI_MODULE_ENABLED)
+#if defined(HAL_XSPI_MODULE_ENABLED) && !defined(TARGET_STM32U5)
     st_command->IOSelect = HAL_XSPI_SELECT_IO_7_0;
 #endif
     if (command->instruction.disabled == true) {
@@ -325,7 +325,7 @@ static ospi_status_t _ospi_init_direct(ospi_t *obj, const ospi_pinmap_t *pinmap,
 #if defined(HAL_OSPI_DUALQUAD_DISABLE)
     obj->handle.Init.DualQuad = HAL_OSPI_DUALQUAD_DISABLE;
 #endif
-#if defined(HAL_XSPI_MODULE_ENABLED)
+#if defined(HAL_XSPI_MODULE_ENABLED) && !defined(TARGET_STM32U5)
     obj->handle.Init.MemoryMode = HAL_XSPI_SINGLE_MEM;
 #endif
 #if defined(TARGET_MX25LM51245G)
@@ -336,7 +336,7 @@ static ospi_status_t _ospi_init_direct(ospi_t *obj, const ospi_pinmap_t *pinmap,
     obj->handle.Init.ClockPrescaler = 4; // default value, will be overwritten in ospi_frequency
     obj->handle.Init.FifoThreshold = 4;
     obj->handle.Init.SampleShifting = HAL_OSPI_SAMPLE_SHIFTING_NONE;
-#if defined(HAL_XSPI_MODULE_ENABLED)
+#if defined(HAL_XSPI_MODULE_ENABLED) && !defined(TARGET_STM32U5)
     obj->handle.Init.DeviceSize = HAL_XSPI_SIZE_32GB;
 #else
     obj->handle.Init.DeviceSize = 32;

targets/TARGET_STM/qspi_api.c

@@ -215,7 +215,7 @@ qspi_status_t qspi_prepare_command(const qspi_command_t *command, OSPI_RegularCm
 #if defined(HAL_OSPI_DUALQUAD_DISABLE)
     st_command->FlashId = HAL_OSPI_FLASH_ID_1;
 #endif
-#if defined(HAL_XSPI_MODULE_ENABLED)
+#if defined(HAL_XSPI_MODULE_ENABLED) && !defined(TARGET_STM32U5)
 #if defined(QSPI_OSPIM_IOPORT_HIGH)
     st_command->IOSelect = HAL_XSPI_SELECT_IO_7_4;
 #else
@@ -595,7 +595,7 @@ static qspi_status_t _qspi_init_direct(qspi_t *obj, const qspi_pinmap_t *pinmap,
 #if defined(HAL_OSPI_DUALQUAD_DISABLE)
     obj->handle.Init.DualQuad = HAL_OSPI_DUALQUAD_DISABLE;
 #endif
-#if defined(HAL_XSPI_MODULE_ENABLED)
+#if defined(HAL_XSPI_MODULE_ENABLED) && !defined(TARGET_STM32U5)
     obj->handle.Init.MemoryMode = HAL_XSPI_SINGLE_MEM;
 #endif
 #if defined(TARGET_MX25LM51245G)

targets/TARGET_STM/xspi_compat.h

@@ -33,7 +33,7 @@
 
 // XSPI compatibility layer: emulate XSPI API as OSPI API
 
-#if defined(HAL_XSPI_MODULE_ENABLED)
+#if defined(HAL_XSPI_MODULE_ENABLED) && !defined(TARGET_STM32U5)
 
 // Types
 #define OSPI_HandleTypeDef XSPI_HandleTypeDef