merge local branch into mainline (#7)

diggerbonk · idolpx · tschak909 · web-flow · commit b71a33029c40 · 2025-02-10T16:39:58.000-07:00
* update * tnfs menu changes * updating dir_seek and dir_tell menu options * removing unused option * removing unused method * remove unused var * update * remove planning doc * merge lateset firmware changes into local branches (#2) * sync latest from ML * [iec] sync latest from Meatloaf * [iec] oops forgot this one * [f256] Add missing DW commands. * [iwm network] Add 0x0a line ending to JSON parser * [sio][fuji] revert fujinet.cpp changes to allocate network device in PSRAM until work out why it is corrupting data * [network] initialise field values - fixes PSRAM issues where translation value was not initialised to 0 and was corrupting binary values * [network][sio] Fix memory leak when network is not closed before reopening * Removed direct access to _fnDisk2s to eliminate shadowing issues with _fnDisks.disk_dev and ensure more consistent access. * Move IWM byte decoding into a function. * Split up service() into sub services to make it easier to add more services (such as Disk II write). * [network] fix crash when device spec is empty. REDUCE DEFAULT LOGGING Most logging is now hidden behind VERBOSE_HTTP or VERBOSE_PROTOCOL which you should enable if you want more logging * drivewire: return config disk sectors (if mounted) only for drive 0 * [dw][foenix] adding boards and pinmap for foenix w/ d32 * [dw][foenix] board fix up * [dw][foenix] builds but not working, no opcode logging seen * Added support for missing DriveWire commands * [dw][foenix] fix board by not inverting tx rx in fnuart2 * Fix Disk II mounting from web interface. * [sio][pc] guard esp32 code to fix fujinet-pc on atari * [webui] fixes FujiNetWIFI#785 Add Alaska AKST+9AKDT * There are no _fnDisk2s on PC build, don't try to return them. * [iwm][fuji] Make fuji a real device so it doesn't rely on the DISK_0 hack The DISK_0 hack is sadly still there, but fujinet-lib doesn't use it by default anymore, but does fall back to it for older firmware that still has this god forsaken hack in it. * [iwm] protect against FN crash after a reset on an open network connection * fnFTP: skip sending password if server didn't 331 * Added support for missing DriveWire commands Moved to a state machine for processing DriveWire commands Moved to a state machine for processing FujiNet commands * Renamed onTimer because it's a global and conflicts. * build: add CoCo esp32s3 support * build.sh - only show board name, not full ini file name when listing available boards * [device] Add new Clock device class independent of platforms * Remove clock debug * Fixed issue where readexError wasn't being reset on each call into op_readex(), causing returns of errors from previous iterations. * use USB instead of ACM * [coco] add force uart baud to s3 * [coco] change S3 UART to 1 from 2 * Remove immediate exit from build.sh if there is an error * [clock] add missing include for gcc build * cause build.sh to exit if pio tasks fail * [iwm] Return correct error code when there is a status call on non-opened protocol This was incorrectly returning 1, which is also the OK code and causing fujinet-lib to tightly loop as it did not think there was an error. * Revert "Use driver/gptimer.h" This reverts commit a017eba. * Improve relative path resolution (retry) * Added ability for Disk II to write. * Allocate track buffer when starting disk, free it when stopping. * Remove unused track buffer allocation. * Restore version.h. * Use heap_caps_free * Add comments about ack is used as write protect. * apple2: fuji: add lobby boot option * Define more SmartPort command constants. * No Disk II write support on PC. * apple2: update autorun.po. Adds Lobby and DiskII Write support * ATARI: Improve trailing slash in sio_set_prefix * Added SmartPort CONTROL and STATUS commands to clear/get monitor Disk II /DRIVEn enable status. * added config.prg to IEC, basic framework * [iec] add mlb to filesystem for testing * [iec] move mlb to the correct folder * [iec] fix release ATN wait on bus process * [iec] add "t1" test loader program * Add debug_version.py to put commit ID into FN_VERSION_FULL during build without altering include/version.h * No need to check what Slot/Drive Disk II responds to on PC. * Add FujiNet-PC nightly builds/releases * [GHA] re-enable targets in Build FN-PC * [GHA] Get ready for FN-PC nightly! * [iec] sync and troubleshooting protocol * Revert block-size values in devrelay to fixed 512 byte size * Fix string_utils use of contains * [iec] check ATN status before and after EOI * [iec] use timer for EOI detection * [iec] disable interrupts during EOI detect * [iec] do check before calling selectProtocol() * [iec] reset protocol to standard serial before read_command() adjust bus state for device detect * [iec] reset bus data after TALK * ATARI: Corrected 'NCD N1:' to clear mount * [PC] precise gettimeofday() for Windows 7 * By default, don't use most recent modified date since it causes everything to rebuild. * Print characters per second when finished sending file. * Fix D64 to not read past the end of a sector on large reads. * Eliminate a bunch of warnings. * Make conditionals match where setup_card_detect is being used. * ini for my cococart * disable pull resistors on NMI pin 27 * Rebuild IEC state machine so it's handled in ISR (FujiNetWIFI#816) * Eliminate a bunch of warnings. * There doesn't seem to be a contains() method in std::string * Use commit date instead of newest modified file date by default. * Print IEC transfer speed. * Clarify which pins are used for IEC on Lolin D32 * There is no up/down/pull/true/false/high/low/0/1, only assert/release. * Start moving IEC bus access and state management out of virtual devices. * Make IEC state private and move IEC access macros to _protocol.h * Speed up transfer. * Don't blindly read past end of D64 sector. * Whitespace cleanup. * Put state machine into cbm_on_clk_isr_handler() * Add dynamic delaying before starting transfer. * JiffyDOS. * Remove unused functions. * Don't set bus idle when there's no current command. * Remove COMPLEX_WAIT ifdef * Remove legacy IEC_ASSERT_RELEASE_AS_FUNCTIONS * Don't send command on EOI, wait for unlisten. * Don't releaseLines() until ATN is released. * Don't try to do secondary command if there's no primary command. * Don't discard bytes during LISTEN. * Release lines immediately on LISTEN. * Set state to BUS_IDLE when releasing lines. * Fix problems with transferDelaySinceLast() * Revert CoCo WIPs so latest firmware builds work for CoCo (FujiNetWIFI#817) * Revert "Renamed onTimer because it's a global and conflicts." This reverts commit fd750ff. * Revert "Added support for missing DriveWire commands" This reverts commit 7a0f211. * sync latest changes from Meatloaf * skip clk isr after unlisten/untalk add delay after clk release in turnaround * careful with constant changes for s3. * [iec] add PIN_DEBUG remove skip in CLK ISR * [iec] fix ml http client add define for JIFFYDOS replace timer functions in _protocol * [iec] enhance ML HTTP client streaming * [iec] adjustments to ML HTTP client * [iec] loading media via HTTP is almost as fast as from SD now! * Merge branch 'iec-tnfs' * [CoCo] WebUI mark some sections as experimental Printer, Modem, Tape Recorder and CP/M as experimental - hidden unless "Show experimental features" is checked * [CoCo] Add Emulator section into WebUI - Added Emulator Settings to enable/disable Becker port, FN-PC, FN-ESP - Added Serial Port section to configure port and baud rate, FN-PC only - Used BOIP configuration to keep enabled/disabled, host or IP and port - For Atari NetSIO, used BOIP configuration section too - Removed NetSIO configuration section - Introduced tweaks.platform in webui/config yaml to allow platform specific texts and controls in WebUI * [PC] update fnconfig.ini * [coco] Update Becker interface on ESP - On ESP, restart FujiNet after Becker enable/disable Serial port driver on ESP was not happy when loaded/unloaded from web server task. - On ESP, no Becker host:port setting in WebUI Default settings is to listen on all IPs (i.e. WiFi IP on FN-ESP) * fnSystem: fix SD card detect for non Atari platforms * [fuji][sio]: QR encoder initial proof of concept * [fuji][atari] QR: to_bits, to_atascii, dynamic sizes * [fuji][sio] QR: use diagonal line atascii * [fuji] QR: add docs/comments * [fuji] QR: fix non-pc builds * [http] add simple URL shortening to web server * [sio] QR: add url shorten option to encode * [http] fix: include algorithm header for all_of * [http] fix missing include vector * small correction in index.tmpl.html * [PC] fix Windows build * [rs232] tweaks. * [fujinet-pc] fix HSIO with serial port SIO * atari: new Altirra 850 handler and relocator to fix break key crash. modem now checks filesize of handler and relocator * add clock SOS time format back in * Device ESP32-S3 : Add Analogic & I2s Audio Out * Only set the network unit if the command count has a value sent by fujinet-lib that supports it * [FN-PC/Atari] poll NetSIO from sio_copy_file() * [network-protocol][http] try GET if PROPFIND fails. * [network-protocol][http] add 408 timeout to the propfind check. * [network-protocol][http] force http_transaction() on open dir handle if propfind fails. * Be smarter about finding python3 * [iwm][fuji] set read_only prior to mount. * FsSD: remove uneeded ternary for debug print * [network-protocol] do not emit EOF on write. * [printer-emulator] PDF printers should support form feed. * Updated SP-over-SLIP protocol. Note: This is an incompatible protocol change. It requires a companion change in AppleWin. FujiNet makes use of command list bytes there weren't used so far. This only works with CBus because CBus alwaways tranports all possible command list bytes no matter what command is given. Now the SP-over-SLIP protocol shows exactly the same behavior CBus protocol. * Fixed tabs. * [rs232][fuji] autorun.img * [rs232][fuji] add some debug msgs. * [rs232][disk] add disk read debugging. * [rs232] undo atari hacks. * Validate the path in Fujinet "hosts list" browser in the web UI. Before this commit it's possible to escape the configured root by specifying .. in the escaped slash: http://localhost:8000/browse/host/1/%2F..%2F..%2F..%2F --------- Co-authored-by: Jaime Idolpx <jaime@idolpx.com> Co-authored-by: Thomas Cherryhomes <thom.cherryhomes@gmail.com> Co-authored-by: Mark Fisher <mark.j.fisher@gmail.com> Co-authored-by: Chris Osborn <fozztexx@fozztexx.com> Co-authored-by: mozzwald <mozzwald@gmail.com> Co-authored-by: Andrew Diller <dillera@dillernet.com> Co-authored-by: Boisy Pitre <boisy@pitre.org> Co-authored-by: Noah Burney <noah.burney@gmail.com> Co-authored-by: Jeff Piepmeier <14281690+jeffpiep@users.noreply.github.com> Co-authored-by: Michael Sternberg <mhsternberg@gmail.com> Co-authored-by: Jan Krupa <apc.atari@gmail.com> Co-authored-by: Eric Carr <eric.carr@gmail.com> Co-authored-by: robjustice <j.robert.justice@gmail.com> Co-authored-by: naeloob <25527142+naeloob@users.noreply.github.com> Co-authored-by: Oliver Schmidt <ol.sc@web.de> Co-authored-by: Tomek Rękawek <trekawek@gmail.com> * update * tnfs menu changes * updating dir_seek and dir_tell menu options * removing unused option * removing unused method * remove unused var * update * remove planning doc * update * update * updating menu parse --------- Co-authored-by: Jaime Idolpx <jaime@idolpx.com> Co-authored-by: Thomas Cherryhomes <thom.cherryhomes@gmail.com> Co-authored-by: Mark Fisher <mark.j.fisher@gmail.com> Co-authored-by: Chris Osborn <fozztexx@fozztexx.com> Co-authored-by: mozzwald <mozzwald@gmail.com> Co-authored-by: Andrew Diller <dillera@dillernet.com> Co-authored-by: Boisy Pitre <boisy@pitre.org> Co-authored-by: Noah Burney <noah.burney@gmail.com> Co-authored-by: Jeff Piepmeier <14281690+jeffpiep@users.noreply.github.com> Co-authored-by: Michael Sternberg <mhsternberg@gmail.com> Co-authored-by: Jan Krupa <apc.atari@gmail.com> Co-authored-by: Eric Carr <eric.carr@gmail.com> Co-authored-by: robjustice <j.robert.justice@gmail.com> Co-authored-by: naeloob <25527142+naeloob@users.noreply.github.com> Co-authored-by: Oliver Schmidt <ol.sc@web.de> Co-authored-by: Tomek Rękawek <trekawek@gmail.com>
diff --git a/lib/FileSystem/fnFS.h b/lib/FileSystem/fnFS.h
@@ -42,6 +42,14 @@ enum fsType
     FSTYPE_COUNT
 };
 
+enum resourceType
+{
+    RESOURCE_TYPE_TEXT = 0,
+    RESOURCE_TYPE_FOLDER,
+    RESOURCE_TYPE_LINK,
+    RESOURCE_TYPE_FILE
+};
+
 #define DIR_OPTION_DESCENDING 0x0001 // Sort descending, not ascending
 #define DIR_OPTION_FILEDATE 0x0002 // Sort by date, not name
 
@@ -51,6 +59,7 @@ struct fsdir_entry
     bool isDir;
     uint32_t size;
     time_t modified_time;
+    uint8_t resourceType;
 };
 typedef struct fsdir_entry fsdir_entry_t;
 
diff --git a/lib/device/sio/fuji.cpp b/lib/device/sio/fuji.cpp
@@ -1133,14 +1133,17 @@ void _set_additional_direntry_details(fsdir_entry_t *f, uint8_t *dest, uint8_t m
 
     dest[8] = f->isDir ? FF_DIR : 0;
 
-    maxlen -= 10; // Adjust the max return value with the number of additional bytes we're copying
+    maxlen -= 11; // Adjust the max return value with the number of additional bytes we're copying
     if (f->isDir) // Also subtract a byte for a terminating slash on directories
         maxlen--;
     if (strlen(f->filename) >= maxlen)
         dest[8] |= FF_TRUNC;
 
     // File type
     dest[9] = MediaType::discover_disktype(f->filename);
+
+    // Resource Type
+    dest[10] = f->resourceType;
 }
 
 // TODO: VERIFY THIS CODE. THE STASH SEEMED CORRUPT
diff --git a/lib/fuji/fujiHost.cpp b/lib/fuji/fujiHost.cpp
@@ -108,7 +108,8 @@ uint16_t fujiHost::dir_tell()
     case HOSTTYPE_TNFS:
     case HOSTTYPE_SMB:
     case HOSTTYPE_FTP:
-        result = _fs->dir_tell();
+        if (_menu.get_initialized()) result = _menu.get_pos();
+        else result = _fs->dir_tell();
         break;
     case HOSTTYPE_UNINITIALIZED:
         break;
@@ -129,7 +130,8 @@ bool fujiHost::dir_seek(uint16_t pos)
     case HOSTTYPE_TNFS:
     case HOSTTYPE_SMB:
     case HOSTTYPE_FTP:
-        result = _fs->dir_seek(pos);
+        if (_menu.get_initialized()) result = _menu.set_pos(pos);
+        else result = _fs->dir_seek(pos);
         break;
     case HOSTTYPE_UNINITIALIZED:
         break;
@@ -165,6 +167,13 @@ bool fujiHost::dir_open(const char *path, const char *pattern, uint16_t options)
     case HOSTTYPE_UNINITIALIZED:
         break;
     }
+
+    // if there is a tnfs.menu file, initialize the menu for 
+    if (strlen(realpath) > 1) strlcat(realpath, "/tnfs.menu", 256);
+    else strlcat(realpath, "tnfs.menu", 256);
+    FILE * mf = _fs->file_open(realpath, "r");
+    if (mf) _menu.init(realpath, mf);
+
     return result;
 }
 
@@ -178,7 +187,8 @@ fsdir_entry_t *fujiHost::dir_nextfile()
     case HOSTTYPE_TNFS:
     case HOSTTYPE_SMB:
     case HOSTTYPE_FTP:
-        return _fs->dir_read();
+        if (_menu.get_initialized()) return _menu.next_menu_entry();
+        else return _fs->dir_read();
     case HOSTTYPE_UNINITIALIZED:
         break;
     }
@@ -188,6 +198,7 @@ fsdir_entry_t *fujiHost::dir_nextfile()
 
 void fujiHost::dir_close()
 {
+    _menu.release();
     if (_type != HOSTTYPE_UNINITIALIZED && _fs != nullptr)
         _fs->dir_close();
 }
@@ -500,4 +511,10 @@ bool fujiHost::umount()
 
     // Try unmounting TNFS/SMB/FTP
     return 0 == unmount_fs();
-}
+}
+
+fujiMenu * fujiHost::get_menu()
+{
+    if (_menu.get_initialized()) return &_menu;
+    else  return nullptr;
+}
diff --git a/lib/fuji/fujiHost.h b/lib/fuji/fujiHost.h
@@ -2,6 +2,7 @@
 #define _FUJI_HOST_
 
 #include "fnFS.h"
+#include "fujiMenu.h"
 
 #define MAX_HOSTNAME_LEN 32
 #define MAX_HOST_PREFIX_LEN 256
@@ -21,6 +22,8 @@ class fujiHost
     const char * _sdhostname = "SD";
     FileSystem *_fs = nullptr;
     fujiHostType _type;
+    fujiMenu  _menu;
+
     char _hostname[MAX_HOSTNAME_LEN] = { '\0' };
     char _prefix[MAX_HOST_PREFIX_LEN] = { '\0' };
 
@@ -43,6 +46,7 @@ class fujiHost
 
     void set_type(fujiHostType type);
     fujiHostType get_type() { return _type; };
+    fujiMenu * get_menu();
 
     void set_hostname(const char *hostname);
     const char* get_hostname(char *buffer, size_t buffersize);
diff --git a/lib/fuji/fujiMenu.cpp b/lib/fuji/fujiMenu.cpp
@@ -0,0 +1,217 @@
+#include "fujiMenu.h"
+
+#include <cstring>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "../../include/debug.h"
+
+#include "fnFsSD.h"
+#include "fnFsTNFS.h"
+
+#include "utils.h"
+
+bool fujiMenu::init(const char *path, FILE * mf)
+{
+    Debug_printf("fujiMenu::init, IN\r\n");
+    release();
+    _menu_file = mf;
+    return true;
+}
+
+void fujiMenu::release()
+{
+    _current_offset = 0;
+    _current_pos = 0;
+
+    if (_menu_file != nullptr) 
+    {
+        fclose(_menu_file);
+        _menu_file = nullptr;
+    }
+}
+
+bool fujiMenu::set_pos(uint16_t newPos) 
+{
+
+    char tempBuf[TNFSMENU_MAX_LINE_LEN];
+
+    // find the offset of the new menu position.
+    _current_pos = 0;
+    _current_offset = 0;
+    int linelen = 0;
+
+    while (_current_pos < newPos && fgets(tempBuf, TNFSMENU_MAX_LINE_LEN, _menu_file)) 
+    {
+
+        linelen = strlen(tempBuf);
+
+        if (linelen <= 0)
+        {
+            break;
+        }
+        else if ((_current_offset + linelen) > TNFSMENU_MAX_SIZE) {
+            Debug_printf("fujiMenu::init, truncating menu because it is over TNFSMENU_MAX_SIZE\r\n");
+            break;
+        }
+        else if ((_current_pos + 1) > TNFSMENU_MAX_LINES) {
+            Debug_printf("fujiMenu::init, truncating menu because it is over TNFSMENU_MAX_LINES\r\n");
+            break;
+        }
+
+        _current_pos += 1;
+        _current_offset += linelen;
+    }
+
+    return true;
+}
+
+int16_t fujiMenu::decode_menutype(const char * buf, int numDigits)
+{
+    Debug_printf("fujiMenu decode menutype in\r\n");
+    int16_t retval = 0;
+    int mult = 1;
+    for (int i = (numDigits-1); i >= 0; i--) {
+        if (buf[i] < 48 || buf[i] > 57) return -1;
+        retval += ((buf[i]-48)*mult);
+        mult = (mult*10);
+    }
+    Debug_printf("fujiMenu decode menutype out %i\r\n", retval);
+    return retval;
+}
+
+/*
+ * Get the next menu item. Menu items have the format:
+ *
+ *     <type>|<resource>|<display name>
+ *
+ *     OR
+ *
+ *     <item resource>
+ *
+ * Where:
+ *
+ *     <type> is the numeric type ID of the menu item.
+ *     <resource> this is the name of the item as shoudl be displyed on screen
+ *     <displayname> screen friendly display name for the resource.
+ */
+
+fsdir_entry_t * fujiMenu::next_menu_entry() 
+{
+    char tempBuf[TNFSMENU_MAX_LINE_LEN];
+    char myBuf[TNFSMENU_MAX_LINE_LEN];
+    _type = RESOURCE_TYPE_TEXT;
+    _displayname_len = 0;
+    _resource_len = 0;
+    memset(_displayname, 0, TNFSMENU_MAX_DISPLAY_NAME);
+    memset(_resource, 0, TNFSMENU_MAX_RESOURCE);
+    uint8_t displayNameStart = 0;
+    uint8_t resourceStart = 0;
+
+    // if we have an offset, skip to it. 
+    if (_current_offset > 0) 
+    {
+        if (fseek(_menu_file, _current_offset, 0) != 0)
+        {
+            Debug_printf("fujiMenu::next_menu_entry, cannot seek to current offset.\r\n");
+            return nullptr;
+        }
+    }
+
+    if (!fgets(tempBuf, TNFSMENU_MAX_LINE_LEN, _menu_file)) 
+    {
+        Debug_printf("fujiMenu::next_menu_entry, can't read next line from menu file\r\n");
+        return nullptr;
+    }
+
+    _current_pos += 1;
+    _current_offset += strlen(tempBuf);
+
+    // menu format: [<type>|]<name>[|<item>]
+
+    int len = strlen(tempBuf);
+
+    if (len>0 && tempBuf[len-1] == '\n') {
+        tempBuf[len-1] = 0;
+        len--;
+    }
+    else return nullptr;
+
+    int newBufPos = 0;
+    int offsets[4];
+    char lastChar = ' ';        
+    int count = 0;
+    _displayname_len = len;
+    _resource_len = len;
+
+    for (int i=0; i<len; i++) 
+    {
+        if (tempBuf[i] == '|' && lastChar != '\\') {
+            myBuf[newBufPos] = 0;
+            newBufPos++;
+            offsets[count] = newBufPos;
+            if (count == 0) {
+                displayNameStart = newBufPos;
+                _displayname_len = (len - newBufPos);
+                resourceStart = displayNameStart;
+                _resource_len = _displayname_len;
+            }
+            else if (count == 1) {
+                _displayname_len = (i - displayNameStart);
+                resourceStart = newBufPos;
+                _resource_len = (len - resourceStart);
+            }
+            count++;
+            lastChar = tempBuf[i];
+        }
+        else if (tempBuf[i] == '\\') {
+            lastChar = '\\';
+        }
+        else {
+            myBuf[newBufPos] = tempBuf[i];
+            newBufPos++;
+            lastChar = tempBuf[i];
+        }
+    }
+
+    if (count > 0) {
+        _type = decode_menutype(tempBuf, displayNameStart-1);
+    }
+
+    if (_debug) {
+        for (int i = 0; i < count; i++) {
+            Debug_printf("fujiMenu::read_menu_entry offset %i: %s\r\n", i,  &myBuf[offsets[i]]);
+        }
+    }
+
+    if (_displayname_len >= TNFSMENU_MAX_DISPLAY_NAME) _displayname_len = TNFSMENU_MAX_DISPLAY_NAME-1;
+    if (_resource_len >= TNFSMENU_MAX_RESOURCE) _resource_len = TNFSMENU_MAX_RESOURCE-1;
+
+    strncpy(_displayname, &myBuf[displayNameStart], _displayname_len);
+    strncpy(_resource, &myBuf[resourceStart], _resource_len);
+
+    if (_debug) {
+        Debug_printf("fujiMenu::read_menu_entry _displayname: %s\r\n", _displayname);
+        Debug_printf("fujiMenu::read_menu_entry _resource: %s\r\n", _resource);
+    }
+
+    // populate _direntry;
+    strncpy(_direntry.filename, _resource, MAX_PATHLEN);
+    _direntry.isDir = (_type == RESOURCE_TYPE_FOLDER);
+    _direntry.size = 0;
+    _direntry.modified_time = 0;
+    _direntry.resourceType = _type;
+    return &_direntry;
+}
+
+uint8_t fujiMenu::get_displayname(char * p)
+{
+    strcpy(p, _displayname);
+    return _displayname_len;
+}
+
+uint8_t fujiMenu::get_resource(char *p)
+{
+    strcpy(p, _resource);
+    return _resource_len;
+}
diff --git a/lib/fuji/fujiMenu.h b/lib/fuji/fujiMenu.h
@@ -0,0 +1,49 @@
+#ifndef _FUJI_MENU_
+#define _FUJI_MENU_
+
+#include <stdio.h>
+#include "fnFS.h"
+
+#define TNFSMENU_MAX_SIZE 65535
+#define TNFSMENU_MAX_DISPLAY_NAME 80
+#define TNFSMENU_MAX_RESOURCE 168
+#define TNFSMENU_MAX_LINE_LEN MAX_PATHLEN
+#define TNFSMENU_MAX_LINES 4096
+
+class fujiMenu
+{
+private:
+
+    FILE * _menu_file = nullptr;
+    uint16_t _current_offset = 0;
+    uint16_t _current_pos = 0;
+    fsdir_entry _direntry;
+    bool _debug = false;;
+
+    uint8_t _type = RESOURCE_TYPE_TEXT;
+    uint8_t _displayname_len = 0;
+    char _displayname[TNFSMENU_MAX_DISPLAY_NAME];
+    uint8_t _resource_len = 0;
+    char _resource[TNFSMENU_MAX_RESOURCE];
+    int16_t decode_menutype(const char * buf, int numDigits);
+
+public:
+
+    fujiMenu() {};
+    ~fujiMenu() {};
+
+    uint16_t get_menu_entry_type() { return _type; };
+    uint8_t get_displayname_len() { return _displayname_len; };
+    uint8_t get_resource_len() { return _resource_len; };
+    uint8_t get_displayname(char * p);
+    uint8_t get_resource(char * p);
+    bool init(const char *path, FILE * mf);
+    void release();
+    bool get_initialized() { return (_menu_file != nullptr); };
+    uint16_t get_pos() { return _current_offset; };
+    bool set_pos(uint16_t newPos);
+    fsdir_entry_t *  next_menu_entry();
+
+};
+
+#endif // _FUJI_MENU_
