Skip to content

Replace fnUART* classes and switch to IOChannel abstraction #1038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 29, 2025
Merged

Replace fnUART* classes and switch to IOChannel abstraction #1038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions fujinet_pc.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,11 @@ set(SOURCES src/main.cpp
lib/utils/U8Char.h lib/utils/U8Char.cpp
lib/hardware/fnWiFi.h lib/hardware/fnDummyWiFi.h lib/hardware/fnDummyWiFi.cpp
lib/hardware/led.h lib/hardware/led.cpp
lib/hardware/fnUART.h lib/hardware/fnUART.cpp
lib/hardware/fnUARTUnix.cpp lib/hardware/fnUARTWindows.cpp
lib/hardware/ACMChannel.cpp lib/hardware/ACMChannel.h
lib/hardware/COMChannel.h lib/hardware/COMChannel.cpp
lib/hardware/IOChannel.cpp lib/hardware/IOChannel.h
lib/hardware/TTYChannel.cpp lib/hardware/TTYChannel.h
lib/hardware/UARTChannel.h
lib/hardware/fnSystem.h lib/hardware/fnSystem.cpp lib/hardware/fnSystemNet.cpp
lib/FileSystem/fnDirCache.h lib/FileSystem/fnDirCache.cpp
lib/FileSystem/fnFileCache.h lib/FileSystem/fnFileCache.cpp
Expand Down Expand Up @@ -263,10 +266,7 @@ if(FUJINET_TARGET STREQUAL "ATARI")
list(APPEND SOURCES

lib/bus/sio/sio.h lib/bus/sio/sio.cpp
lib/bus/sio/siocom/sioport.h lib/bus/sio/siocom/sioport.cpp
lib/bus/sio/siocom/serialsio.h lib/bus/sio/siocom/serialsio.cpp
lib/bus/sio/siocom/netsio.h lib/bus/sio/siocom/netsio.cpp
lib/bus/sio/siocom/fnSioCom.h lib/bus/sio/siocom/fnSioCom.cpp
lib/bus/sio/NetSIO.h lib/bus/sio/NetSIO.cpp
lib/media/atari/diskType.h lib/media/atari/diskType.cpp
lib/media/atari/diskTypeAtr.h lib/media/atari/diskTypeAtr.cpp
lib/media/atari/diskTypeAtx.h lib/media/atari/diskTypeAtx.cpp
Expand Down Expand Up @@ -361,16 +361,13 @@ if(FUJINET_TARGET STREQUAL "COCO")
list(APPEND SOURCES

lib/bus/drivewire/drivewire.h lib/bus/drivewire/drivewire.cpp
lib/bus/drivewire/dwcom/fnDwCom.h lib/bus/drivewire/dwcom/fnDwCom.cpp
lib/bus/drivewire/dwcom/dwport.h lib/bus/drivewire/dwcom/dwport.cpp
lib/bus/drivewire/dwcom/dwserial.h lib/bus/drivewire/dwcom/dwserial.cpp
lib/bus/drivewire/dwcom/dwbecker.h lib/bus/drivewire/dwcom/dwbecker.cpp
lib/bus/drivewire/BeckerSocket.h lib/bus/drivewire/BeckerSocket.cpp

lib/media/drivewire/mediaType.h lib/media/drivewire/mediaType.cpp
lib/media/drivewire/mediaTypeDSK.h lib/media/drivewire/mediaTypeDSK.cpp
lib/media/drivewire/mediaTypeMRM.h lib/media/drivewire/mediaTypeMRM.cpp
lib/media/drivewire/mediaTypeVDK.h lib/media/drivewire/mediaTypeVDK.cpp

lib/device/drivewire/fuji.h lib/device/drivewire/fuji.cpp
lib/device/drivewire/network.h lib/device/drivewire/network.cpp
lib/device/drivewire/dload.h lib/device/drivewire/dload.cpp
Expand Down
4 changes: 2 additions & 2 deletions include/debug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
#ifdef DEBUG
#ifdef ESP_PLATFORM
// Use FujiNet debug serial output
#include "../lib/hardware/fnUART.h"
#include "../lib/hardware/ESP32UARTChannel.h"
#define Serial fnDebugConsole
#if defined(PINMAP_RS232_S3) /*|| defined(PINMAP_ESP32S3_XDRIVE)*/
#ifdef PINMAP_RS232_S3
#define Debug_print(...) printf( __VA_ARGS__ )
#define Debug_printf(...) printf( __VA_ARGS__ )
#define Debug_println(...) do { printf(__VA_ARGS__); printf("\n"); } while (0)
Expand Down
4 changes: 3 additions & 1 deletion lib/bus/adamnet/adamnet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,9 @@ void systemBus::setup()
gpio_isr_handler_add((gpio_num_t)PIN_ADAMNET_RESET, adamnet_reset_isr_handler, (void *)PIN_CARD_DETECT_FIX);

// Set up UART
_port.begin(ADAMNET_BAUDRATE);
_port.begin(ChannelConfig()
.baud(ADAMNET_BAUDRATE)
);
}

void systemBus::shutdown()
Expand Down
8 changes: 4 additions & 4 deletions lib/bus/adamnet/adamnet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* AdamNet Routines
*/

#include "fnUART.h"
#include "UARTChannel.h"
#include <freertos/FreeRTOS.h>
#include <freertos/queue.h>

Expand Down Expand Up @@ -247,7 +247,7 @@ class systemBus
adamFuji *_fujiDev = nullptr;
adamPrinter *_printerDev = nullptr;

UARTManager _port = UARTManager(FN_UART_BUS);
UARTChannel _port;

void _adamnet_process_cmd();
void _adamnet_process_queue();
Expand Down Expand Up @@ -285,12 +285,12 @@ class systemBus

// Everybody thinks "oh I know how a serial port works, I'll just
// access it directly and bypass the bus!" ಠ_ಠ
size_t read(void *buffer, size_t length) { return _port.readBytes(buffer, length); }
size_t read(void *buffer, size_t length) { return _port.read(buffer, length); }
size_t read() { return _port.read(); }
size_t write(const void *buffer, size_t length) { return _port.write(buffer, length); }
size_t write(int n) { return _port.write(n); }
size_t available() { return _port.available(); }
void flush() { _port.flush(); }
void flush() { _port.flushOutput(); }
size_t print(int n, int base = 10) { return _port.print(n, base); }
size_t print(const char *str) { return _port.print(str); }
size_t print(const std::string &str) { return _port.print(str); }
Expand Down
1 change: 0 additions & 1 deletion lib/bus/bus.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@

#ifdef BUILD_RS232
#include "rs232/rs232.h"
#define FN_BUS_PORT fnUartBUS
#endif

#ifdef BUILD_CX16
Expand Down
Loading
Loading