Merge branch 'main' into coco-wifi-fixes

Author: RichStephens

.github/workflows/ci.yml

@@ -0,0 +1,102 @@
+name: CI
+
+on:
+  pull_request:
+    branches: [ main ]
+  push:
+    tags:
+      - "v*"
+  workflow_dispatch: # allows manual run too
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: fozztexx/defoogi:1.4.2
+
+    outputs:
+      files: ${{ steps.list_zips.outputs.files }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build release files
+        run: make release
+
+      - name: List zip files
+        id: list_zips
+        shell: bash
+        run: |
+          echo 'files=["'"$(( cd dist ; echo *.zip ) | sed -e 's/ /","/g')"'"]' >> $GITHUB_OUTPUT
+
+      - name: Upload dist folder for next job
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist
+          path: dist/
+
+  upload:
+    needs: build
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    strategy:
+      matrix:
+        file: ${{ fromJson(needs.build.outputs.files) }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Download dist folder
+        uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist
+
+      - name: Upload individual artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.file }}
+          path: dist/${{ matrix.file }}
+
+  tagged-release:
+    needs: build
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/')
+    steps:
+      - uses: actions/checkout@v4
+
+      # Download the dist folder from the build job
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: dist
+
+      # Generate random release name
+      - name: Generate random release name
+        id: random_name
+        run: |
+          RANDOM_NAME=$(docker run --rm fnichol/names)
+          echo "name=$RANDOM_NAME" >> $GITHUB_OUTPUT
+          echo "Generated release name: $RANDOM_NAME"
+
+      # Create GitHub Release for the tag
+      - name: Create GitHub Release
+        id: create_release
+        uses: actions/create-release@v1
+        with:
+          tag_name: ${{ github.ref_name }}
+          release_name: ${{ steps.random_name.outputs.name }} (${{ github.ref_name }})
+          draft: false
+          prerelease: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      # Upload each zip as a release asset
+      - name: Upload release assets
+        run: |
+          for zip in dist/*.zip; do
+            echo "Uploading $zip..."
+            gh release upload ${{ github.ref_name }} "$zip"
+          done
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Changelog.md

@@ -2,6 +2,16 @@
 
 ## [Unreleased]
 
+## [4.7.8] - 2025-09-23
+
+- [release] Added github workflow to create PR artifacts and release on tag [FoxxTexx]
+- [msdos] Fix MS-DOS compiling. (#36) [FozzTexx]
+- [coco] Fixes to coco wifi functions, and to fujinet-fuji.h (#33) [Rich Stephens]
+- [adam] Add fn_network support for Adam, merge with Thom's changes (#32) [geoffdaddy]
+- [msdos] implement network. (#31) [Thomas Cherryhomes]
+- [adam] Implement fuji adam (#30) [Thomas Cherryhomes]
+
+
 ## [4.7.7] - 2025-06-18
 
 - [atari] Fix return codes from clock_get_time, clock_get_time_tz

Makefile

@@ -3,9 +3,10 @@
 # Set the TARGETS and PROGRAM values as required.
 # See makefiles/build.mk for details on directory structure for src files and how to add custom extensions to the build.
 
-TARGETS = adam atari c64 apple2 apple2enh apple2gs coco
-# TARGETS = pmd85
-# TARGETS = msdos
+TARGETS = adam apple2 apple2enh atari c64 coco
+TARGETS += msdos
+# TARGETS += apple2gs
+# TARGETS += pmd85
 PROGRAM := fujinet.lib
 
 SUB_TASKS := clean disk test release unit-test

adam/src/include/fujinet-network-adam.h

@@ -46,7 +46,7 @@ extern DCB *network_dcb[MAX_NETWORK_DEVICES];
  * @param devicespec The Device Specification "N:..."
  * @return AdamNet unit number.
  */
-uint8_t network_unit_adamnet(char *devicespec);
+uint8_t network_unit_adamnet(const char *devicespec);
 
 /**
  * @brief Return proper unit # for adamnet.
@@ -55,6 +55,6 @@ uint8_t network_unit_adamnet(char *devicespec);
  * @param len Length of the buffer
  * @return Fujinet error code.
  */
-int16_t network_read_adam(char* devicespec, uint8_t *buf, uint16_t len);
+int16_t network_read_adam(const char* devicespec, uint8_t *buf, uint16_t len);
 
 #endif /* FUJINET_NETWORK_ADAM_H */

common/src/fn_network/network_read.c

@@ -34,7 +34,7 @@
 
 #ifdef __WATCOMC__
 #include "fujinet-fuji-msdos.h"
-extern int network_read_msdos(char* devicespec, byte *buf, unsigned int len);
+extern int network_read_msdos(const char* devicespec, unsigned char *buf, unsigned int len);
 #endif /* __WATCOMC__ */
 
 #ifdef __ADAM__

msdos/src/fn_network/network_open.c

@@ -5,7 +5,7 @@
 
 uint8_t network_open(const char* devicespec, uint8_t mode, uint8_t trans)
 {
-  uint8_t device = network_unit();
+  uint8_t device = network_unit(devicespec) + 0x70;
 
   return int_f5_write(device,'O',mode,trans,devicespec,256);
 }

msdos/src/fn_network/network_read_msdos.c

@@ -3,9 +3,9 @@
 #include <fujinet-network.h>
 #include <fujinet-fuji-msdos.h>
 
-int network_read_msdos(char* devicespec, byte *buf, unsigned int len)
+int network_read_msdos(char* devicespec, unsigned char *buf, unsigned int len)
 {
   uint8_t device = network_unit(devicespec) + 0x70;
 
-  return intf5_read(device,'R',len&0xFF,len>>8,(void *)buf,len) == 'C';
+  return int_f5_read(device,'R',len&0xFF,len>>8,(void *)buf,len) == 'C';
 }

msdos/src/fn_network/network_write.c

@@ -7,5 +7,5 @@ uint8_t network_write(const char* devicespec, const uint8_t *buf, uint16_t len)
 {
   uint8_t device = network_unit(devicespec) + 0x70;
 
-  return intf5_write(device,'W',len&0xFF,len>>8,(void *)buf,len) == 'C';
+  return int_f5_write(device,'W',len&0xFF,len>>8,(void *)buf,len) == 'C';
 }

msdos/src/include/fujinet-fuji-msdos.h

@@ -15,6 +15,6 @@
  */
 unsigned char int_f5(unsigned char dev, unsigned char command, unsigned char aux1, unsigned char aux2);
 unsigned char int_f5_read(unsigned char dev, unsigned char command, unsigned char aux1, unsigned char aux2, void *buf, unsigned short len);
-unsigned char int_f5_write(unsigned char dev, unsigned char command, unsigned char aux1, unsigned char aux2, void *buf, unsigned short len);
+unsigned char int_f5_write(unsigned char dev, unsigned char command, unsigned char aux1, unsigned char aux2, const void *buf, unsigned short len);
 
 #endif /* FUJINET_FUJI_MSDOS_H */

version.txt

@@ -1 +1 @@
-4.7.7
+4.7.8