Fix build with no psram

jepler · jepler · commit 6153d23ed8ef · 2023-09-05T21:30:35.000-05:00
these are conditionally-defined identifiers so have to use if defined.
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
@@ -325,7 +325,7 @@ safe_mode_t port_heap_init(safe_mode_t sm) {
         common_hal_espidf_set_reserved_psram(reserved);
     }
 
-    #ifdef CONFIG_SPIRAM_USE_MEMMAP
+    #if defined(CONFIG_SPIRAM_USE_MEMMAP)
     {
         intptr_t heap_start = common_hal_espidf_get_psram_start();
         intptr_t heap_end = common_hal_espidf_get_psram_end();
@@ -338,7 +338,7 @@ safe_mode_t port_heap_init(safe_mode_t sm) {
             ESP_LOGE(TAG, "CONFIG_SPIRAM_USE_MMAP enabled but no spiram heap available");
         }
     }
-    #elif CONFIG_SPIRAM_USE_CAPS_ALLOC
+    #elif defined(CONFIG_SPIRAM_USE_CAPS_ALLOC)
     {
         intptr_t psram_start = common_hal_espidf_get_psram_start();
         intptr_t psram_end = common_hal_espidf_get_psram_end();

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ safe_mode_t port_heap_init(safe_mode_t sm) {`
`325`	`325`	`common_hal_espidf_set_reserved_psram(reserved);`
`326`	`326`	`}`
`327`	`327`
`328`		`- #ifdef CONFIG_SPIRAM_USE_MEMMAP`
	`328`	`+ #if defined(CONFIG_SPIRAM_USE_MEMMAP)`
`329`	`329`	`{`
`330`	`330`	`intptr_t heap_start = common_hal_espidf_get_psram_start();`
`331`	`331`	`intptr_t heap_end = common_hal_espidf_get_psram_end();`
`@@ -338,7 +338,7 @@ safe_mode_t port_heap_init(safe_mode_t sm) {`
`338`	`338`	`ESP_LOGE(TAG, "CONFIG_SPIRAM_USE_MMAP enabled but no spiram heap available");`
`339`	`339`	`}`
`340`	`340`	`}`
`341`		`- #elif CONFIG_SPIRAM_USE_CAPS_ALLOC`
	`341`	`+ #elif defined(CONFIG_SPIRAM_USE_CAPS_ALLOC)`
`342`	`342`	`{`
`343`	`343`	`intptr_t psram_start = common_hal_espidf_get_psram_start();`
`344`	`344`	`intptr_t psram_end = common_hal_espidf_get_psram_end();`