The Launchers (#122)

Author: rumbledethumps

src/ria/CMakeLists.txt

@@ -57,11 +57,6 @@ target_compile_definitions(${RIA_TARGET} PRIVATE
 )
 
 target_sources(${RIA_TARGET} PRIVATE
-    ../emu8950/emu8950.c
-    ../fatfs/ff.c
-    ../fatfs/ffunicode.c
-    ../littlefs/lfs.c
-    ../littlefs/lfs_util.c
     main.c
     api/api.c
     api/atr.c
@@ -71,6 +66,7 @@ target_sources(${RIA_TARGET} PRIVATE
     api/pro.c
     api/std.c
     aud/aud.c
+    aud/bel.c
     aud/opl.c
     aud/psg.c
     hid/hid.c
@@ -104,11 +100,20 @@ target_sources(${RIA_TARGET} PRIVATE
     sys/sys.c
     sys/vga.c
     usb/msc.c
+    usb/nfc.c
     usb/usb.c
     usb/vcp.c
     usb/xin.c
 )
 
+target_sources(${RIA_TARGET} PRIVATE
+    ${PROJECT_SOURCE_DIR}/src/emu8950/emu8950.c
+    ${PROJECT_SOURCE_DIR}/src/fatfs/ff.c
+    ${PROJECT_SOURCE_DIR}/src/fatfs/ffunicode.c
+    ${PROJECT_SOURCE_DIR}/src/littlefs/lfs.c
+    ${PROJECT_SOURCE_DIR}/src/littlefs/lfs_util.c
+)
+
 target_link_libraries(${RIA_TARGET} PRIVATE
     pico_aon_timer
     pico_stdlib

src/ria/api/atr.c

@@ -7,6 +7,7 @@
 #include "api/api.h"
 #include "api/atr.h"
 #include "api/oem.h"
+#include "api/pro.h"
 #include "api/std.h"
 #include "str/rln.h"
 #include "sys/com.h"
@@ -21,108 +22,37 @@
 static inline void DBG(const char *fmt, ...) { (void)fmt; }
 #endif
 
-/*
-    THIS IS A WORK IN PROGRESS
-    IT IS INCOMPLETE
-*/
-
-/*
- * Attribute System - dispatches get/set to actual data sources
- * -------------------------------------------------------------
- * Readline attributes (0x00-0x0F) - state lives in rln.c:
- *   0x01 ATR_SUPPRESS_END_MOVE    - Suppress cursor move to end after input (bool, default 0)
- *   0x02 ATR_SUPPRESS_NEWLINE     - Suppress newline after input (bool, default 0)
- *   0x03 ATR_ENABLE_HISTORY       - Enable input history (bool, default 0)
- *   0x04 ATR_MAX_LENGTH           - Readline length limit 0-255 (uint8, default 254)
- *   0x05 ATR_TIMEOUT              - Timeout in milliseconds (uint32, 0 = disabled)
- *   0x06 ATR_CTRL_BITS            - End readline on ctrl chars (uint32)
- *   0x07 ATR_END_CHAR             - Char that ended readline (uint8, read-only)
- *   0x08 ATR_TIMED_OUT            - True if readline timed out (bool, read-only)
- *   0x09 ATR_CURSOR_POS           - Cursor position (uint8, 0xFF = end of line)
- *
- * System attributes (0x80-0x8F) - deprecated API functions mirrored:
- *   0x80 ATR_PHI2_KHZ             - CPU clock in kHz (uint16, read-only via attr)
- *   0x81 ATR_CODE_PAGE            - OEM code page (uint16)
- *   0x82 ATR_LRAND                - Random number (uint32, read-only)
- *   0x83 ATR_ERRNO_OPT            - Errno option (uint8, read-only via attr)
- */
+// Attribute IDs
+#define ATR_ERRNO_OPT 0x00
+#define ATR_PHI2_KHZ 0x01
+#define ATR_CODE_PAGE 0x02
+#define ATR_RLN_LENGTH 0x03
+#define ATR_LRAND 0x04
+#define ATR_BEL 0x05
+#define ATR_LAUNCHER 0x06
 
-// Attribute IDs - readline (0x00-0x0F)
-#define ATR_SUPPRESS_END_MOVE 0x01
-#define ATR_SUPPRESS_NEWLINE 0x02
-#define ATR_ENABLE_HISTORY 0x03
-#define ATR_MAX_LENGTH 0x04
-#define ATR_TIMEOUT 0x05
-#define ATR_CTRL_BITS 0x06
-#define ATR_END_CHAR 0x07
-#define ATR_TIMED_OUT 0x08
-#define ATR_CURSOR_POS 0x09
-
-// Attribute IDs - system (0x80-0x8F) - mirrors deprecated APIs
-#define ATR_PHI2_KHZ 0x80
-#define ATR_CODE_PAGE 0x81
-#define ATR_LRAND 0x82
-#define ATR_ERRNO_OPT 0x83
-
-// int ria_get_attr(uint32_t *attr, uint8_t attr_id);
+// long ria_get_attr(uint8_t attr_id);
 bool atr_api_get(void)
 {
-    uint8_t attr_id = API_A;
-    uint32_t value = 0;
-
-    switch (attr_id)
+    switch (API_A)
     {
-    // Readline attributes - dispatch to rln.c
-    case ATR_SUPPRESS_END_MOVE:
-        value = rln_get_suppress_end_move() ? 1 : 0;
-        break;
-    case ATR_SUPPRESS_NEWLINE:
-        value = rln_get_suppress_newline() ? 1 : 0;
-        break;
-    case ATR_ENABLE_HISTORY:
-        value = rln_get_enable_history() ? 1 : 0;
-        break;
-    case ATR_MAX_LENGTH:
-        value = rln_get_max_length();
-        break;
-    case ATR_TIMEOUT:
-        value = rln_get_timeout();
-        break;
-    case ATR_CTRL_BITS:
-        value = rln_get_ctrl_bits();
-        break;
-    case ATR_END_CHAR:
-        value = rln_get_end_char();
-        break;
-    case ATR_TIMED_OUT:
-        value = rln_get_timed_out() ? 1 : 0;
-        break;
-    case ATR_CURSOR_POS:
-        value = rln_get_cursor_pos();
-        break;
-
-    // System attributes - dispatch to respective modules
+    case ATR_ERRNO_OPT:
+        return api_return_axsreg(api_get_errno_opt());
     case ATR_PHI2_KHZ:
-        value = cpu_get_phi2_khz();
-        break;
+        return api_return_axsreg(cpu_get_phi2_khz_run());
     case ATR_CODE_PAGE:
-        value = oem_get_code_page();
-        break;
+        return api_return_axsreg(oem_get_code_page_run());
+    case ATR_RLN_LENGTH:
+        return api_return_axsreg(rln_get_max_length());
     case ATR_LRAND:
-        value = get_rand_32() & 0x7FFFFFFF;
-        break;
-    case ATR_ERRNO_OPT:
-        value = api_get_errno_opt();
-        break;
-
+        return api_return_axsreg(get_rand_64() & 0x7FFFFFFF);
+    case ATR_BEL:
+        return api_return_axsreg(com_get_bel());
+    case ATR_LAUNCHER:
+        return api_return_axsreg(pro_get_launcher());
     default:
         return api_return_errno(API_EINVAL);
     }
-
-    // Push value to xstack for return
-    if (!api_push_uint32(&value))
-        return api_return_errno(API_ENOMEM);
-    return api_return_ax(0);
 }
 
 // int ria_set_attr(uint32_t attr, uint8_t attr_id);
@@ -132,134 +62,57 @@ bool atr_api_set(void)
     uint32_t value;
     if (!api_pop_uint32_end(&value))
         return api_return_errno(API_EINVAL);
-
     switch (attr_id)
     {
-    // Readline attributes - dispatch to rln.c
-    case ATR_SUPPRESS_END_MOVE:
-        rln_set_suppress_end_move(value != 0);
-        break;
-    case ATR_SUPPRESS_NEWLINE:
-        rln_set_suppress_newline(value != 0);
-        break;
-    case ATR_ENABLE_HISTORY:
-        rln_set_enable_history(value != 0);
-        break;
-    case ATR_MAX_LENGTH:
-        rln_set_max_length((uint8_t)value);
-        break;
-    case ATR_TIMEOUT:
-        rln_set_timeout(value);
-        break;
-    case ATR_CTRL_BITS:
-        rln_set_ctrl_bits(value);
-        break;
-    case ATR_END_CHAR:
-        // Read-only, ignore silently
-        break;
-    case ATR_TIMED_OUT:
-        // Read-only, ignore silently
-        break;
-    case ATR_CURSOR_POS:
-        rln_set_cursor_pos((uint8_t)value);
+    case ATR_ERRNO_OPT:
+        api_set_errno_opt((uint8_t)value);
         break;
-
-    // System attributes
     case ATR_PHI2_KHZ:
-        // TODO ephemeral
-        cpu_set_phi2_khz((uint16_t)value);
+        cpu_set_phi2_khz_run((uint16_t)value);
         break;
     case ATR_CODE_PAGE:
-        oem_set_code_page_ephemeral((uint16_t)value);
+        oem_set_code_page_run((uint16_t)value);
         break;
-    case ATR_LRAND:
-        // Read-only, ignore silently
+    case ATR_RLN_LENGTH:
+        rln_set_max_length((uint8_t)value);
         break;
-    case ATR_ERRNO_OPT:
-        api_set_errno_opt((uint8_t)value);
+    case ATR_BEL:
+        com_set_bel((bool)!!(uint8_t)value);
         break;
-
+    case ATR_LAUNCHER:
+        pro_set_launcher((bool)!!(uint8_t)value);
+        break;
+    case ATR_LRAND: // Read only
     default:
         return api_return_errno(API_EINVAL);
     }
-
-    return api_return_ax(0);
-}
-
-// int ria_set_readline(char *buf);
-// Sets buffer for readline continuation. Buffer is on xstack, null-terminated.
-bool atr_api_set_readline(void)
-{
-    // Get buffer from xstack (null-terminated string)
-    char *buf = (char *)&xstack[xstack_ptr];
-    size_t len = strlen(buf);
-
-    // Clamp length to max_length
-    uint8_t max_len = rln_get_max_length();
-    if (len > max_len)
-        len = max_len;
-
-    // Validate cursor position (0xFF means end of line)
-    uint8_t cursor_pos = rln_get_cursor_pos();
-    if (cursor_pos > len)
-        cursor_pos = len;
-    rln_set_cursor_pos(cursor_pos);
-
-    // Output the buffer contents (with potential newline expansion based on setting)
-    for (size_t i = 0; i < len; i++)
-    {
-        putchar(buf[i]);
-    }
-
-    // Move cursor back if not at end and not suppressing end move
-    if (!rln_get_suppress_end_move() && cursor_pos < len)
-    {
-        printf("\33[%dD", (int)(len - cursor_pos));
-    }
-
-    xstack_ptr = XSTACK_SIZE;
     return api_return_ax(0);
 }
 
 /*
  * Deprecated API functions - moved here from their original modules.
- * These are the old API op codes that are now also accessible via attributes.
+ * These are the old API op codes that are now accessible via attributes.
  */
 
-// int phi2(unsigned khz) - set/get CPU clock
+// int phi2(void) - set/get CPU clock
 bool atr_api_phi2(void)
 {
-    uint16_t khz = API_AX;
-    if (khz)
-        cpu_set_phi2_khz(khz);
-    return api_return_ax(cpu_get_phi2_khz());
+    return api_return_ax(cpu_get_phi2_khz_run());
 }
 
 // int codepage(unsigned cp) - set/get OEM code page
 bool atr_api_code_page(void)
 {
     uint16_t cp = API_AX;
     if (cp)
-        oem_set_code_page_ephemeral(cp);
-    return api_return_ax(oem_get_code_page());
+        oem_set_code_page_run(cp);
+    return api_return_ax(oem_get_code_page_run());
 }
 
 // long lrand(void) - get random number
 bool atr_api_lrand(void)
 {
-    return api_return_axsreg(get_rand_32() & 0x7FFFFFFF);
-}
-
-// int stdin_opt(unsigned long ctrl_bits, unsigned char str_length)
-bool atr_api_stdin_opt(void)
-{
-    uint8_t str_length = API_A;
-    uint32_t ctrl_bits;
-    if (!api_pop_uint32_end(&ctrl_bits))
-        return api_return_errno(API_EINVAL);
-    rln_set_max_length(str_length);
-    rln_set_ctrl_bits(ctrl_bits);
-    return api_return_ax(0);
+    return api_return_axsreg(get_rand_64() & 0x7FFFFFFF);
 }
 
 // int errno_opt(unsigned char opt) - set errno mapping
@@ -270,45 +123,3 @@ bool atr_api_errno_opt(void)
         return api_return_errno(API_EINVAL);
     return api_return_ax(0);
 }
-
-// stdin_opt is garbage. it's time to make better controls
-// for the custom OS readline-like system on stdin/stdout.
-// It should not be tcgetattr/tcsetattr. Do something best for this.
-// Do not delete these requirements, convert into terse comment documentation that will be expanded later.
-
-// Need to set these, typically only once to init, get optional
-//-----------
-// bool to disable newline expansion. default off
-// bool to supress moving to end of line after input. default off
-// bool to supress newline after input. default off
-// bool to enable input history. default off
-// Limit readline length 0-255 (uint8), default 254
-// Timeout in 6.2 seconds (uint8).
-// End readline on ctrl_bits  (uint32)
-
-// These must have get, setting would be ignored
-// ---------
-// ctrl_bits char that ended previous readline (uint8). always 10(\r) if ctrl_bits==0
-// bool if previous readline timed out
-
-// These must have get/set, typically used with buffer sets and gets
-// ---------
-// Cursor position (uint8)
-
-// ria_set_readline is the opposite of get which is already implemented as from read_* functions.
-// buffer (uint8[256])
-
-// Setting ria_set_readline tells readline to continue editing as if the text
-// was already displayed and the term cursor placed according to "supress moving to end of line".
-// Meaning the term cursor will be moved from the end of line to Cursor position if not supressed.
-
-// Invalid cursor position is moved to end of line. e.g. 0xff always means end of line
-
-// Do not change com.c, use putchar_raw in std_out_write to bypass newline expansion
-
-// These deprecated APIs are now implemented above as atr_api_*:
-// - atr_api_phi2() was cpu_api_phi2()
-// - atr_api_code_page() was oem_api_code_page()
-// - atr_api_lrand() was rng_api_lrand()
-// - atr_api_stdin_opt() was std_api_stdin_opt()
-// - atr_api_errno_opt() was api_api_errno_opt()