Update Graphics_Memory.cpp code to same version for all ESP targets

AdrianSoundy · AdrianSoundy · commit fbb210a6b90e · 2025-05-31T15:19:22.000+12:00
diff --git a/targets/ESP32/ESP32_C6/nanoCLR/nanoFramework.Graphics/Graphics_Memory.cpp b/targets/ESP32/ESP32_C6/nanoCLR/nanoFramework.Graphics/Graphics_Memory.cpp
@@ -32,8 +32,7 @@ bool GraphicsMemory::GraphicsHeapLocation(
     CLR_UINT8 *&graphicsStartingAddress,
     CLR_UINT8 *&graphicsEndingAddress)
 {
-    // requesting 2MB
-    CLR_INT32 graphicsMemoryBlockSize = 2 * 1024 * 1024;
+    CLR_UINT32 graphicsMemoryBlockSize = requested;
 
     CLR_INT32 memoryCaps = MALLOC_CAP_8BIT | MALLOC_CAP_32BIT | MALLOC_CAP_SPIRAM;
 
@@ -45,29 +44,32 @@ bool GraphicsMemory::GraphicsHeapLocation(
     }
 
     // We don't want to allocate upfront
-    if (requested == 0)
+    if (graphicsMemoryBlockSize == 0)
     {
         // We don't allocate anything here
         return false;
     }
 
     // Get Largest free block in SPIRam
-    CLR_INT32 spiramMaxSize = heap_caps_get_largest_free_block(memoryCaps);
+    CLR_UINT32 spiramMaxSize = heap_caps_get_largest_free_block(memoryCaps);
+
     if (spiramMaxSize == 0)
     {
         // No SPIRAM, try and allocate small block in normal ram to keep allocator happy for
         // people trying to run graphics on boards without SPIRAM
         // Should be able to use with small screens
         memoryCaps ^= MALLOC_CAP_SPIRAM;
 
-        spiramMaxSize = requested;
+        spiramMaxSize = heap_caps_get_largest_free_block(memoryCaps);
     }
 
     if (spiramMaxSize < graphicsMemoryBlockSize) // limit the size to what is available
     {
         graphicsMemoryBlockSize = spiramMaxSize;
     }
+
     graphicsStartingAddress = (CLR_UINT8 *)heap_caps_malloc(graphicsMemoryBlockSize, memoryCaps);
+
     ASSERT(graphicsStartingAddress != NULL);
     graphicsEndingAddress = (CLR_UINT8 *)(graphicsStartingAddress + graphicsMemoryBlockSize);
 
diff --git a/targets/ESP32/ESP32_P4/nanoCLR/nanoFramework.Graphics/Graphics_Memory.cpp b/targets/ESP32/ESP32_P4/nanoCLR/nanoFramework.Graphics/Graphics_Memory.cpp
@@ -32,8 +32,7 @@ bool GraphicsMemory::GraphicsHeapLocation(
     CLR_UINT8 *&graphicsStartingAddress,
     CLR_UINT8 *&graphicsEndingAddress)
 {
-    // requesting 2MB
-    CLR_INT32 graphicsMemoryBlockSize = 2 * 1024 * 1024;
+    CLR_UINT32 graphicsMemoryBlockSize = requested;
 
     CLR_INT32 memoryCaps = MALLOC_CAP_8BIT | MALLOC_CAP_32BIT | MALLOC_CAP_SPIRAM;
 
@@ -45,29 +44,32 @@ bool GraphicsMemory::GraphicsHeapLocation(
     }
 
     // We don't want to allocate upfront
-    if (requested == 0)
+    if (graphicsMemoryBlockSize == 0)
     {
         // We don't allocate anything here
         return false;
     }
 
     // Get Largest free block in SPIRam
-    CLR_INT32 spiramMaxSize = heap_caps_get_largest_free_block(memoryCaps);
+    CLR_UINT32 spiramMaxSize = heap_caps_get_largest_free_block(memoryCaps);
+
     if (spiramMaxSize == 0)
     {
         // No SPIRAM, try and allocate small block in normal ram to keep allocator happy for
         // people trying to run graphics on boards without SPIRAM
         // Should be able to use with small screens
         memoryCaps ^= MALLOC_CAP_SPIRAM;
 
-        spiramMaxSize = requested;
+        spiramMaxSize = heap_caps_get_largest_free_block(memoryCaps);
     }
 
     if (spiramMaxSize < graphicsMemoryBlockSize) // limit the size to what is available
     {
         graphicsMemoryBlockSize = spiramMaxSize;
     }
+
     graphicsStartingAddress = (CLR_UINT8 *)heap_caps_malloc(graphicsMemoryBlockSize, memoryCaps);
+
     ASSERT(graphicsStartingAddress != NULL);
     graphicsEndingAddress = (CLR_UINT8 *)(graphicsStartingAddress + graphicsMemoryBlockSize);
 
diff --git a/targets/ESP32/ESP32_P4/target_BlockStorage.h b/targets/ESP32/ESP32_P4/target_BlockStorage.h
@@ -6,7 +6,7 @@
 #ifndef TARGETPAL_BLOCKSTORAGE_H
 #define TARGETPAL_BLOCKSTORAGE_H
 
-// this device has 1 block storage devices
+// this device has 1 block storage device
 #define TARGET_BLOCKSTORAGE_COUNT 1
 
 #endif // TARGETPAL_BLOCKSTORAGE_H
diff --git a/targets/ESP32/ESP32_S2/nanoCLR/nanoFramework.Graphics/Graphics_Memory.cpp b/targets/ESP32/ESP32_S2/nanoCLR/nanoFramework.Graphics/Graphics_Memory.cpp
@@ -32,8 +32,7 @@ bool GraphicsMemory::GraphicsHeapLocation(
     CLR_UINT8 *&graphicsStartingAddress,
     CLR_UINT8 *&graphicsEndingAddress)
 {
-    // requesting 2MB
-    CLR_INT32 graphicsMemoryBlockSize = 2 * 1024 * 1024;
+    CLR_UINT32 graphicsMemoryBlockSize = requested;
 
     CLR_INT32 memoryCaps = MALLOC_CAP_8BIT | MALLOC_CAP_32BIT | MALLOC_CAP_SPIRAM;
 
@@ -45,29 +44,32 @@ bool GraphicsMemory::GraphicsHeapLocation(
     }
 
     // We don't want to allocate upfront
-    if (requested == 0)
+    if (graphicsMemoryBlockSize == 0)
     {
         // We don't allocate anything here
         return false;
     }
 
     // Get Largest free block in SPIRam
-    CLR_INT32 spiramMaxSize = heap_caps_get_largest_free_block(memoryCaps);
+    CLR_UINT32 spiramMaxSize = heap_caps_get_largest_free_block(memoryCaps);
+
     if (spiramMaxSize == 0)
     {
         // No SPIRAM, try and allocate small block in normal ram to keep allocator happy for
         // people trying to run graphics on boards without SPIRAM
         // Should be able to use with small screens
         memoryCaps ^= MALLOC_CAP_SPIRAM;
 
-        spiramMaxSize = requested;
+        spiramMaxSize = heap_caps_get_largest_free_block(memoryCaps);
     }
 
     if (spiramMaxSize < graphicsMemoryBlockSize) // limit the size to what is available
     {
         graphicsMemoryBlockSize = spiramMaxSize;
     }
+
     graphicsStartingAddress = (CLR_UINT8 *)heap_caps_malloc(graphicsMemoryBlockSize, memoryCaps);
+
     ASSERT(graphicsStartingAddress != NULL);
     graphicsEndingAddress = (CLR_UINT8 *)(graphicsStartingAddress + graphicsMemoryBlockSize);
 
diff --git a/targets/ESP32/ESP32_S3/nanoCLR/nanoFramework.Graphics/Graphics_Memory.cpp b/targets/ESP32/ESP32_S3/nanoCLR/nanoFramework.Graphics/Graphics_Memory.cpp
@@ -32,8 +32,7 @@ bool GraphicsMemory::GraphicsHeapLocation(
     CLR_UINT8 *&graphicsStartingAddress,
     CLR_UINT8 *&graphicsEndingAddress)
 {
-    // requesting 2MB
-    CLR_INT32 graphicsMemoryBlockSize = 2 * 1024 * 1024;
+    CLR_UINT32 graphicsMemoryBlockSize = requested;
 
     CLR_INT32 memoryCaps = MALLOC_CAP_8BIT | MALLOC_CAP_32BIT | MALLOC_CAP_SPIRAM;
 
@@ -45,29 +44,32 @@ bool GraphicsMemory::GraphicsHeapLocation(
     }
 
     // We don't want to allocate upfront
-    if (requested == 0)
+    if (graphicsMemoryBlockSize == 0)
     {
         // We don't allocate anything here
         return false;
     }
 
     // Get Largest free block in SPIRam
-    CLR_INT32 spiramMaxSize = heap_caps_get_largest_free_block(memoryCaps);
+    CLR_UINT32 spiramMaxSize = heap_caps_get_largest_free_block(memoryCaps);
+
     if (spiramMaxSize == 0)
     {
         // No SPIRAM, try and allocate small block in normal ram to keep allocator happy for
         // people trying to run graphics on boards without SPIRAM
         // Should be able to use with small screens
         memoryCaps ^= MALLOC_CAP_SPIRAM;
 
-        spiramMaxSize = requested;
+        spiramMaxSize = heap_caps_get_largest_free_block(memoryCaps);
     }
 
     if (spiramMaxSize < graphicsMemoryBlockSize) // limit the size to what is available
     {
         graphicsMemoryBlockSize = spiramMaxSize;
     }
+
     graphicsStartingAddress = (CLR_UINT8 *)heap_caps_malloc(graphicsMemoryBlockSize, memoryCaps);
+
     ASSERT(graphicsStartingAddress != NULL);
     graphicsEndingAddress = (CLR_UINT8 *)(graphicsStartingAddress + graphicsMemoryBlockSize);
 

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,7 @@ bool GraphicsMemory::GraphicsHeapLocation(`
`32`	`32`	`CLR_UINT8 *&graphicsStartingAddress,`
`33`	`33`	`CLR_UINT8 *&graphicsEndingAddress)`
`34`	`34`	`{`
`35`		`- // requesting 2MB`
`36`		`- CLR_INT32 graphicsMemoryBlockSize = 2 * 1024 * 1024;`
	`35`	`+ CLR_UINT32 graphicsMemoryBlockSize = requested;`
`37`	`36`
`38`	`37`	`CLR_INT32 memoryCaps = MALLOC_CAP_8BIT \| MALLOC_CAP_32BIT \| MALLOC_CAP_SPIRAM;`
`39`	`38`
`@@ -45,29 +44,32 @@ bool GraphicsMemory::GraphicsHeapLocation(`
`45`	`44`	`}`
`46`	`45`
`47`	`46`	`// We don't want to allocate upfront`
`48`		`- if (requested == 0)`
	`47`	`+ if (graphicsMemoryBlockSize == 0)`
`49`	`48`	`{`
`50`	`49`	`// We don't allocate anything here`
`51`	`50`	`return false;`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`// Get Largest free block in SPIRam`
`55`		`- CLR_INT32 spiramMaxSize = heap_caps_get_largest_free_block(memoryCaps);`
	`54`	`+ CLR_UINT32 spiramMaxSize = heap_caps_get_largest_free_block(memoryCaps);`
	`55`	`+`
`56`	`56`	`if (spiramMaxSize == 0)`
`57`	`57`	`{`
`58`	`58`	`// No SPIRAM, try and allocate small block in normal ram to keep allocator happy for`
`59`	`59`	`// people trying to run graphics on boards without SPIRAM`
`60`	`60`	`// Should be able to use with small screens`
`61`	`61`	`memoryCaps ^= MALLOC_CAP_SPIRAM;`
`62`	`62`
`63`		`- spiramMaxSize = requested;`
	`63`	`+ spiramMaxSize = heap_caps_get_largest_free_block(memoryCaps);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`if (spiramMaxSize < graphicsMemoryBlockSize) // limit the size to what is available`
`67`	`67`	`{`
`68`	`68`	`graphicsMemoryBlockSize = spiramMaxSize;`
`69`	`69`	`}`
	`70`	`+`
`70`	`71`	`graphicsStartingAddress = (CLR_UINT8 *)heap_caps_malloc(graphicsMemoryBlockSize, memoryCaps);`
	`72`	`+`
`71`	`73`	`ASSERT(graphicsStartingAddress != NULL);`
`72`	`74`	`graphicsEndingAddress = (CLR_UINT8 *)(graphicsStartingAddress + graphicsMemoryBlockSize);`
`73`	`75`