Compilable and working code with IDF5.1

espzav · espzav · commit b0cdcc149b9d · 2023-05-17T15:37:58.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,7 @@
+# For more information about build system see
+# https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/build-system.html
+# The following five lines of boilerplate have to be in your project's
+# CMakeLists in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.5)
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(nesemu)
diff --git a/Makefile b/Makefile
diff --git a/components/nofrendo-esp32/CMakeLists.txt b/components/nofrendo-esp32/CMakeLists.txt
@@ -0,0 +1,3 @@
+file(GLOB_RECURSE T_SOURCES *.c)
+
+idf_component_register(SRCS ${T_SOURCES} INCLUDE_DIRS "." REQUIRES "driver" "nofrendo")
diff --git a/components/nofrendo-esp32/idf_component.yml b/components/nofrendo-esp32/idf_component.yml
@@ -0,0 +1,4 @@
+version: "1.0.0"
+description: Nofredo-esp
+dependencies:
+  idf: ">=5.0"
diff --git a/components/nofrendo-esp32/osd.c b/components/nofrendo-esp32/osd.c
@@ -20,13 +20,13 @@
 #include <sys/types.h>
 #include <unistd.h>
        
-#include <noftypes.h>
-#include <nofconfig.h>
-#include <log.h>
-#include <osd.h>
-#include <nofrendo.h>
+#include "noftypes.h"
+#include "nofconfig.h"
+#include "log.h"
+#include "osd.h"
+#include "nofrendo.h"
 
-#include <version.h>
+#include "version.h"
 
 char configfilename[]="na";
 
diff --git a/components/nofrendo-esp32/video_audio.c b/components/nofrendo-esp32/video_audio.c
@@ -24,20 +24,20 @@
 
 #include <math.h>
 #include <string.h>
-#include <noftypes.h>
-#include <bitmap.h>
-#include <nofconfig.h>
-#include <event.h>
-#include <gui.h>
-#include <log.h>
-#include <nes.h>
-#include <nes_pal.h>
-#include <nesinput.h>
-#include <osd.h>
 #include <stdint.h>
+#include "noftypes.h"
+#include "bitmap.h"
+#include "nofconfig.h"
+#include "event.h"
+#include "gui.h"
+#include "log.h"
+#include "nes.h"
+#include "nes_pal.h"
+#include "nesinput.h"
+#include "osd.h"
 #include "driver/i2s.h"
 #include "sdkconfig.h"
-#include <spi_lcd.h>
+#include "spi_lcd.h"
 
 #include <psxcontroller.h>
 
diff --git a/components/nofrendo/CMakeLists.txt b/components/nofrendo/CMakeLists.txt
@@ -0,0 +1,8 @@
+file(GLOB_RECURSE T_SOURCES *.c)
+file(GLOB_RECURSE CPU_SOURCES cpu/*.c)
+file(GLOB_RECURSE NSS_SOURCES libsnss/*.c)
+file(GLOB_RECURSE NES_SOURCES nes/*.c)
+file(GLOB_RECURSE SNDHRDW_SOURCES sndhrdw/*.c)
+file(GLOB_RECURSE MAP_SOURCES mappers/*.c)
+
+idf_component_register(SRCS ${T_SOURCES} ${CPU_SOURCES} ${NSS_SOURCES} ${NES_SOURCES} ${SNDHRDW_SOURCES} ${MAP_SOURCES} INCLUDE_DIRS "cpu" "libsnss" "nes" "sndhrdw" ".")
diff --git a/components/nofrendo/config.c b/components/nofrendo/config.c
@@ -207,7 +207,7 @@ static int load_config(char *filename)
          do 
          {
             /* eat up whitespace */
-            while (isspace(*s))
+            while (isspace((int)*s))
                s++;
 
             switch (*s) 
@@ -255,13 +255,13 @@ static int load_config(char *filename)
                   *s++ = '\0';
                }
 
-               while (strlen(key) && isspace(key[strlen(key) - 1])) 
+               while (strlen(key) && isspace((int)key[strlen(key) - 1])) 
                   key[strlen(key) - 1] = '\0';
 
-               while (isspace(*s)) 
+               while (isspace((int)*s)) 
                   s++;
                
-               while (strlen(s) && isspace(s[strlen(s) - 1])) 
+               while (strlen(s) && isspace((int)s[strlen(s) - 1])) 
                   s[strlen(s) - 1]='\0';
 
                {
diff --git a/components/nofrendo/cpu/nes6502.c b/components/nofrendo/cpu/nes6502.c
@@ -1,4 +1,4 @@
-/*
+    /*
 ** Nofrendo (c) 1998-2000 Matthew Conte (matt@conte.com)
 **
 **
@@ -24,7 +24,7 @@
 */
 
 
-#include <noftypes.h>
+#include "noftypes.h"
 #include "nes6502.h"
 #include "dis6502.h"
 
diff --git a/components/nofrendo/idf_component.yml b/components/nofrendo/idf_component.yml
@@ -0,0 +1,4 @@
+version: "1.0.0"
+description: Nofredo
+dependencies:
+  idf: ">=5.0"
diff --git a/components/nofrendo/libsnss/libsnss.c b/components/nofrendo/libsnss/libsnss.c
@@ -182,7 +182,7 @@ SNSS_WriteFileHeader (SNSS_FILE *snssFile)
    char writeBuffer[8];
 
    /* always place the SNSS tag in this field */
-   strncpy (&writeBuffer[0], "SNSS", 4);
+   strncpy (&writeBuffer[0], "SNSS", 5);
    tempInt = swap32 (snssFile->headerBlock.numberOfBlocks);
    writeBuffer[4] = ((char *) &tempInt)[0];
    writeBuffer[5] = ((char *) &tempInt)[1];
diff --git a/components/nofrendo/memguard.c b/components/nofrendo/memguard.c
@@ -33,9 +33,10 @@
 #undef free
 #undef strdup
 
-#include <string.h>
-#include <stdlib.h>
-#include <log.h>
+#include "string.h"
+#include "stddef.h"
+#include "log.h"
+#include "esp_heap_caps.h"
 
 
 /* Maximum number of allocated blocks at any one time */
@@ -127,7 +128,7 @@ static void *mem_guardalloc(int alloc_size, int guard_size)
    alloc_size = (alloc_size + 3) & ~3;
 
    /* allocate memory */
-   orig = malloc(alloc_size + (guard_size * 2));
+   orig = heap_caps_malloc(alloc_size + (guard_size * 2), MALLOC_CAP_DEFAULT);
    if (NULL == orig)
       return NULL;
 
@@ -190,7 +191,7 @@ static void mem_init(void)
 
    mem_blockcount = 0;
 
-   mem_record = malloc(MAX_BLOCKS * sizeof(memblock_t));
+   mem_record = heap_caps_malloc(MAX_BLOCKS * sizeof(memblock_t), MALLOC_CAP_DEFAULT);
    ASSERT(mem_record);
    memset(mem_record, 0, MAX_BLOCKS * sizeof(memblock_t));
 }
@@ -259,7 +260,7 @@ void *_my_malloc(int size, char *file, int line)
    if (false != mem_debug)
       temp = mem_guardalloc(size, GUARD_LENGTH);
    else
-      temp = malloc(size);
+      temp = heap_caps_malloc(size, MALLOC_CAP_DEFAULT);
 
    printf("Malloc: %d at %s:%d\n", size, file, line);
    if (NULL == temp)
@@ -329,12 +330,12 @@ char *_my_strdup(const char *string, char *file, int line)
 #else /* !NOFRENDO_DEBUG */
 
 /* allocates memory and clears it */
-void *_my_malloc(int size)
+void *_my_malloc(size_t size)
 {
    void *temp;
    char fail[256];
 
-   temp = malloc(size);
+   temp = heap_caps_malloc(size, MALLOC_CAP_DEFAULT);
 
    if (NULL == temp)
    {
diff --git a/components/nofrendo/memguard.h b/components/nofrendo/memguard.h
@@ -26,6 +26,9 @@
 #ifndef  _MEMGUARD_H_
 #define  _MEMGUARD_H_
 
+#include <stddef.h>
+#include "esp_heap_caps.h"
+
 #ifdef strdup
 #undef strdup
 #endif
@@ -43,11 +46,17 @@ extern char *_my_strdup(const char *string, char *file, int line);
 #else /* !NORFRENDO_DEBUG */
 
 /* Non-debugging versions of calls */
-#define  malloc(s)   _my_malloc((s))
-#define  free(d)     _my_free((void **) &(d))
+#define  malloc(s)   _my_malloc(s)
+//#define  free(d)     free(d);d=NULL
 #define  strdup(s)   _my_strdup((s))
 
-extern void *_my_malloc(int size);
+#define free(d) \
+    do { \
+        free(d); \
+        d = NULL; \
+    } while (0)
+
+extern void *_my_malloc(size_t size);
 extern void _my_free(void **data);
 extern char *_my_strdup(const char *string);
 
diff --git a/components/nofrendo/nes/nes.h b/components/nofrendo/nes/nes.h
@@ -36,9 +36,9 @@
 
 /* Visible (NTSC) screen height */
 #ifndef NES_VISIBLE_HEIGHT
-#define  NES_VISIBLE_HEIGHT   224
+#define  NES_VISIBLE_HEIGHT   240
 #endif /* !NES_VISIBLE_HEIGHT */
-#define  NES_SCREEN_WIDTH     256
+#define  NES_SCREEN_WIDTH     320
 #define  NES_SCREEN_HEIGHT    240
 
 /* NTSC = 60Hz, PAL = 50Hz */
diff --git a/components/nofrendo/nes/nes_ppu.c b/components/nofrendo/nes/nes_ppu.c
@@ -701,6 +701,8 @@ static void ppu_renderbg(uint8 *vidbuf)
    uint8 tile_index, x_tile, y_tile;
    uint8 col_high, attrib, attrib_shift;
 
+    ASSERT(vidbuf);
+
    /* draw a line of transparent background color if bg is disabled */
    if (false == ppu.bg_on)
    {
diff --git a/components/nofrendo/nes/nes_rom.c b/components/nofrendo/nes/nes_rom.c
@@ -465,7 +465,7 @@ rominfo_t *rom_load(const char *filename)
    if (rom_allocsram(rominfo))
       goto _fail;
 
-      rom_loadtrainer(&rom, rominfo);
+   rom_loadtrainer(&rom, rominfo);
 
 	if (rom_loadrom(&rom, rominfo))
       goto _fail;
diff --git a/components/nofrendo/nofrendo.c b/components/nofrendo/nofrendo.c
@@ -170,7 +170,8 @@ static int internal_insert(const char *filename, system_t type)
       if (nes_insertcart(console.filename, console.machine.nes))
          return -1;
 
-      vid_setmode(NES_SCREEN_WIDTH, NES_VISIBLE_HEIGHT);
+      if (vid_setmode(NES_SCREEN_WIDTH, NES_VISIBLE_HEIGHT))
+         return -1;
 
       if (install_timer(NES_REFRESH_RATE))
          return -1;
diff --git a/dependencies.lock b/dependencies.lock
@@ -0,0 +1,9 @@
+dependencies:
+  idf:
+    component_hash: null
+    source:
+      type: idf
+    version: 5.2.0
+manifest_hash: 7284b3df06eb72d5241b3a780d5ebf9ddb58f2de63b062aba2b5ff7559b51636
+target: esp32
+version: 1.0.0
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
@@ -0,0 +1,2 @@
+idf_component_register(SRCS "main.c"
+                    INCLUDE_DIRS ".")
diff --git a/main/component.mk b/main/component.mk
diff --git a/main/idf_component.yml b/main/idf_component.yml
@@ -0,0 +1,4 @@
+description: NES Emulator
+
+dependencies:
+  idf: ">=5.0"
diff --git a/main/main.c b/main/main.c
@@ -2,11 +2,11 @@
 #include "esp_wifi.h"
 #include "esp_system.h"
 #include "esp_event.h"
-#include "esp_event_loop.h"
 #include "nvs_flash.h"
 #include "driver/gpio.h"
 #include "nofrendo.h"
 #include "esp_partition.h"
+#include "esp_spi_flash.h"
 
 
 
@@ -25,17 +25,17 @@ char *osd_getromdata() {
 }
 
 
-esp_err_t event_handler(void *ctx, system_event_t *event)
+/*esp_err_t event_handler(void *ctx, system_event_t *event)
 {
     return ESP_OK;
-}
+}*/
 
 int app_main(void)
 {
 	printf("NoFrendo start!\n");
 	nofrendo_main(0, NULL);
 	printf("NoFrendo died? WtF?\n");
-	asm("break.n 1");
+	//asm("break.n 1");
     return 0;
 }
 
diff --git a/sdkconfig b/sdkconfig

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+file(GLOB_RECURSE T_SOURCES *.c)`
	`2`	`+`
	`3`	`+idf_component_register(SRCS ${T_SOURCES} INCLUDE_DIRS "." REQUIRES "driver" "nofrendo")`