diff --git a/Apple1.ino b/Apple1.ino index dd93c07..5b46f5e 100644 --- a/Apple1.ino +++ b/Apple1.ino @@ -19,7 +19,7 @@ prom b(basic, sizeof(basic)); prom m(monitor, sizeof(monitor)); #endif -ram pages[RAM_PAGES]; +ram<> pages[RAM_PAGES]; //socket_filer files("apple1"); #if defined(USE_SD) sd_filer files(PROGRAMS); @@ -66,7 +66,7 @@ void setup() { hardware_init(cpu); for (unsigned i = 0; i < RAM_PAGES; i++) - memory.put(pages[i], i * ram::page_size); + memory.put(pages[i], i * ram<>::page_size); #if defined(USE_SPIRAM) memory.put(sram, SPIRAM_BASE, SPIRAM_EXTENT); diff --git a/config.h b/config.h index d388efd..d26c1ba 100644 --- a/config.h +++ b/config.h @@ -4,15 +4,15 @@ #define RAM_TOP 0xd000u #if (RAM_SIZE >= RAM_TOP) -#define RAM_PAGES (RAM_TOP / ram::page_size) +#define RAM_PAGES (RAM_TOP / ram<>::page_size) #elif defined(USE_SPIRAM) -#define RAM_PAGES (RAM_SIZE / ram::page_size) +#define RAM_PAGES (RAM_SIZE / ram<>::page_size) #define SPIRAM_BASE RAM_SIZE #define SPIRAM_EXTENT min(RAM_TOP - SPIRAM_BASE, SPIRAM_SIZE) / Memory::page_size #else -#define RAM_PAGES (RAM_SIZE / ram::page_size) +#define RAM_PAGES (RAM_SIZE / ram<>::page_size) #endif