Fix whitespace. Fix handling of PICO_FLASH_SIZE_BYTES == 0.

Author: Wren6991

src/rp2_common/hardware_flash/flash.c

@@ -310,10 +310,15 @@ flash_devinfo_size_t __no_inline_not_in_flash_func(flash_devinfo_get_cs_size)(ui
     if (cs == 0u) {
 #ifdef PICO_FLASH_SIZE_BYTES
         // A flash size explicitly specified for the build (e.g. from the board header) takes
-        // precedence over whatever was found in OTP.
-        return (flash_devinfo_size_t) (
-            __builtin_ctz(PICO_FLASH_SIZE_BYTES / 8192u) + (uint)FLASH_DEVINFO_SIZE_8K
-        );
+        // precedence over whatever was found in OTP. Not using flash_devinfo_bytes_to_size() as
+        // the call could be outlined, and this code must be in RAM.
+        if (PICO_FLASH_SIZE_BYTES == 0) {
+            return FLASH_DEVINFO_SIZE_NONE;
+        } else {
+            return (flash_devinfo_size_t) (
+                __builtin_ctz(PICO_FLASH_SIZE_BYTES / 8192u) + (uint)FLASH_DEVINFO_SIZE_8K
+            );
+        }
 #else
         return (flash_devinfo_size_t) (
             (*devinfo & OTP_DATA_FLASH_DEVINFO_CS0_SIZE_BITS) >> OTP_DATA_FLASH_DEVINFO_CS0_SIZE_LSB

src/rp2_common/hardware_flash/include/hardware/flash.h

@@ -123,46 +123,46 @@ void flash_flush_cache(void);
 
 #if !PICO_RP2040
 typedef enum {
-	FLASH_DEVINFO_SIZE_NONE = 0x0,
-	FLASH_DEVINFO_SIZE_8K = 0x1,
-	FLASH_DEVINFO_SIZE_16K = 0x2,
-	FLASH_DEVINFO_SIZE_32K = 0x3,
-	FLASH_DEVINFO_SIZE_64K = 0x4,
-	FLASH_DEVINFO_SIZE_128K = 0x5,
-	FLASH_DEVINFO_SIZE_256K = 0x6,
-	FLASH_DEVINFO_SIZE_512K = 0x7,
-	FLASH_DEVINFO_SIZE_1M = 0x8,
-	FLASH_DEVINFO_SIZE_2M = 0x9,
-	FLASH_DEVINFO_SIZE_4M = 0xa,
-	FLASH_DEVINFO_SIZE_8M = 0xb,
-	FLASH_DEVINFO_SIZE_16M = 0xc,
-	FLASH_DEVINFO_SIZE_MAX = 0xc
+    FLASH_DEVINFO_SIZE_NONE = 0x0,
+    FLASH_DEVINFO_SIZE_8K = 0x1,
+    FLASH_DEVINFO_SIZE_16K = 0x2,
+    FLASH_DEVINFO_SIZE_32K = 0x3,
+    FLASH_DEVINFO_SIZE_64K = 0x4,
+    FLASH_DEVINFO_SIZE_128K = 0x5,
+    FLASH_DEVINFO_SIZE_256K = 0x6,
+    FLASH_DEVINFO_SIZE_512K = 0x7,
+    FLASH_DEVINFO_SIZE_1M = 0x8,
+    FLASH_DEVINFO_SIZE_2M = 0x9,
+    FLASH_DEVINFO_SIZE_4M = 0xa,
+    FLASH_DEVINFO_SIZE_8M = 0xb,
+    FLASH_DEVINFO_SIZE_16M = 0xc,
+    FLASH_DEVINFO_SIZE_MAX = 0xc
 } flash_devinfo_size_t;
 
 /*! \brief Convert a flash/PSRAM size enum to an integer size in bytes
  *  \ingroup hardware_flash
  */
 static inline uint32_t flash_devinfo_size_to_bytes(flash_devinfo_size_t size) {
-	if (size == FLASH_DEVINFO_SIZE_NONE) {
-		return 0;
-	} else {
-		return 4096u << (uint)size;
-	}
+    if (size == FLASH_DEVINFO_SIZE_NONE) {
+        return 0;
+    } else {
+        return 4096u << (uint)size;
+    }
 }
 
 /*! \brief Convert an integer flash/PSRAM size in bytes to a size enum, as
   !  stored in OTP and used by the ROM.
  *  \ingroup hardware_flash
  */
 static inline flash_devinfo_size_t flash_devinfo_bytes_to_size(uint32_t bytes) {
-	// Must be zero or a power of two
-	valid_params_if(HARDWARE_FLASH, (bytes & (bytes - 1)) == 0u);
-	uint sectors = bytes / 4096u;
-	if (sectors <= 1u) {
-		return FLASH_DEVINFO_SIZE_NONE;
-	} else {
-		return (flash_devinfo_size_t) __builtin_ctz(sectors);
-	}
+    // Must be zero or a power of two
+    valid_params_if(HARDWARE_FLASH, (bytes & (bytes - 1)) == 0u);
+    uint sectors = bytes / 4096u;
+    if (sectors <= 1u) {
+        return FLASH_DEVINFO_SIZE_NONE;
+    } else {
+        return (flash_devinfo_size_t) __builtin_ctz(sectors);
+    }
 }
 
 /*! \brief Get the size of the QSPI device attached to chip select cs, according to FLASH_DEVINFO