Skip to content

Commit

Permalink
main: replace fnSPIFFS with fsFlash for all platforms
Browse files Browse the repository at this point in the history
  • Loading branch information
mozzwald committed Jul 5, 2023
1 parent e5413bb commit 49d11aa
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ void main_setup()
SIO.addDevice(&udpDev, SIO_DEVICEID_MIDI); // UDP/MIDI device

// Create a new printer object, setting its output depending on whether we have SD or not
FileSystem *ptrfs = fnSDFAT.running() ? (FileSystem *)&fnSDFAT : (FileSystem *)&fnSPIFFS;
FileSystem *ptrfs = fnSDFAT.running() ? (FileSystem *)&fnSDFAT : (FileSystem *)&fsFlash;
sioPrinter::printer_type ptype = Config.get_printer_type(0);
if (ptype == sioPrinter::printer_type::PRINTER_INVALID)
ptype = sioPrinter::printer_type::PRINTER_FILE_TRIM;
Expand Down Expand Up @@ -147,7 +147,7 @@ void main_setup()
#endif // BUILD_IEC

#ifdef BUILD_MAC
FileSystem *ptrfs = fnSDFAT.running() ? (FileSystem *)&fnSDFAT : (FileSystem *)&fnSPIFFS;
FileSystem *ptrfs = fnSDFAT.running() ? (FileSystem *)&fnSDFAT : (FileSystem *)&fsFlash;

#endif // BUILD_MAC

Expand All @@ -166,7 +166,7 @@ void main_setup()
theFuji.setup(&rc2014Bus);
rc2014Bus.setup();

FileSystem *ptrfs = fnSDFAT.running() ? (FileSystem *)&fnSDFAT : (FileSystem *)&fnSPIFFS;
FileSystem *ptrfs = fnSDFAT.running() ? (FileSystem *)&fnSDFAT : (FileSystem *)&fsFlash;
rc2014Printer::printer_type ptype = Config.get_printer_type(0);
if (ptype == rc2014Printer::printer_type::PRINTER_INVALID)
ptype = rc2014Printer::printer_type::PRINTER_FILE_TRIM;
Expand All @@ -187,7 +187,7 @@ void main_setup()
theFuji.setup(&H89Bus);
H89Bus.setup();

FileSystem *ptrfs = fnSDFAT.running() ? (FileSystem *)&fnSDFAT : (FileSystem *)&fnSPIFFS;
FileSystem *ptrfs = fnSDFAT.running() ? (FileSystem *)&fnSDFAT : (FileSystem *)&fsFlash;
H89Printer::printer_type ptype = Config.get_printer_type(0);
if (ptype == H89Printer::printer_type::PRINTER_INVALID)
ptype = H89Printer::printer_type::PRINTER_FILE_TRIM;
Expand All @@ -210,7 +210,7 @@ void main_setup()
fnSDFAT.create_path("/FujiNet");

Debug_printf("Adding virtual printer\r\n");
FileSystem *ptrfs = fnSDFAT.running() ? (FileSystem *)&fnSDFAT : (FileSystem *)&fnSPIFFS;
FileSystem *ptrfs = fnSDFAT.running() ? (FileSystem *)&fnSDFAT : (FileSystem *)&fsFlash;
adamPrinter::printer_type printer = Config.get_printer_type(0);
adamPrinter *ptr = new adamPrinter(ptrfs, printer);
fnPrinters.set_entry(0, ptr, printer, 0);
Expand Down Expand Up @@ -244,7 +244,7 @@ void main_setup()
#ifdef BUILD_APPLE

iwmModem *sioR;
FileSystem *ptrfs = fnSDFAT.running() ? (FileSystem *)&fnSDFAT : (FileSystem *)&fnSPIFFS;
FileSystem *ptrfs = fnSDFAT.running() ? (FileSystem *)&fnSDFAT : (FileSystem *)&fsFlash;
sioR = new iwmModem(ptrfs, Config.get_modem_sniffer_enabled());
IWM.addDevice(sioR,iwm_fujinet_type_t::Modem);
iwmPrinter::printer_type ptype = Config.get_printer_type(0);
Expand All @@ -262,7 +262,7 @@ void main_setup()
CX16.addDevice(&theFuji, CX16_DEVICEID_FUJINET); // the FUJINET!

// Create a new printer object, setting its output depending on whether we have SD or not
FileSystem *ptrfs = fnSDFAT.running() ? (FileSystem *)&fnSDFAT : (FileSystem *)&fnSPIFFS;
FileSystem *ptrfs = fnSDFAT.running() ? (FileSystem *)&fnSDFAT : (FileSystem *)&fsFlash;
cx16Printer::printer_type ptype = Config.get_printer_type(0);
if (ptype == cx16Printer::printer_type::PRINTER_INVALID)
ptype = cx16Printer::printer_type::PRINTER_FILE_TRIM;
Expand Down

0 comments on commit 49d11aa

Please sign in to comment.