Fix LCD for newer esp-idfs, save memory by sharing main buffer

Author: Spritetm

components/nofrendo-esp32/spi_lcd.c

@@ -24,6 +24,7 @@
 #include "soc/spi_reg.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
+#include "driver/periph_ctrl.h"
 #include "spi_lcd.h"
 
 #define PIN_NUM_MISO CONFIG_HW_LCD_MISO_GPIO
@@ -305,6 +306,9 @@ static void ili_gpio_init()
 
 static void spi_master_init()
 {
+    periph_module_enable(PERIPH_VSPI_MODULE);
+    periph_module_enable(PERIPH_SPI_DMA_MODULE);
+
     ets_printf("lcd spi pin mux init ...\r\n");
     PIN_FUNC_SELECT(PERIPHS_IO_MUX_GPIO19_U,2);
     PIN_FUNC_SELECT(PERIPHS_IO_MUX_GPIO23_U,2);

components/nofrendo-esp32/video_audio.c

@@ -70,6 +70,7 @@ static uint16_t *audio_frame;
 #endif
 
 static void do_audio_frame() {
+
 #if CONFIG_SOUND_ENA
 	int left=DEFAULT_SAMPLERATE/NES_REFRESH_RATE;
 	while(left) {
@@ -250,7 +251,7 @@ static void videoTask(void *arg) {
 	x = (320-DEFAULT_WIDTH)/2;
     y = ((240-DEFAULT_HEIGHT)/2);
     while(1) {
-		xQueueReceive(vidQueue, &bmp, portMAX_DELAY);//skip one frame to drop to 30
+//		xQueueReceive(vidQueue, &bmp, portMAX_DELAY);//skip one frame to drop to 30
 		xQueueReceive(vidQueue, &bmp, portMAX_DELAY);
 		ili9341_write_frame(x, y, DEFAULT_WIDTH, DEFAULT_HEIGHT, (const uint8_t **)bmp->line);
 	}

components/nofrendo/gui.c

@@ -74,7 +74,7 @@ void gui_savesnap(void)
    if (osd_makesnapname(filename, PATH_MAX) < 0)
       return;
 
-   if (pcx_write(filename, nes->vidbuf, nes->ppu->curpal)) 
+   if (pcx_write(filename, vid_getbuffer(), nes->ppu->curpal)) 
       return;
 
    gui_sendmsg(GUI_GREEN, "Screen saved to %s", filename);

components/nofrendo/nes/nes.c

@@ -250,8 +250,8 @@ static void build_address_handlers(nes_t *machine)
 void nes_irq(void)
 {
 #ifdef NOFRENDO_DEBUG
-   if (nes.scanline <= NES_SCREEN_HEIGHT)
-      memset(nes.vidbuf->line[nes.scanline - 1], GUI_RED, NES_SCREEN_WIDTH);
+//   if (nes.scanline <= NES_SCREEN_HEIGHT)
+//      memset(nes.vidbuf->line[nes.scanline - 1], GUI_RED, NES_SCREEN_WIDTH);
 #endif /* NOFRENDO_DEBUG */
 
    nes6502_irq();
@@ -301,7 +301,8 @@ static void nes_renderframe(bool draw_flag)
 
    while (262 != nes.scanline)
    {
-      ppu_scanline(nes.vidbuf, nes.scanline, draw_flag);
+//      ppu_scanline(nes.vidbuf, nes.scanline, draw_flag);
+		ppu_scanline(vid_getbuffer(), nes.scanline, draw_flag);
 
       if (241 == nes.scanline)
       {
@@ -342,8 +343,8 @@ static void system_video(bool draw)
    }
 
    /* blit the NES screen to our video surface */
-   vid_blit(nes.vidbuf, 0, (NES_SCREEN_HEIGHT - NES_VISIBLE_HEIGHT) / 2,
-            0, 0, NES_SCREEN_WIDTH, NES_VISIBLE_HEIGHT);
+//   vid_blit(nes.vidbuf, 0, (NES_SCREEN_HEIGHT - NES_VISIBLE_HEIGHT) / 2,
+//            0, 0, NES_SCREEN_WIDTH, NES_VISIBLE_HEIGHT);
 
    /* overlay our GUI on top of it */
    gui_frame(true);
@@ -437,7 +438,7 @@ void nes_destroy(nes_t **machine)
       mmc_destroy(&(*machine)->mmc);
       ppu_destroy(&(*machine)->ppu);
       apu_destroy(&(*machine)->apu);
-      bmp_destroy(&(*machine)->vidbuf);
+//      bmp_destroy(&(*machine)->vidbuf);
       if ((*machine)->cpu)
       {
          if ((*machine)->cpu->mem_page[0])
@@ -516,9 +517,9 @@ nes_t *nes_create(void)
 
    /* bitmap */
    /* 8 pixel overdraw */
-   machine->vidbuf = bmp_create(NES_SCREEN_WIDTH, NES_SCREEN_HEIGHT, 8);
-   if (NULL == machine->vidbuf)
-      goto _fail;
+//   machine->vidbuf = bmp_create(NES_SCREEN_WIDTH, NES_SCREEN_HEIGHT, 8);
+//   if (NULL == machine->vidbuf)
+//      goto _fail;
 
    machine->autoframeskip = true;
 

components/nofrendo/nes/nes.h

@@ -70,7 +70,10 @@ typedef struct nes_s
    rominfo_t *rominfo;
 
    /* video buffer */
-   bitmap_t *vidbuf;
+   /* For the ESP32, it costs too much memory to render to a separate buffer and blit that to the main buffer.
+      Instead, the code has been modified to directly grab the primary buffer from the video subsystem and render
+      there, saving us about 64K of memory. */
+//   bitmap_t *vidbuf; 
 
    bool fiq_occurred;
    uint8 fiq_state;