fuse-emulator-cvs — SCM commits for Fuse (the Free Unix Spectrum Emulator), the associated utilities and libspectrum, the ZX Spectrum file format handling library

[fuse-emulator-cvs] [libspectrum] 07/08: arki55/features/T9-github-build-checks (libspectrum)

[<al...@us...>]

This is an automated email from the git hooks/post-receive-user script.

allura pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/a52f4afdeffe7041321e010cb81e68d95fd2f472/

commit a52f4afdeffe7041321e010cb81e68d95fd2f472
Author: Miroslav Ďurčík / Arki55 <mir...@gm...>
AuthorDate: Thu Feb 16 21:18:21 2023 +0100

    arki55/features/T9-github-build-checks (libspectrum)
    
    build: Implemented build workflow for WII platform.
    - Running tests not possible as execution of the compiled code would nee an emulator
    - Only one combination of configure parameters possible - without all libs, fake glib
    - Workflow split into 2 files - one generic supporting input parameters and callable, one file with explicit configure parameters.
    - Callable workflow will be called from Fuse app and Fuse Utils repos
---
 .github/workflows/build_wii.yml     |  18 ++++
 .github/workflows/build_wii_sub.yml | 180 ++++++++++++++++++++++++++++++++++++
 2 files changed, 198 insertions(+)

diff --git a/.github/workflows/build_wii.yml b/.github/workflows/build_wii.yml
new file mode 100644
index 0000000..96ca122
--- /dev/null
+++ b/.github/workflows/build_wii.yml
@@ -0,0 +1,18 @@
+name: Libspectrum for WII
+run-name: Build and test Libspectrum for WII / ${{ github.actor }} /
+
+# Executed upon each commit pushed, merge commit in PR
+on: [push, pull_request]
+  
+jobs:
+  # 1. Only one case possible - without all libs, fake glib
+  default:
+    name: "Libspectrum w/o all libs, fake glib (WII)"
+    uses: ./.github/workflows/build_wii_sub.yml
+    with:
+      key: "default"
+      use_zlib: false
+      use_bzip2: false
+      use_libgcrypt: false
+      use_libaudiofile: false
+      use_fake_glib: true
diff --git a/.github/workflows/build_wii_sub.yml b/.github/workflows/build_wii_sub.yml
new file mode 100644
index 0000000..7a7034d
--- /dev/null
+++ b/.github/workflows/build_wii_sub.yml
@@ -0,0 +1,180 @@
+name: Libspectrum for WII
+run-name: Build and test Libspectrum for WII / ${{ github.actor }} /
+
+on:
+  # Called from fuse app, fuse utils repos
+  workflow_call:
+    inputs:
+      # Name this setup (no spaces please)
+      key:
+        type: string
+        required: true
+      # Path where to clone
+      path:
+        type: string
+        required: false
+        default: '.'
+      # Which branch to checkout
+      branch:
+        type: string
+        required: false
+        default: ""
+      # Configure supported libs
+      use_zlib:
+        type: boolean
+        required: false
+        default: true
+      use_bzip2:
+        type: boolean
+        required: false
+        default: true
+      use_libgcrypt:
+        type: boolean
+        required: false
+        default: true
+      use_libaudiofile:
+        type: boolean
+        required: false
+        default: true
+      use_fake_glib:
+        type: boolean
+        required: false
+        default: false
+      # Repo is taken from var.LIBSPECTRUM_REPO, cannot be passed as input.
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    container: devkitpro/devkitppc
+    defaults:
+      run:
+        shell: bash
+        working-directory: ${{ inputs.path || '.' }}
+    env:
+      # Support push and call triggers, set env.variables
+      LIBSPECTRUM_REPO: ${{ vars.LIBSPECTRUM_REPO || '' }}
+      LIBSPECTRUM_BRANCH: ${{ inputs.branch || '' }}
+      LIBSPECTRUM_PATH: ${{ inputs.path || '.' }}
+
+    steps:
+      - name: (1) Prepare environment
+        run: |
+          echo "Libspectrum repo: $LIBSPECTRUM_REPO"
+          echo "Libspectrum branch: $LIBSPECTRUM_BRANCH"
+          echo "Libspectrum path: $LIBSPECTRUM_PATH"
+          
+          echo "Use lib zlib: ${{ inputs.use_zlib && 'yes' || 'no' }}"
+          echo "Use lib bzip2: ${{ inputs.use_bzip2 && 'yes' || 'no' }}"
+          echo "Use lib libgcrypt: ${{ inputs.use_libgcrypt && 'yes' || 'no' }}"
+          echo "Use lib libaudiofile: ${{ inputs.use_libaudiofile && 'yes' || 'no' }}"
+          echo "Use fake glib: ${{ inputs.use_fake_glib && 'yes' || 'no' }}"
+          
+          echo "Available pacman packages:"
+          dkp-pacman -Sl
+          echo ""
+          
+          echo "Available devkitPro packages:"
+          dkp-pacman -Sl dkp-libs
+          echo ""
+
+      - name: (2) Check out repository code
+        uses: actions/checkout@v3
+        with:
+          repository: ${{ env.LIBSPECTRUM_REPO }}
+          ref: ${{ env.LIBSPECTRUM_BRANCH }}
+          path: ${{ env.LIBSPECTRUM_PATH }}
+
+      - name: (3) Restore lib packages
+        run: |
+          echo "Not needed here"
+
+      - name: (4) Install dependencies
+        run: |
+          echo "Installing dependencies .."
+          echo "Using devkitpro/devkitppc image"
+          sudo apt-get update
+          sudo apt-get -y install --no-install-recommends \
+            wget tar autoconf automake libtool && \
+          sudo rm -rf /var/lib/apt/lists/*
+          echo "Done."
+
+      - name: (5) Save lib packages
+        run: |
+          echo "Not needed here"
+
+      - name: (6) Autogen.sh
+        run: |
+          echo "Running autogen.sh .."
+          ./autogen.sh
+
+      - name: (7) Configure for WII
+        run: |
+          echo "Running configure .."
+          ./configure \
+          --target=powerpc-eabi \
+          --host=powerpc-eabi \
+          --prefix=$DEVKITPPC \
+          ${{ inputs.use_zlib == false && '--without-zlib' || '' }} \
+          ${{ inputs.use_bzip2 == false && '--without-bzip2' || '' }} \
+          ${{ inputs.use_libgcrypt == false && '--without-libgcrypt' || '' }} \
+          ${{ inputs.use_libaudiofile == false && '--without-libaudiofile' || '' }} \
+          ${{ inputs.use_fake_glib == true && '--with-fake-glib' || '' }} \
+          | tee ./configure.out
+
+      - name: (8) Verify output from configure
+        run: |
+          .github/scripts/in_config.sh "libspectrum is ready to be compiled"
+          .github/scripts/in_config.sh "zlib support: ${{ inputs.use_zlib && 'yes' || 'no' }}"
+          .github/scripts/in_config.sh "bzip2 support: ${{ inputs.use_bzip2 && 'yes' || 'no' }}"
+          .github/scripts/in_config.sh "libgcrypt support: ${{ inputs.use_libgcrypt && 'yes' || 'no' }}"
+          .github/scripts/in_config.sh "libaudiofile support: ${{ inputs.use_libaudiofile && 'yes' || 'no' }}"
+          .github/scripts/in_config.sh "Internal GLib replacement: ${{ inputs.use_fake_glib && 'yes' || 'no' }}"
+
+      - name: (9) Make
+        run: |
+          echo "Running make .."
+          make
+
+      - name: (10) Install
+        run: |
+          echo "Running make install .."
+          sudo make install
+
+      - name: (11) Copy dependencies
+        run: |
+          echo "Not needed here."
+
+      - name: (12) Run tests
+        id: run-tests
+        run: |
+          echo "Bulding and running tests .."
+          ## make check  <-- cross compiled, cannot execute under Linux
+          echo "FIXME: make check not possible, cross compiled."
+
+      - name: (13) Verbose check tests (on failure)
+        if: failure() && steps.run-tests.outcome != 'success'
+        run: |
+          echo "Listing all tests individually .."
+          ## test/test  <-- cross compiled, cannot execute under Linux
+          echo "FIXME: test/test not possible, cross compiled."
+
+      - name: (14) Pack installed library files
+        # Need to pack files to maintain permissions (+x mainly)
+        run: |
+          find /opt/devkitpro/devkitPPC | grep libspectrum > .tar_files
+          sudo tar -cvf \
+          libspectrum-installed-wii.tar \
+          -C /opt/devkitpro/devkitPPC/ -T.tar_files
+
+      - name: (15) Upload generated tar file
+        uses: actions/upload-artifact@v3
+        with: 
+          name: libspectrum-installed-wii-${{ inputs.key }}
+          path: |
+            libspectrum-installed-wii.tar
+
+      - name: (16) Finish
+        run: |
+          echo "🍏 Finishing with status ${{ job.status }}."

[fuse-emulator-cvs] [libspectrum] 02/08: arki55/features/T9-github-build-checks (libspectrum)

[<al...@us...>]

This is an automated email from the git hooks/post-receive-user script.

allura pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/602af5a4044c52d8a9edd08f51fc9f035c43aa94/

commit 602af5a4044c52d8a9edd08f51fc9f035c43aa94
Author: Miroslav Ďurčík / Arki55 <mir...@gm...>
AuthorDate: Sun Feb 5 16:47:23 2023 +0100

    arki55/features/T9-github-build-checks (libspectrum)
    
    build: New reusable workflow for building and testing libspectrum on Linux.
    - At the end it zips all files (including compiled binaries) and uplouads it a workflow artifact.
    - Executed on  push (commits), pull_request (merge commit). Plus called from FUSE and Fuse Utils repositories (to provide libspectrum library).
    - Repository is used current or as specified by github repo variable LIBSPECTRUM_REPO (must be set in FUse app's and Fuse Util's github repo).
    - Build configuration used by this script:
    
      Platform: Linux
    
      zlib support: yes
      bzip2 support: yes
      libgcrypt support: yes
      libaudiofile support: yes
      Internal GLib replacement: no
---
 .github/workflows/build_linux.yml | 110 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
new file mode 100644
index 0000000..f09bbb9
--- /dev/null
+++ b/.github/workflows/build_linux.yml
@@ -0,0 +1,110 @@
+name: Libspectrum for Linux (1)
+run-name: Build and test Libspectrum for Linux (1) [ all libs, real glib ] / ${{ github.actor }} /
+
+on:
+  # Executed upon each commit pushed
+  push:
+  pull_request:
+  # Called from fuse app, fuse utils repos
+  workflow_call:
+    inputs:
+      path:
+        type: string
+        required: false
+        default: '.'
+      branch:
+        type: string
+        required: false
+      # Repo is taken from var.LIBSPECTRUM_REPO, cannot be passed as input.
+
+jobs:
+  build:
+    name: Build & Test
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    defaults:
+      run:
+        shell: bash
+        working-directory: ${{ inputs.path || '.' }}
+    env:
+      # Support push and call triggers, set env.variables
+      LIBSPECTRUM_REPO: ${{ vars.LIBSPECTRUM_REPO || '' }}
+      LIBSPECTRUM_BRANCH: ${{ inputs.branch || '' }}
+      LIBSPECTRUM_PATH: ${{ inputs.path || '.' }}
+    steps:
+      - name: (1) Prepare environment
+        run: |
+          echo -n "Current directory: "
+          pwd
+          ls -la
+          
+          echo "Libspectrum repo: $LIBSPECTRUM_REPO"
+          echo "Libspectrum branch: $LIBSPECTRUM_BRANCH"
+          echo "Libspectrum path: $LIBSPECTRUM_PATH"
+
+      - name: (2) Check out repository code
+        uses: actions/checkout@v3
+        with:
+          repository: ${{ env.LIBSPECTRUM_REPO }}
+          ref: ${{ env.LIBSPECTRUM_BRANCH }}
+          path: ${{ env.LIBSPECTRUM_PATH }}
+
+      - name: (3) Install dependencies
+        run: |
+          pwd
+          ls -la
+          echo "Installing dependencies .."
+          sudo apt install -y libaudiofile-dev
+
+      - name: (4) Autogen.sh
+        run: |
+          echo "Running autogen.sh .."
+          ./autogen.sh
+
+      - name: (5) Configure for linux (real glib)
+        run: |
+          echo "Running configure .."
+          ./configure | tee ./configure.out
+
+      - name: (6) Verify output from configure
+        run: |
+          .github/scripts/in_config.sh "libspectrum is ready to be compiled"
+          .github/scripts/in_config.sh "zlib support: yes"
+          .github/scripts/in_config.sh "bzip2 support: yes"
+          .github/scripts/in_config.sh "libgcrypt support: yes"
+          .github/scripts/in_config.sh "libaudiofile support: yes"
+          .github/scripts/in_config.sh "Internal GLib replacement: no"
+
+      - name: (7) Make
+        run: |
+          echo "Running make .."
+          make
+
+      - name: (8) Install
+        run: |
+          echo "Running make install .."
+          sudo make install
+
+      - name: (9) Run tests
+        run: |
+          echo "Bulding and running tests .."
+          make check
+
+      - name: (10) Upload generated files
+        # Need to pack files to maintain permissions (+x mainly)
+        run: |
+          tar -cvf \
+          libspectrum-compiled-linux.tar \
+          --exclude=".git" "libspectrum-compiled-linux.tar" \
+          --ignore-failed-read \
+          .
+
+      - uses: actions/upload-artifact@v3
+        with: 
+          name: libspectrum-compiled-linux
+          path: |
+            libspectrum-compiled-linux.tar
+
+      - name: (11) Finish
+        run: |
+          echo "🍏 Finishing with status ${{ job.status }}."

[fuse-emulator-cvs] [libspectrum] 04/08: chore: Correction

[<al...@us...>]

This is an automated email from the git hooks/post-receive-user script.

allura pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/cd8d1005ea16ac9e2cc94d80071f38611942ddd7/

commit cd8d1005ea16ac9e2cc94d80071f38611942ddd7
Author: Miroslav Ďurčík / Arki55 <mir...@gm...>
AuthorDate: Sun Feb 5 16:55:12 2023 +0100

    chore: Correction
---
 .github/workflows/build_linux.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index f09bbb9..2f025a8 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -2,7 +2,7 @@ name: Libspectrum for Linux (1)
 run-name: Build and test Libspectrum for Linux (1) [ all libs, real glib ] / ${{ github.actor }} /
 
 on:
-  # Executed upon each commit pushed
+  # Executed upon each commit pushed, merge commit in PR
   push:
   pull_request:
   # Called from fuse app, fuse utils repos

[fuse-emulator-cvs] [libspectrum] 05/08: arki55/features/T9-github-build-checks (libspectrum)

[<al...@us...>]

This is an automated email from the git hooks/post-receive-user script.

allura pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/e656b2315faa43d24eaafd61e746acda2b8b00f9/

commit e656b2315faa43d24eaafd61e746acda2b8b00f9
Author: Miroslav Ďurčík / Arki55 <mir...@gm...>
AuthorDate: Wed Feb 15 23:35:49 2023 +0100

    arki55/features/T9-github-build-checks (libspectrum)
    
    build: Improving linux build&test workflow.
    - Moved generic logic for  Linux build into a subfile
    - Refactored to allow configuration of every switch in ./configure regarding supported optional libraries (gzip, gcrypt, audiofile, bzip, fake glib)
    - Configured 6 build setups with fake glib and 6 build setups without it.  No need to test every possible combination of configure options.
    - After build also make check will test the lib with available unittests. If they fail then all tests will be printed out.
---
 .github/workflows/build_linux.yml           | 204 +++++++++++++++-------------
 .github/workflows/build_linux_fake_glib.yml |  70 ----------
 .github/workflows/build_linux_sub.yml       | 174 ++++++++++++++++++++++++
 3 files changed, 281 insertions(+), 167 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 2f025a8..4520a4c 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -1,110 +1,120 @@
-name: Libspectrum for Linux (1)
-run-name: Build and test Libspectrum for Linux (1) [ all libs, real glib ] / ${{ github.actor }} /
-
-on:
-  # Executed upon each commit pushed, merge commit in PR
-  push:
-  pull_request:
-  # Called from fuse app, fuse utils repos
-  workflow_call:
-    inputs:
-      path:
-        type: string
-        required: false
-        default: '.'
-      branch:
-        type: string
-        required: false
-      # Repo is taken from var.LIBSPECTRUM_REPO, cannot be passed as input.
+name: Libspectrum for Linux
+run-name: Build and test Libspectrum for Linux / ${{ github.actor }} /
 
+# Executed upon each commit pushed, merge commit in PR
+on: [push, pull_request]
+  
 jobs:
-  build:
-    name: Build & Test
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    defaults:
-      run:
-        shell: bash
-        working-directory: ${{ inputs.path || '.' }}
-    env:
-      # Support push and call triggers, set env.variables
-      LIBSPECTRUM_REPO: ${{ vars.LIBSPECTRUM_REPO || '' }}
-      LIBSPECTRUM_BRANCH: ${{ inputs.branch || '' }}
-      LIBSPECTRUM_PATH: ${{ inputs.path || '.' }}
-    steps:
-      - name: (1) Prepare environment
-        run: |
-          echo -n "Current directory: "
-          pwd
-          ls -la
-          
-          echo "Libspectrum repo: $LIBSPECTRUM_REPO"
-          echo "Libspectrum branch: $LIBSPECTRUM_BRANCH"
-          echo "Libspectrum path: $LIBSPECTRUM_PATH"
+  #################
+  ### REAL GLIB ###
+  #################
+
+  # 1. Default = all libs enabled, fake glib no
+  default:
+    name: "Libspectrum + all libs (Linux, real glib)"
+    uses: ./.github/workflows/build_linux_sub.yml
+    with:
+      key: "default"
+
+  # 2. Without zlib (real glib)
+  no-zlib:
+    name: "Libspectrum w/o zlib (Linux, real glib)"
+    uses: ./.github/workflows/build_linux_sub.yml
+    with:
+      key: "no-zlib"
+      use_zlib: false
 
-      - name: (2) Check out repository code
-        uses: actions/checkout@v3
-        with:
-          repository: ${{ env.LIBSPECTRUM_REPO }}
-          ref: ${{ env.LIBSPECTRUM_BRANCH }}
-          path: ${{ env.LIBSPECTRUM_PATH }}
+  # 3. Without bzip2 (real glib)
+  no-bzip2:
+    name: "Libspectrum w/o bzip2 (Linux, real glib)"
+    uses: ./.github/workflows/build_linux_sub.yml
+    with:
+      key: "no-bzip2"
+      use_bzip2: false
 
-      - name: (3) Install dependencies
-        run: |
-          pwd
-          ls -la
-          echo "Installing dependencies .."
-          sudo apt install -y libaudiofile-dev
+  # 4. Without libgcrypt (real glib)
+  no-libgcrypt:
+    name: "Libspectrum w/o libgcrypt (Linux, real glib)"
+    uses: ./.github/workflows/build_linux_sub.yml
+    with:
+      key: "no-libgcrypt"
+      use_libgcrypt: false
 
-      - name: (4) Autogen.sh
-        run: |
-          echo "Running autogen.sh .."
-          ./autogen.sh
+  # 5. Without libaudiofile (real glib)
+  no-libaudiofile:
+    name: "Libspectrum w/o libaudiofile (Linux, real glib)"
+    uses: ./.github/workflows/build_linux_sub.yml
+    with:
+      key: "no-libaudiofile"
+      use_libaudiofile: false
 
-      - name: (5) Configure for linux (real glib)
-        run: |
-          echo "Running configure .."
-          ./configure | tee ./configure.out
+  # 6. Without all libs (real glib)
+  no-libs:
+    name: "Libspectrum w/o all libs (Linux, real glib)"
+    uses: ./.github/workflows/build_linux_sub.yml
+    with:
+      key: "no-libs"
+      use_zlib: false
+      use_bzip2: false
+      use_libgcrypt: false
+      use_libaudiofile: false
 
-      - name: (6) Verify output from configure
-        run: |
-          .github/scripts/in_config.sh "libspectrum is ready to be compiled"
-          .github/scripts/in_config.sh "zlib support: yes"
-          .github/scripts/in_config.sh "bzip2 support: yes"
-          .github/scripts/in_config.sh "libgcrypt support: yes"
-          .github/scripts/in_config.sh "libaudiofile support: yes"
-          .github/scripts/in_config.sh "Internal GLib replacement: no"
+  #################
+  ### FAKE GLIB ###
+  #################
 
-      - name: (7) Make
-        run: |
-          echo "Running make .."
-          make
+  # 7. Default = all libs enabled, fake glib yes
+  default-fake-glib:
+    name: "Libspectrum + all libs (Linux, fake glib)"
+    uses: ./.github/workflows/build_linux_sub.yml
+    with:
+      key: "default-fake-glib"
+      use_fake_glib: true
 
-      - name: (8) Install
-        run: |
-          echo "Running make install .."
-          sudo make install
+  # 8. Without zlib (fake glib)
+  no-zlib-fake-glib:
+    name: "Libspectrum w/o zlib (Linux, fake glib)"
+    uses: ./.github/workflows/build_linux_sub.yml
+    with:
+      key: "no-zlib-fake-glib"
+      use_zlib: false
+      use_fake_glib: true
 
-      - name: (9) Run tests
-        run: |
-          echo "Bulding and running tests .."
-          make check
+  # 9. Without bzip2 (fake glib)
+  no-bzip2-fake-glib:
+    name: "Libspectrum w/o bzip2 (Linux, fake glib)"
+    uses: ./.github/workflows/build_linux_sub.yml
+    with:
+      key: "no-bzip2-fake-glib"
+      use_bzip2: false
+      use_fake_glib: true
 
-      - name: (10) Upload generated files
-        # Need to pack files to maintain permissions (+x mainly)
-        run: |
-          tar -cvf \
-          libspectrum-compiled-linux.tar \
-          --exclude=".git" "libspectrum-compiled-linux.tar" \
-          --ignore-failed-read \
-          .
+  # 10. Without libgcrypt (fake glib)
+  no-libgcrypt-fake-glib:
+    name: "Libspectrum w/o libgcrypt (Linux, fake glib)"
+    uses: ./.github/workflows/build_linux_sub.yml
+    with:
+      key: "no-libgcrypt-fake-glib"
+      use_libgcrypt: false
+      use_fake_glib: true
 
-      - uses: actions/upload-artifact@v3
-        with: 
-          name: libspectrum-compiled-linux
-          path: |
-            libspectrum-compiled-linux.tar
+  # 11. Without libaudiofile (fake glib)
+  no-libaudiofile-fake-glib:
+    name: "Libspectrum w/o libaudiofile (Linux, fake glib)"
+    uses: ./.github/workflows/build_linux_sub.yml
+    with:
+      key: "no-libaudiofile-fake-glib"
+      use_libaudiofile: false
+      use_fake_glib: true
 
-      - name: (11) Finish
-        run: |
-          echo "🍏 Finishing with status ${{ job.status }}."
+  # 12. Without all libs (fake glib)
+  no-libs-fake-glib:
+    name: "Libspectrum w/o all libs (Linux, fake glib)"
+    uses: ./.github/workflows/build_linux_sub.yml
+    with:
+      key: "no-libs-fake-glib"
+      use_zlib: false
+      use_bzip2: false
+      use_libgcrypt: false
+      use_libaudiofile: false
+      use_fake_glib: true
diff --git a/.github/workflows/build_linux_fake_glib.yml b/.github/workflows/build_linux_fake_glib.yml
deleted file mode 100644
index 70b9967..0000000
--- a/.github/workflows/build_linux_fake_glib.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-name: Libspectrum for Linux (2)
-run-name: Build and test Libspectrum for Linux (2) [ all libs, fake glib ] / ${{ github.actor }} /
-
-# Executed upon each commit pushed, merge commit in PR
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: Build & Test
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - name: (1) Prepare git
-        run: |
-          echo "Not needed in this build"
-
-      - name: (2) Check out repository code
-        uses: actions/checkout@v3
-
-      - name: (3) Install dependencies
-        run: |
-          echo "Installing dependencies .."
-          sudo apt install -y libaudiofile-dev
-
-      - name: (4) Autogen.sh
-        run: |
-          echo "Running autogen.sh .."
-          ./autogen.sh
-
-      - name: (5) Configure for linux (fake glib)
-        run: |
-          echo "Running configure (fake glib) .."
-          ./configure --with-fake-glib | tee ./configure.out
-
-      - name: (6) Verify output from configure
-        run: |
-          .github/scripts/in_config.sh "libspectrum is ready to be compiled"
-          .github/scripts/in_config.sh "zlib support: yes"
-          .github/scripts/in_config.sh "bzip2 support: yes"
-          .github/scripts/in_config.sh "libgcrypt support: yes"
-          .github/scripts/in_config.sh "libaudiofile support: yes"
-          .github/scripts/in_config.sh "Internal GLib replacement: yes"
-
-      - name: (7) Make
-        run: |
-          echo "Running make .."
-          make
-
-      - name: (8) Install (+sudo)
-        run: |
-          echo "Running make install .."
-          sudo make install
-
-      - name: (9) Run tests
-        run: |
-          echo "Bulding and running tests .."
-          make check
-
-      - name: (10) Upload generated files
-        uses: actions/upload-artifact@v3
-        with: 
-          name: libspectrum-linux-fake-glib
-          path: |
-            doc/libspectrum.3
-            libspectrum.h
-            libspectrum.pc
-
-      - name: (11) Finish
-        run: |
-          echo "🍏 Finishing with status ${{ job.status }}."
diff --git a/.github/workflows/build_linux_sub.yml b/.github/workflows/build_linux_sub.yml
new file mode 100644
index 0000000..85500ed
--- /dev/null
+++ b/.github/workflows/build_linux_sub.yml
@@ -0,0 +1,174 @@
+name: Libspectrum for Linux
+run-name: Build and test Libspectrum for Linux / ${{ github.actor }} /
+
+on:
+  # Called from fuse app, fuse utils repos
+  workflow_call:
+    inputs:
+      # Name this setup (no spaces please)
+      key:
+        type: string
+        required: true
+      # Path where to clone
+      path:
+        type: string
+        required: false
+        default: '.'
+      # Which branch to checkout
+      branch:
+        type: string
+        required: false
+        default: ""
+      # Configure supported libs
+      use_zlib:
+        type: boolean
+        required: false
+        default: true
+      use_bzip2:
+        type: boolean
+        required: false
+        default: true
+      use_libgcrypt:
+        type: boolean
+        required: false
+        default: true
+      use_libaudiofile:
+        type: boolean
+        required: false
+        default: true
+      use_fake_glib:
+        type: boolean
+        required: false
+        default: false
+      # Repo is taken from var.LIBSPECTRUM_REPO, cannot be passed as input.
+
+jobs:
+  build:
+    name: Build & Test
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    defaults:
+      run:
+        shell: bash
+        working-directory: ${{ inputs.path || '.' }}
+    env:
+      # Support push and call triggers, set env.variables
+      LIBSPECTRUM_REPO: ${{ vars.LIBSPECTRUM_REPO || '' }}
+      LIBSPECTRUM_BRANCH: ${{ inputs.branch || '' }}
+      LIBSPECTRUM_PATH: ${{ inputs.path || '.' }}
+
+    steps:
+      - name: (1) Prepare environment
+        run: |
+          echo -n "Current directory: "
+          pwd
+          ls -la
+          
+          echo "Libspectrum repo: $LIBSPECTRUM_REPO"
+          echo "Libspectrum branch: $LIBSPECTRUM_BRANCH"
+          echo "Libspectrum path: $LIBSPECTRUM_PATH"
+          
+          echo "Use lib zlib: ${{ inputs.use_zlib && 'yes' || 'no' }}"
+          echo "Use lib bzip2: ${{ inputs.use_bzip2 && 'yes' || 'no' }}"
+          echo "Use lib libgcrypt: ${{ inputs.use_libgcrypt && 'yes' || 'no' }}"
+          echo "Use lib libaudiofile: ${{ inputs.use_libaudiofile && 'yes' || 'no' }}"
+          echo "Use fake glib: ${{ inputs.use_fake_glib && 'yes' || 'no' }}"
+
+      - name: (2) Check out repository code
+        uses: actions/checkout@v3
+        with:
+          repository: ${{ env.LIBSPECTRUM_REPO }}
+          ref: ${{ env.LIBSPECTRUM_BRANCH }}
+          path: ${{ env.LIBSPECTRUM_PATH }}
+
+      - name: (3) Restore lib packages
+        run: |
+          echo "Not needed here"
+
+      - name: (4) Install dependencies
+        run: |
+          pwd
+          ls -la
+          echo "Installing dependencies .."
+          sudo apt install -y \
+            libaudiofile-dev \
+            libbz2-dev \
+            libgcrypt-dev \
+            libglib2.0-dev \
+            libxml2-dev
+
+      - name: (5) Save lib packages
+        run: |
+          echo "Not needed here"
+
+      - name: (6) Autogen.sh
+        run: |
+          echo "Running autogen.sh .."
+          ./autogen.sh
+
+      - name: (7) Configure for Linux
+        run: |
+          echo "Running configure .."
+          ./configure \
+          ${{ inputs.use_zlib == false && '--without-zlib' || '' }} \
+          ${{ inputs.use_bzip2 == false && '--without-bzip2' || '' }} \
+          ${{ inputs.use_libgcrypt == false && '--without-libgcrypt' || '' }} \
+          ${{ inputs.use_libaudiofile == false && '--without-libaudiofile' || '' }} \
+          ${{ inputs.use_fake_glib == true && '--with-fake-glib' || '' }} \
+          | tee ./configure.out
+
+      - name: (8) Verify output from configure
+        run: |
+          .github/scripts/in_config.sh "libspectrum is ready to be compiled"
+          .github/scripts/in_config.sh "zlib support: ${{ inputs.use_zlib && 'yes' || 'no' }}"
+          .github/scripts/in_config.sh "bzip2 support: ${{ inputs.use_bzip2 && 'yes' || 'no' }}"
+          .github/scripts/in_config.sh "libgcrypt support: ${{ inputs.use_libgcrypt && 'yes' || 'no' }}"
+          .github/scripts/in_config.sh "libaudiofile support: ${{ inputs.use_libaudiofile && 'yes' || 'no' }}"
+          .github/scripts/in_config.sh "Internal GLib replacement: ${{ inputs.use_fake_glib && 'yes' || 'no' }}"
+
+      - name: (9) Make
+        run: |
+          echo "Running make .."
+          make
+
+      - name: (10) Install
+        run: |
+          echo "Running make install .."
+          sudo make install
+
+      - name: (11) Copy dependencies
+        run: |
+          echo "Not needed here."
+
+      - name: (12) Run tests
+        id: run-tests
+        run: |
+          echo "Bulding and running tests .."
+          make check
+
+      - name: (13) Verbose check tests (on failure)
+        if: failure() && steps.run-tests.outcome != 'success'
+        run: |
+          cd ${GITHUB_WORKSPACE}
+          
+          echo "Listing all tests individually .."
+          test/test
+
+      - name: (14) Pack installed library files
+        # Need to pack files to maintain permissions (+x mainly)
+        run: |
+          find /usr/local | grep libspectrum > .tar_files
+          sudo tar -cvf \
+          libspectrum-installed-linux.tar \
+          -C /usr/local/ -T.tar_files
+
+      - name: (15) Upload generated tar file
+        uses: actions/upload-artifact@v3
+        with: 
+          name: libspectrum-installed-linux-${{ inputs.key }}
+          path: |
+            libspectrum-installed-linux.tar
+
+      - name: (16) Finish
+        run: |
+          echo "🍏 Finishing with status ${{ job.status }}."

[fuse-emulator-cvs] [libspectrum] 08/08: arki55/features/T9-github-build-checks (libspectrum)

[<al...@us...>]

This is an automated email from the git hooks/post-receive-user script.

allura pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/78d80463bb404f9dc34c66593ce6df2732a3a170/

commit 78d80463bb404f9dc34c66593ce6df2732a3a170
Author: Miroslav Ďurčík / Arki55 <mir...@gm...>
AuthorDate: Sun Feb 19 21:25:45 2023 +0100

    arki55/features/T9-github-build-checks (libspectrum)
    
    build: Implemented build workflow for MACOS platform.
    - Executed on native MACOS runner hosted by GitHub.
    - Installer  "apt" replaced by "brew", lib names adjusted to those available under MACOS.
    - As with WII, Linux and Windows, workflows split into 2 parts -  sub part  allowing configuration and all build  steps and one  file listing al available  configuration variations.
    - GLIB seems to be available under MACOS, but not working for FUSE, therefore fake glib enabled for all build cases.
    - libaudiofile available, but somewhat not compatible with FUSE, therefore disabled for all build cases as well.
    - make check  works
---
 .github/workflows/build_macos.yml     |  70 ++++++++++++++
 .github/workflows/build_macos_sub.yml | 177 ++++++++++++++++++++++++++++++++++
 2 files changed, 247 insertions(+)

diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
new file mode 100644
index 0000000..21cb2a2
--- /dev/null
+++ b/.github/workflows/build_macos.yml
@@ -0,0 +1,70 @@
+name: Libspectrum for MacOS
+run-name: Build and test Libspectrum for MacOS / ${{ github.actor }} /
+
+# Executed upon each commit pushed, merge commit in PR
+on: [push, pull_request]
+  
+jobs:
+  #################
+  ### FAKE GLIB ###
+  #################
+
+  # 1. Default = all libs enabled, fake glib yes
+  default-fake-glib:
+    name: "Libspectrum + all libs (MacOS, fake glib)"
+    uses: ./.github/workflows/build_macos_sub.yml
+    with:
+      key: "default-fake-glib"
+      use_fake_glib: true
+      use_libaudiofile: false # FIXME: The available brew lib is not recognized by configure.
+
+  # 2. Without zlib (fake glib)
+  no-zlib-fake-glib:
+    name: "Libspectrum w/o zlib (MacOS, fake glib)"
+    uses: ./.github/workflows/build_macos_sub.yml
+    with:
+      key: "no-zlib-fake-glib"
+      use_zlib: false
+      use_fake_glib: true
+      use_libaudiofile: false # FIXME: The available brew lib is not recognized by configure.
+
+  # 3. Without bzip2 (fake glib)
+  no-bzip2-fake-glib:
+    name: "Libspectrum w/o bzip2 (MacOS, fake glib)"
+    uses: ./.github/workflows/build_macos_sub.yml
+    with:
+      key: "no-bzip2-fake-glib"
+      use_bzip2: false
+      use_fake_glib: true
+      use_libaudiofile: false # FIXME: The available brew lib is not recognized by configure.
+
+  # 4. Without libgcrypt (fake glib)
+  no-libgcrypt-fake-glib:
+    name: "Libspectrum w/o libgcrypt (MacOS, fake glib)"
+    uses: ./.github/workflows/build_macos_sub.yml
+    with:
+      key: "no-libgcrypt-fake-glib"
+      use_libgcrypt: false
+      use_fake_glib: true
+      use_libaudiofile: false # FIXME: The available brew lib is not recognized by configure.
+
+  # 5. Without libaudiofile (fake glib)
+  no-libaudiofile-fake-glib:
+    name: "Libspectrum w/o libaudiofile (MacOS, fake glib)"
+    uses: ./.github/workflows/build_macos_sub.yml
+    with:
+      key: "no-libaudiofile-fake-glib"
+      use_libaudiofile: false
+      use_fake_glib: true
+
+  # 6. Without all libs (fake glib)
+  no-libs-fake-glib:
+    name: "Libspectrum w/o all libs (MacOS, fake glib)"
+    uses: ./.github/workflows/build_macos_sub.yml
+    with:
+      key: "no-libs-fake-glib"
+      use_zlib: false
+      use_bzip2: false
+      use_libgcrypt: false
+      use_libaudiofile: false
+      use_fake_glib: true
diff --git a/.github/workflows/build_macos_sub.yml b/.github/workflows/build_macos_sub.yml
new file mode 100644
index 0000000..05c7968
--- /dev/null
+++ b/.github/workflows/build_macos_sub.yml
@@ -0,0 +1,177 @@
+name: Libspectrum for MacOS
+run-name: Build and test Libspectrum for MacOS / ${{ github.actor }} /
+
+on:
+  # Called from fuse app, fuse utils repos
+  workflow_call:
+    inputs:
+      # Name this setup (no spaces please)
+      key:
+        type: string
+        required: true
+      # Path where to clone
+      path:
+        type: string
+        required: false
+        default: '.'
+      # Which branch to checkout
+      branch:
+        type: string
+        required: false
+        default: ""
+      # Configure supported libs
+      use_zlib:
+        type: boolean
+        required: false
+        default: true
+      use_bzip2:
+        type: boolean
+        required: false
+        default: true
+      use_libgcrypt:
+        type: boolean
+        required: false
+        default: true
+      use_libaudiofile:
+        type: boolean
+        required: false
+        default: true
+      use_fake_glib:
+        type: boolean
+        required: false
+        default: false
+      # Repo is taken from var.LIBSPECTRUM_REPO, cannot be passed as input.
+
+jobs:
+  build:
+    name: Build & Test
+    runs-on: macos-latest
+    timeout-minutes: 15
+    defaults:
+      run:
+        shell: bash
+        working-directory: ${{ inputs.path || '.' }}
+    env:
+      # Support push and call triggers, set env.variables
+      LIBSPECTRUM_REPO: ${{ vars.LIBSPECTRUM_REPO || '' }}
+      LIBSPECTRUM_BRANCH: ${{ inputs.branch || '' }}
+      LIBSPECTRUM_PATH: ${{ inputs.path || '.' }}
+
+    steps:
+      - name: (1) Prepare environment
+        run: |
+          echo -n "Current directory: "
+          pwd
+          ls -la
+          
+          echo "Libspectrum repo: $LIBSPECTRUM_REPO"
+          echo "Libspectrum branch: $LIBSPECTRUM_BRANCH"
+          echo "Libspectrum path: $LIBSPECTRUM_PATH"
+          
+          echo "Use lib zlib: ${{ inputs.use_zlib && 'yes' || 'no' }}"
+          echo "Use lib bzip2: ${{ inputs.use_bzip2 && 'yes' || 'no' }}"
+          echo "Use lib libgcrypt: ${{ inputs.use_libgcrypt && 'yes' || 'no' }}"
+          echo "Use lib libaudiofile: ${{ inputs.use_libaudiofile && 'yes' || 'no' }}"
+          echo "Use fake glib: ${{ inputs.use_fake_glib && 'yes' || 'no' }}"
+
+      - name: (2) Check out repository code
+        uses: actions/checkout@v3
+        with:
+          repository: ${{ env.LIBSPECTRUM_REPO }}
+          ref: ${{ env.LIBSPECTRUM_BRANCH }}
+          path: ${{ env.LIBSPECTRUM_PATH }}
+
+      - name: (3) Restore lib packages
+        run: |
+          echo "Not needed here"
+
+      - name: (4) Install dependencies
+        run: |
+          echo "Inspect if brew installed .."
+          brew doctor || true
+          
+          echo "Installing dependencies .."
+          brew install \
+            automake \
+            audiofile \
+            bzip2 \
+            libgcrypt \
+            glib \
+            libxml2
+          autoreconf -i
+
+      - name: (5) Save lib packages
+        run: |
+          echo "Not needed here"
+
+      - name: (6) Autogen.sh
+        run: |
+          echo "Running autogen.sh .."
+          ./autogen.sh
+
+      - name: (7) Configure for MacOS
+        run: |
+          echo "Running configure .."
+          ./configure \
+          ${{ inputs.use_zlib == false && '--without-zlib' || '' }} \
+          ${{ inputs.use_bzip2 == false && '--without-bzip2' || '' }} \
+          ${{ inputs.use_libgcrypt == false && '--without-libgcrypt' || '' }} \
+          ${{ inputs.use_libaudiofile == false && '--without-libaudiofile' || '' }} \
+          ${{ inputs.use_fake_glib == true && '--with-fake-glib' || '' }} \
+          | tee ./configure.out
+
+      - name: (8) Verify output from configure
+        run: |
+          .github/scripts/in_config.sh "libspectrum is ready to be compiled"
+          .github/scripts/in_config.sh "zlib support: ${{ inputs.use_zlib && 'yes' || 'no' }}"
+          .github/scripts/in_config.sh "bzip2 support: ${{ inputs.use_bzip2 && 'yes' || 'no' }}"
+          .github/scripts/in_config.sh "libgcrypt support: ${{ inputs.use_libgcrypt && 'yes' || 'no' }}"
+          .github/scripts/in_config.sh "libaudiofile support: ${{ inputs.use_libaudiofile && 'yes' || 'no' }}"
+          .github/scripts/in_config.sh "Internal GLib replacement: ${{ inputs.use_fake_glib && 'yes' || 'no' }}"
+
+      - name: (9) Make
+        run: |
+          echo "Running make .."
+          make
+
+      - name: (10) Install
+        run: |
+          echo "Running make install .."
+          sudo make install
+
+      - name: (11) Copy dependencies
+        run: |
+          echo "Not needed here."
+
+      - name: (12) Run tests
+        id: run-tests
+        run: |
+          echo "Bulding and running tests .."
+          make check
+
+      - name: (13) Verbose check tests (on failure)
+        if: failure() && steps.run-tests.outcome != 'success'
+        run: |
+          cd ${GITHUB_WORKSPACE}
+          
+          echo "Listing all tests individually .."
+          test/test
+
+      - name: (14) Pack installed library files
+        # Need to pack files to maintain permissions (+x mainly)
+        run: |
+          find /usr/local | grep libspectrum > .tar_files
+          sudo tar -cvf \
+          libspectrum-installed-macos.tar \
+          -C /usr/local/ -T.tar_files
+
+      - name: (15) Upload generated tar file
+        uses: actions/upload-artifact@v3
+        with: 
+          name: libspectrum-installed-macos-${{ inputs.key }}
+          path: |
+            libspectrum-installed-macos.tar
+
+      - name: (16) Finish
+        run: |
+          echo "🍏 Finishing with status ${{ job.status }}."

[fuse-emulator-cvs] [fuse-utils] branch master updated: Consider loop blocks to calculate tape duration

[<sba...@us...>]

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository fuse-utils.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse-utils/ci/4f8bbb8f0846d24e0d3759e8ad49f938f4de50e1/

The following commit(s) were added to refs/heads/master by this push:
     new 4f8bbb8  Consider loop blocks to calculate tape duration
4f8bbb8 is described below

commit 4f8bbb8f0846d24e0d3759e8ad49f938f4de50e1
Author: Luis Faria <lf...@us...>
AuthorDate: Sat Feb 25 06:44:45 2023 +0100

    Consider loop blocks to calculate tape duration
    
    (fixes bug #490) (thanks, Martin Garton).
---
 tzxlist.c | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/tzxlist.c b/tzxlist.c
index 2d4ac56..68c1b98 100644
--- a/tzxlist.c
+++ b/tzxlist.c
@@ -419,12 +419,14 @@ static int
 process_tape( char *filename )
 {
   int error, min;
+  int current_loop_count = 1;
   float sec;
   unsigned char *buffer; size_t length;
   libspectrum_tape *tape;
   libspectrum_tape_iterator iterator;
   libspectrum_tape_block *block;
-  libspectrum_qword total_length = 0;
+  float tape_total_length = 0;
+  float block_total_length = 0;
   libspectrum_id_t type;
 
   size_t i;
@@ -485,9 +487,10 @@ process_tape( char *filename )
     printf( "--= Block #%d =--\n", block_num );
     printf( "  Block type 0x%02x (%s)\n", libspectrum_tape_block_type( block ),
 	    description );
-    printf("  Block duration: %.2f sec\n",
-           libspectrum_tape_block_length( block )/3500000.0 );
-    total_length += libspectrum_tape_block_length( block );
+    block_total_length = (libspectrum_tape_block_length( block ) / 3500000.0);
+    printf( "  Block duration: %.2f sec\n", block_total_length );
+    block_total_length *= current_loop_count;
+    tape_total_length += block_total_length;
 
     switch( libspectrum_tape_block_type( block ) ) {
 
@@ -573,11 +576,14 @@ process_tape( char *filename )
       break;
 
     case LIBSPECTRUM_TAPE_BLOCK_GROUP_END:
-    case LIBSPECTRUM_TAPE_BLOCK_LOOP_END:
     case LIBSPECTRUM_TAPE_BLOCK_STOP48:
       /* Do nothing */
       break;
 
+    case LIBSPECTRUM_TAPE_BLOCK_LOOP_END:
+      current_loop_count = 1;
+      break;
+
     case LIBSPECTRUM_TAPE_BLOCK_SET_SIGNAL_LEVEL:
       printf( "  Polarity: %s\n",
                 libspectrum_tape_block_level( block ) ? "high" : "low" );
@@ -588,8 +594,8 @@ process_tape( char *filename )
       break;
 
     case LIBSPECTRUM_TAPE_BLOCK_LOOP_START:
-      printf("  Count: %lu\n",
-	     (unsigned long)libspectrum_tape_block_count( block ) );
+      current_loop_count = libspectrum_tape_block_count( block );
+      printf( "  Count: %lu\n", (unsigned long)current_loop_count );
       break;
 
     case LIBSPECTRUM_TAPE_BLOCK_SELECT:
@@ -693,6 +699,11 @@ process_tape( char *filename )
       decode_header( block );
       break;
 
+    /* Libspectrum up to 1.5.0 has no support for blocks:
+       LIBSPECTRUM_TAPE_BLOCK_CSW (0x18)
+       LIBSPECTRUM_TAPE_BLOCK_SEQ_CALL (0x26)
+       LIBSPECTRUM_TAPE_BLOCK_SEQ_RET (0x27)
+    */
     default:
       printf("  (Sorry -- %s can't handle that kind of block. Skipping it)\n",
 	     progname );
@@ -705,8 +716,8 @@ process_tape( char *filename )
 
   }
 
-  min = ( total_length / 3500000.0 ) / 60;
-  sec = ( total_length / 3500000.0 ) - min * 60;
+  min = tape_total_length / 60;
+  sec = tape_total_length - min * 60;
   printf( "Total tape duration: %d min, %.2f sec\n", min, sec );
 
   error = libspectrum_tape_free( tape );

[fuse-emulator-cvs] [fuse] branch master updated: More accurate emulation of AM29F010B flash ROM.

[<sba...@us...>]

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/2effbd6d9c71419779372eeb13327e2f2013c9c2/

The following commit(s) were added to refs/heads/master by this push:
     new 2effbd6d More accurate emulation of AM29F010B flash ROM.
2effbd6d is described below

commit 2effbd6d9c71419779372eeb13327e2f2013c9c2
Author: ZXGuesser <ali...@zx...>
AuthorDate: Wed Sep 21 20:32:37 2022 +0100

    More accurate emulation of AM29F010B flash ROM.
---
 compat.h                     |  1 +
 memory_pages.c               |  6 ++++++
 peripherals/flash/am29f010.c | 34 ++++++++++++++++++++++++++++++----
 peripherals/flash/am29f010.h |  2 +-
 peripherals/spectranet.c     | 28 ++++++++++++++++++++++++++--
 peripherals/spectranet.h     |  2 ++
 6 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/compat.h b/compat.h
index f1c019d4..931fea15 100644
--- a/compat.h
+++ b/compat.h
@@ -177,6 +177,7 @@ int compat_get_tap( const char *interface_name );
 
 #ifdef WIN32
 #include <winsock2.h>
+#include <ws2tcpip.h>
 #define COMPAT_ENOTCONN WSAENOTCONN
 #define COMPAT_EWOULDBLOCK WSAEWOULDBLOCK
 #define COMPAT_EINPROGRESS WSAEINPROGRESS
diff --git a/memory_pages.c b/memory_pages.c
index 2cb8ccc4..cafc4574 100644
--- a/memory_pages.c
+++ b/memory_pages.c
@@ -394,6 +394,12 @@ readbyte( libspectrum_word address )
         return spectranet_w5100_read( mapping, address );
       if( spectranet_w5100_paged_b && address >= 0x2000 && address < 0x3000 )
         return spectranet_w5100_read( mapping, address );
+      if( address < 0x1000 )
+        return spectranet_flash_rom_read( mapping, address );
+      if( spectranet_flash_paged_a && address >= 0x1000 && address < 0x2000 )
+        return spectranet_flash_rom_read( mapping, address );
+      if( spectranet_flash_paged_b && address >= 0x2000 && address < 0x3000 )
+        return spectranet_flash_rom_read( mapping, address );
     }
 
     if( ttx2000s_paged && address >= 0x2000 )
diff --git a/peripherals/flash/am29f010.c b/peripherals/flash/am29f010.c
index 3cb216a6..df36c0ba 100644
--- a/peripherals/flash/am29f010.c
+++ b/peripherals/flash/am29f010.c
@@ -38,6 +38,7 @@ typedef enum am29f010_flash_state {
   FLASH_STATE_CYCLE5,
   FLASH_STATE_CYCLE6,
   FLASH_STATE_PROGRAM,
+  FLASH_STATE_AUTOSELECT,
 } am29f010_flash_state;
 
 struct flash_am29f010_t {
@@ -83,13 +84,33 @@ flash_am29f010_program( flash_am29f010_t *self, libspectrum_byte page, libspectr
   self->memory[ flash_offset ] = b;
 }
 
+libspectrum_byte
+flash_am29f010_read( flash_am29f010_t *self, libspectrum_byte page, libspectrum_word address )
+{
+  if( self->flash_state == FLASH_STATE_AUTOSELECT ) {
+    switch( address & 0xff ) {
+      case 0x00: /* manufacturer ID */
+        return 0x01; /* AMD */
+      case 0x01: /* device ID */
+        return 0x20; /* Am29F010B */
+      case 0x02: /* sector protect verify */
+        return 0x00; /* always unprotected */
+      default:
+        return 0xff; /* undefined - don't know what this should return */
+    }
+  }
+  
+  libspectrum_dword flash_offset = page * SIZE_OF_FLASH_PAGE + address;
+  return self->memory[ flash_offset ];
+}
+
 void
 flash_am29f010_write( flash_am29f010_t *self, libspectrum_byte page, libspectrum_word address, libspectrum_byte b )
 {
-  libspectrum_word flash_address = address & 0xfff;
+  libspectrum_word flash_address = address & 0x7ff;
 
-  /* We implement only the reset, program, chip erase and sector erase
-     commands for now */
+  /* We implement only the reset, program, chip erase, sector erase
+     and autoselect commands for now */
   switch (self->flash_state) {
     case FLASH_STATE_RESET:
       if( flash_address == 0x555 && b == 0xaa )
@@ -105,6 +126,8 @@ flash_am29f010_write( flash_am29f010_t *self, libspectrum_byte page, libspectrum
           self->flash_state = FLASH_STATE_PROGRAM;
         else if( b == 0x80 )
           self->flash_state = FLASH_STATE_CYCLE4;
+        else if( b == 0x90 )
+          self->flash_state = FLASH_STATE_AUTOSELECT;
       }
       break;
     case FLASH_STATE_CYCLE4:
@@ -128,8 +151,11 @@ flash_am29f010_write( flash_am29f010_t *self, libspectrum_byte page, libspectrum
       flash_am29f010_program( self, page, address, b );
       self->flash_state = FLASH_STATE_RESET;
       break;
+    case FLASH_STATE_AUTOSELECT:
+      break;
   }
 
-  if( b == 0x0f )
+  if( b == 0xf0 )
     self->flash_state = FLASH_STATE_RESET;
 }
+
diff --git a/peripherals/flash/am29f010.h b/peripherals/flash/am29f010.h
index 6c452d3a..3b213fc6 100644
--- a/peripherals/flash/am29f010.h
+++ b/peripherals/flash/am29f010.h
@@ -30,7 +30,7 @@ typedef struct flash_am29f010_t flash_am29f010_t;
 flash_am29f010_t* flash_am29f010_alloc( void );
 void flash_am29f010_free( flash_am29f010_t *self );
 void flash_am29f010_init( flash_am29f010_t *self, libspectrum_byte *memory );
-
+libspectrum_byte flash_am29f010_read( flash_am29f010_t *self, libspectrum_byte page, libspectrum_word address );
 void flash_am29f010_write( flash_am29f010_t *self, libspectrum_byte page, libspectrum_word address, libspectrum_byte b );
 
 #endif                          /* #ifndef FUSE_AM29F010_H */
diff --git a/peripherals/spectranet.c b/peripherals/spectranet.c
index db18fa71..ba59c211 100644
--- a/peripherals/spectranet.c
+++ b/peripherals/spectranet.c
@@ -69,6 +69,7 @@ int spectranet_available = 0;
 int spectranet_paged;
 int spectranet_paged_via_io;
 int spectranet_w5100_paged_a = 0, spectranet_w5100_paged_b = 0;
+int spectranet_flash_paged_a = 0, spectranet_flash_paged_b = 0;
 
 /* Whether the programmable trap is active */
 int spectranet_programmable_trap_active;
@@ -140,6 +141,7 @@ spectranet_map_page( int dest, int source )
 {
   int i;
   int w5100_page = source >= 0x40 && source < 0x48;
+  int flash_page = source >= 0x00 && source < 0x20;
 
   for( i = 0; i < MEMORY_PAGES_IN_4K; i++ )
     spectranet_current_map[dest * MEMORY_PAGES_IN_4K + i] =
@@ -147,8 +149,14 @@ spectranet_map_page( int dest, int source )
 
   switch( dest )
   {
-    case 1: spectranet_w5100_paged_a = w5100_page; break;
-    case 2: spectranet_w5100_paged_b = w5100_page; break;
+    case 1: 
+      spectranet_w5100_paged_a = w5100_page;
+      spectranet_flash_paged_a = flash_page;
+      break;
+    case 2: 
+      spectranet_w5100_paged_b = w5100_page;
+      spectranet_flash_paged_b = flash_page;
+      break;
   }
 }
 
@@ -496,6 +504,15 @@ spectranet_w5100_write( memory_page *page, libspectrum_word address, libspectrum
   nic_w5100_write( w5100, get_w5100_register( page, address ), b );
 }
 
+libspectrum_byte
+spectranet_flash_rom_read( memory_page *page, libspectrum_word address )
+{
+  int flash_page = page->page_num / 4;
+  libspectrum_word flash_address =
+    (page->page_num % 4) * SPECTRANET_PAGE_LENGTH + (address & 0xfff);
+  return flash_am29f010_read( flash_rom, flash_page, flash_address );
+}
+
 void
 spectranet_flash_rom_write( libspectrum_word address, libspectrum_byte b )
 {
@@ -559,6 +576,13 @@ spectranet_w5100_write( memory_page *page GCC_UNUSED,
 {
 }
 
+libspectrum_byte
+spectranet_flash_rom_read( memory_page *page GCC_UNUSED,
+                           libspectrum_word address GCC_UNUSED )
+{
+  return 0xff;
+}
+
 void
 spectranet_flash_rom_write( libspectrum_word address GCC_UNUSED,
                             libspectrum_byte b GCC_UNUSED )
diff --git a/peripherals/spectranet.h b/peripherals/spectranet.h
index e6678cba..bd636cad 100644
--- a/peripherals/spectranet.h
+++ b/peripherals/spectranet.h
@@ -34,11 +34,13 @@ int spectranet_nmi_flipflop( void );
 
 libspectrum_byte spectranet_w5100_read( memory_page *page, libspectrum_word address );
 void spectranet_w5100_write( memory_page *page, libspectrum_word address, libspectrum_byte b );
+libspectrum_byte spectranet_flash_rom_read( memory_page *page, libspectrum_word address );
 void spectranet_flash_rom_write( libspectrum_word address, libspectrum_byte b );
 
 extern int spectranet_available;
 extern int spectranet_paged;
 extern int spectranet_w5100_paged_a, spectranet_w5100_paged_b;
+extern int spectranet_flash_paged_a, spectranet_flash_paged_b;
 extern int spectranet_programmable_trap_active;
 extern libspectrum_word spectranet_programmable_trap;
 

[fuse-emulator-cvs] [fuse] branch master updated: Add ZIP files to the bash completion script

[<sba...@us...>]

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/dc4e279f2146fd31e5a9c753bbbf1f50889bc338/

The following commit(s) were added to refs/heads/master by this push:
     new dc4e279f Add ZIP files to the bash completion script
dc4e279f is described below

commit dc4e279f2146fd31e5a9c753bbbf1f50889bc338
Author: Alberto Garcia <be...@ig...>
AuthorDate: Wed Jun 2 19:32:23 2021 +0200

    Add ZIP files to the bash completion script
    
    (patch #436).
---
 ChangeLog                       | 14 +++++++++-----
 data/shell-completion/bash/fuse |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ebf40c22..c7b3a29a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,11 +6,15 @@
           * Speed up reading emulated memory locations (Jindřich Makovička).
 
         * UI improvements:
-         * Timex: don't abort if the Timex dock cartridge image is not
-           found (Alberto Garcia).
-         * WidgetUI: rearrange AY register and Z80 flags in the debugger
-           (Gergely Szasz).
-         * GTK UI: Fix loading binary data from deleted files (thanks, Crisis).
+          * Timex: don't abort if the Timex dock cartridge image is not
+            found (Alberto Garcia).
+          * WidgetUI: rearrange AY register and Z80 flags in the debugger
+            (Gergely Szasz).
+          * GTK UI: Fix loading binary data from deleted files (thanks, Crisis)
+            (Sergio Baldoví).
+
+        * Miscellaneous improvements:
+          * Add ZIP files to the bash completion script (Alberto Garcia).
 
 2021-02-27  Philip Kendall  <phi...@sh...>
 
diff --git a/data/shell-completion/bash/fuse b/data/shell-completion/bash/fuse
index 4b5d73c7..7c710184 100644
--- a/data/shell-completion/bash/fuse
+++ b/data/shell-completion/bash/fuse
@@ -281,7 +281,7 @@ _fuse()
             --zxatasp-write-protect --zxcf --zxcf-cffile --zxcf-upload
             --zxmmc --zxmmc-file --zxprinter' -- "$cur" ) )
     else
-        _filedir '@(csw|CSW|ltp|LTP|pzx|PZX|spc|SPC|sta|STA|tap|TAP|tzx|TZX|wav|WAV|slt|SLT|sna?(pshot)|SNA?(PSHOT)|?(mgt)snp|?(MGT)SNP|sp|SP|szx|SZX|z80|Z80|zxs|ZXS|d40|D40|d80|D80|dsk|DSK|img|IMG|fdi|FDI|mgt|MGT|opd|OPD|opu|OPU|sad|SAD|scl|SCL|td0|TD0|trd|TRD|udi|UDI|rzx|RZX|dck|DCK|hdf|HDF|mdr|MDR)'
+        _filedir '@(csw|CSW|ltp|LTP|pzx|PZX|spc|SPC|sta|STA|tap|TAP|tzx|TZX|wav|WAV|slt|SLT|sna?(pshot)|SNA?(PSHOT)|?(mgt)snp|?(MGT)SNP|sp|SP|szx|SZX|z80|Z80|zxs|ZXS|d40|D40|d80|D80|dsk|DSK|img|IMG|fdi|FDI|mgt|MGT|opd|OPD|opu|OPU|sad|SAD|scl|SCL|td0|TD0|trd|TRD|udi|UDI|rzx|RZX|dck|DCK|hdf|HDF|mdr|MDR|zip|ZIP)'
     fi
 } &&
 complete -F _fuse -o filenames fuse

[fuse-emulator-cvs] [fuse-utils] branch master updated: Remove double-free bug in rzxcheck

[<sba...@us...>]

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository fuse-utils.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse-utils/ci/659214ec558278c3f3ce7ff54d2c1b37752a3ad6/

The following commit(s) were added to refs/heads/master by this push:
     new 659214e  Remove double-free bug in rzxcheck
659214e is described below

commit 659214ec558278c3f3ce7ff54d2c1b37752a3ad6
Author: Sergio Baldoví <ser...@gm...>
AuthorDate: Tue Jun 1 07:24:48 2021 +0200

    Remove double-free bug in rzxcheck
    
    After verifying the signature the program could crash
---
 ChangeLog  | 5 +++++
 rzxcheck.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e150e84..ff9e15a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-??-??  Philip Kendall  <phi...@sh...>
+
+        * rzxcheck
+          * Remove double-free bug (Sergio Baldoví).
+
 2018-07-01  Philip Kendall  <phi...@sh...>
 
         * Version 1.4.3 released
diff --git a/rzxcheck.c b/rzxcheck.c
index 72f75a4..0e82b95 100644
--- a/rzxcheck.c
+++ b/rzxcheck.c
@@ -180,7 +180,7 @@ main( int argc, char **argv )
 
   free( buffer );
 
-  libspectrum_rzx_free( rzx ); free( rzx );
+  libspectrum_rzx_free( rzx );
   libspectrum_signature_free( &signature );
 
   if( error == LIBSPECTRUM_ERROR_SIGNATURE ) {

[fuse-emulator-cvs] [fuse] branch master updated: Fix loading binary data from deleted files in GTK

[<sba...@us...>]

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/65293b0db1e6f6f35e1752f50e8be7b523990add/

The following commit(s) were added to refs/heads/master by this push:
     new 65293b0d Fix loading binary data from deleted files in GTK
65293b0d is described below

commit 65293b0db1e6f6f35e1752f50e8be7b523990add
Author: Sergio Baldoví <ser...@gm...>
AuthorDate: Sat May 22 07:29:31 2021 +0200

    Fix loading binary data from deleted files in GTK
    
    The dialog keeps info about last operation. This patch checks that last
    file exists before reading it (thanks, Crisis)
---
 ChangeLog       | 1 +
 ui/gtk/binary.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 69bf3d3f..ebf40c22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
            found (Alberto Garcia).
          * WidgetUI: rearrange AY register and Z80 flags in the debugger
            (Gergely Szasz).
+         * GTK UI: Fix loading binary data from deleted files (thanks, Crisis).
 
 2021-02-27  Philip Kendall  <phi...@sh...>
 
diff --git a/ui/gtk/binary.c b/ui/gtk/binary.c
index c6ea2f31..b664030f 100644
--- a/ui/gtk/binary.c
+++ b/ui/gtk/binary.c
@@ -200,7 +200,7 @@ menu_file_loadbinarydata( GtkAction *gtk_action GCC_UNUSED,
    * If the filename is blank it's not been selected previously.
    * Pop up the file selector.
    */
-  if( !load_info.filename )
+  if( !load_info.filename || !compat_file_exists( load_info.filename ) )
   {
     load_info.filename = ui_get_open_filename( "Fuse - Load Binary Data" );
     if( !load_info.filename )

[fuse-emulator-cvs] [fuse] branch master updated: Rearrange AY register and flags in the widget debugger

[<sba...@us...>]

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/128e2dc31bb3ac5516014e232dd4761e9790afd6/

The following commit(s) were added to refs/heads/master by this push:
     new 128e2dc3 Rearrange AY register and flags in the widget debugger
128e2dc3 is described below

commit 128e2dc31bb3ac5516014e232dd4761e9790afd6
Author: Gergely Szasz <sz...@hu...>
AuthorDate: Sun May 2 07:41:39 2021 +0200

    Rearrange AY register and flags in the widget debugger
    
    (fixes bug #482)
---
 ChangeLog            | 2 ++
 ui/widget/debugger.c | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b8a1a8b8..69bf3d3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
         * UI improvements:
          * Timex: don't abort if the Timex dock cartridge image is not
            found (Alberto Garcia).
+         * WidgetUI: rearrange AY register and Z80 flags in the debugger
+           (Gergely Szasz).
 
 2021-02-27  Philip Kendall  <phi...@sh...>
 
diff --git a/ui/widget/debugger.c b/ui/widget/debugger.c
index 656beac5..87378497 100644
--- a/ui/widget/debugger.c
+++ b/ui/widget/debugger.c
@@ -309,7 +309,7 @@ static void display_registers( void )
   show_register0( LC(36), LR(2), "IFF2", IFF2 );
   show_register2( LC(3),  LR(3), "HL",   HL );
   show_register2( LC(12), LR(3), "HL'",  HL_ );
-  widget_printstring_fixed( LC(20), LR(3), 5, "SZ5H3PNC" );
+  widget_printstring_fixed( LC(18), LR(3), 5, "SZ5H3PNC" );
   show_register0( LC(36), LR(3), "HALTED", z80.halted );
   show_register1( LC(36), LR(4), "ULA",  ula_last_byte() );
 
@@ -319,12 +319,12 @@ static void display_registers( void )
   for( i = 0; i < 8; ++i )
     pbuf[i] = ( F & ( 0x80 >> i ) ) ? '1' : '0';
   pbuf[8] = 0;
-  widget_printstring_fixed( LC(20), LR(4), 7, pbuf );
+  widget_printstring_fixed( LC(18), LR(4), 7, pbuf );
 
   capabilities = libspectrum_machine_capabilities( machine_current->machine );
 
   if( capabilities & LIBSPECTRUM_MACHINE_CAPABILITY_AY )
-    show_register1( LC(37), LR(4), "AY",
+    show_register1( LC(29), LR(4), "AY",
 		    machine_current->ay.current_register );
 
   if( capabilities & LIBSPECTRUM_MACHINE_CAPABILITY_128_MEMORY )

[fuse-emulator-cvs] [fuse] 02/02: Update compile instructions for win32 UI

[<sba...@us...>]

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/f56eeffd9e092cfa1a382659ae028aa87c539e20/

commit f56eeffd9e092cfa1a382659ae028aa87c539e20
Author: Sergio Baldoví <ser...@gm...>
AuthorDate: Wed Mar 24 23:40:46 2021 +0100

    Update compile instructions for win32 UI
---
 INSTALL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL b/INSTALL
index 56464b56..cc6a0a76 100644
--- a/INSTALL
+++ b/INSTALL
@@ -142,7 +142,7 @@ PKG_CONFIG_LIBDIR=/usr/local/i686-w64-mingw32/lib/pkgconfig \
             --prefix=/usr/local/i686-w64-mingw32
 make
 
-Note: you need `libspectrum-8.dll' and the `roms' directory and the `lib'
+Note: you need `libspectrum-9.dll' and the `roms' directory and the `lib'
   directory to `fuse' run perfectly. You may copy this file and directories
   into that directory where `fuse.exe' exists. On Windows you may need to
   copy all files from `lib/uncompressed' into `lib'. Alternatively, you could

[fuse-emulator-cvs] [fuse] 01/02: Simplify TTX2000S redundant check in readbyte()

[<sba...@us...>]

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/da98b07c8ed6abf90310cdb85315feb6629ebb34/

commit da98b07c8ed6abf90310cdb85315feb6629ebb34
Author: Sergio Baldoví <ser...@gm...>
AuthorDate: Wed Mar 24 23:33:45 2021 +0100

    Simplify TTX2000S redundant check in readbyte()
---
 memory_pages.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/memory_pages.c b/memory_pages.c
index c7543627..2cb8ccc4 100644
--- a/memory_pages.c
+++ b/memory_pages.c
@@ -396,10 +396,8 @@ readbyte( libspectrum_word address )
         return spectranet_w5100_read( mapping, address );
     }
 
-    if( ttx2000s_paged ) {
-      if( address >= 0x2000 && address < 0x4000 )
+    if( ttx2000s_paged && address >= 0x2000 )
         return ttx2000s_sram_read( address );
-    }
   }
 
   return mapping->page[ address & MEMORY_PAGE_SIZE_MASK ];

[fuse-emulator-cvs] [fuse] branch master updated (fe8398c0 -> f56eeffd)

[<sba...@us...>]

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a change to branch master
in repository fuse.

    from fe8398c0 Speed up readbyte()
     new da98b07c Simplify TTX2000S redundant check in readbyte()
     new f56eeffd Update compile instructions for win32 UI

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 INSTALL        | 2 +-
 memory_pages.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

[fuse-emulator-cvs] [fuse] branch master updated: Speed up readbyte()

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/fe8398c068b951b4b3a4672eca19d888ca1c4397/

The following commit(s) were added to refs/heads/master by this push:
     new fe8398c0 Speed up readbyte()
fe8398c0 is described below

commit fe8398c068b951b4b3a4672eca19d888ca1c4397
Author: Jindřich Makovička <mak...@gm...>
AuthorDate: Sat Mar 20 13:55:04 2021 +1100

    Speed up readbyte()
    
    Check the address first and only test for the peripherals if the address
    is in the relevant range.
---
 ChangeLog      |  3 +++
 memory_pages.c | 26 ++++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b13c8570..b8a1a8b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
         * Fuse 1.?.? released.
 
+        * Emulation core improvements:
+          * Speed up reading emulated memory locations (Jindřich Makovička).
+
         * UI improvements:
          * Timex: don't abort if the Timex dock cartridge image is not
            found (Alberto Garcia).
diff --git a/memory_pages.c b/memory_pages.c
index ddc79a32..c7543627 100644
--- a/memory_pages.c
+++ b/memory_pages.c
@@ -385,19 +385,21 @@ readbyte( libspectrum_word address )
   if( mapping->contended ) tstates += ula_contention[ tstates ];
   tstates += 3;
 
-  if( opus_active && address >= 0x2800 && address < 0x3800 )
-    return opus_read( address );
+  if( address < 0x4000 ) {
+    if( opus_active && address >= 0x2800 && address < 0x3800 )
+      return opus_read( address );
+
+    if( spectranet_paged ) {
+      if( spectranet_w5100_paged_a && address >= 0x1000 && address < 0x2000 )
+        return spectranet_w5100_read( mapping, address );
+      if( spectranet_w5100_paged_b && address >= 0x2000 && address < 0x3000 )
+        return spectranet_w5100_read( mapping, address );
+    }
 
-  if( spectranet_paged ) {
-    if( spectranet_w5100_paged_a && address >= 0x1000 && address < 0x2000 )
-      return spectranet_w5100_read( mapping, address );
-    if( spectranet_w5100_paged_b && address >= 0x2000 && address < 0x3000 )
-      return spectranet_w5100_read( mapping, address );
-  }
-  
-  if( ttx2000s_paged ) {
-    if( address >= 0x2000 && address < 0x4000 )
-      return ttx2000s_sram_read( address );
+    if( ttx2000s_paged ) {
+      if( address >= 0x2000 && address < 0x4000 )
+        return ttx2000s_sram_read( address );
+    }
   }
 
   return mapping->page[ address & MEMORY_PAGE_SIZE_MASK ];

[fuse-emulator-cvs] [fuse] branch master updated: Don't abort if the Timex cartridge is not found

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/b0fff7d48b4342400ebf54d05926515038629b49/

The following commit(s) were added to refs/heads/master by this push:
     new b0fff7d4 Don't abort if the Timex cartridge is not found
b0fff7d4 is described below

commit b0fff7d48b4342400ebf54d05926515038629b49
Author: Fredrick Meunier <fr...@sp...>
AuthorDate: Wed Mar 17 21:48:26 2021 +1100

    Don't abort if the Timex cartridge is not found
    
    (fixes bug #468) (Alberto Garcia and Fredrick Meunier).
---
 ChangeLog         | 8 ++++++++
 machines/tc2068.c | 1 +
 machines/ts2068.c | 1 +
 peripherals/dck.c | 3 +--
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 44ef32a9..b13c8570 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2021-??-??  Philip Kendall  <phi...@sh...>
+
+        * Fuse 1.?.? released.
+
+        * UI improvements:
+         * Timex: don't abort if the Timex dock cartridge image is not
+           found (Alberto Garcia).
+
 2021-02-27  Philip Kendall  <phi...@sh...>
 
         * Fuse 1.6.0 released.
diff --git a/machines/tc2068.c b/machines/tc2068.c
index e36127b2..5a876c20 100644
--- a/machines/tc2068.c
+++ b/machines/tc2068.c
@@ -178,6 +178,7 @@ tc2068_reset( void )
   if( error ) {
     ui_error( UI_ERROR_INFO, "Ignoring Timex dock file '%s'",
             settings_current.dck_file );
+    dck_eject();
   }
 
   return 0;
diff --git a/machines/ts2068.c b/machines/ts2068.c
index 94eb295b..dc105874 100644
--- a/machines/ts2068.c
+++ b/machines/ts2068.c
@@ -117,6 +117,7 @@ ts2068_reset( void )
   if( error ) {
     ui_error( UI_ERROR_INFO, "Ignoring Timex dock file '%s'",
             settings_current.dck_file );
+    dck_eject();
   }
 
   return 0;
diff --git a/peripherals/dck.c b/peripherals/dck.c
index 0a31c2fc..7e9698c9 100644
--- a/peripherals/dck.c
+++ b/peripherals/dck.c
@@ -71,8 +71,7 @@ dck_eject( void )
     return;
   }
 
-  if( settings_current.dck_file ) libspectrum_free( settings_current.dck_file );
-  settings_current.dck_file = NULL;
+  settings_set_string( &settings_current.dck_file, NULL );
 
   dck_active = 0;
 

[fuse-emulator-cvs] [fuse] branch master updated: Clean up uninitialised value warning in widget UI

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/3e0f452e78f83dd4d7184535ecc2c2df37be5788/

The following commit(s) were added to refs/heads/master by this push:
     new 3e0f452e Clean up uninitialised value warning in widget UI
3e0f452e is described below

commit 3e0f452e78f83dd4d7184535ecc2c2df37be5788
Author: Fredrick Meunier <fr...@sp...>
AuthorDate: Tue Mar 16 20:05:26 2021 +1100

    Clean up uninitialised value warning in widget UI
---
 ui/widget/binary.c | 147 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 86 insertions(+), 61 deletions(-)

diff --git a/ui/widget/binary.c b/ui/widget/binary.c
index e1674209..3d17f834 100644
--- a/ui/widget/binary.c
+++ b/ui/widget/binary.c
@@ -90,30 +90,41 @@ widget_binary_entry_draw( int index, int highlight )
   widget_display_rasters( binary_entry[index].y, 8 );
 }
 
-/* 0 - all, 1 - filename, 2 - start, 3 - length, 4 - DEC/HEX/OCT */
 static void
-display_values( int what )
+display_filename( void )
 {
-  if( !what || what == 1 ) {
-    const char *fn;
-    fn = widget_binary.filename;
-    while( widget_stringwidth( fn ) >= 136 ) fn++;
-    widget_rectangle( 68, 28, 136, 8, WIDGET_COLOUR_BACKGROUND );
-    widget_printstring( 68, 28, WIDGET_COLOUR_DISABLED, fn );
-    widget_display_lines( 3, 2 );
-  }
-  if( !what || what == 2 ) {
-    widget_rectangle( 68, 40, 136, 8, WIDGET_COLOUR_BACKGROUND );
-    widget_printstring( 68, 40, WIDGET_COLOUR_FOREGROUND,
-                        widget_binary.start_str );
-    widget_display_lines( 5, 1 );
-  }
-  if( !what || what == 3 ) {
-    widget_rectangle( 68, 48, 136, 8, WIDGET_COLOUR_BACKGROUND );
-    widget_printstring( 68, 48, WIDGET_COLOUR_FOREGROUND,
-                        widget_binary.length_str );
-    widget_display_lines( 6, 1 );
-  }
+  const char *fn;
+  fn = widget_binary.filename;
+  while( widget_stringwidth( fn ) >= 136 ) fn++;
+  widget_rectangle( 68, 28, 136, 8, WIDGET_COLOUR_BACKGROUND );
+  widget_printstring( 68, 28, WIDGET_COLOUR_DISABLED, fn );
+  widget_display_lines( 3, 2 );
+}
+
+static void
+display_start( void )
+{
+  widget_rectangle( 68, 40, 136, 8, WIDGET_COLOUR_BACKGROUND );
+  widget_printstring( 68, 40, WIDGET_COLOUR_FOREGROUND,
+                      widget_binary.start_str );
+  widget_display_lines( 5, 1 );
+}
+
+static void
+display_length( void )
+{
+  widget_rectangle( 68, 48, 136, 8, WIDGET_COLOUR_BACKGROUND );
+  widget_printstring( 68, 48, WIDGET_COLOUR_FOREGROUND,
+                      widget_binary.length_str );
+  widget_display_lines( 6, 1 );
+}
+
+static void
+display_all( void )
+{
+  display_filename();
+  display_start();
+  display_length();
 }
 
 int
@@ -125,7 +136,7 @@ widget_binary_draw( void *data )
   widget_printstring( 10, 16, WIDGET_COLOUR_TITLE, widget_binary.title );
   widget_printstring( 16, 28, WIDGET_COLOUR_FOREGROUND, "Filename: " );
 
-  display_values( 0 );
+  display_all();
 
   for( i = 0; binary_entry[i].text != NULL; i++ ) {
     widget_binary_entry_draw( i, ( highlight_entry == i ) );
@@ -155,26 +166,52 @@ ask_filename( void )
 
   widget_binary.filename = utils_safe_strdup( widget_filesel_name );
 
-  display_values( 1 );
+  display_filename();
 }
 
-/* 1 - filename, 2 - start, 3 - length */
 static void
-ask_value( int what )
+ask_start( void )
 {
   long int value;
-  char *s;
+  char *s = widget_binary.start_str;
   widget_text_t text_data;
 
   text_data.allow = WIDGET_INPUT_ALNUM;
   text_data.max_length = 9;
-  if( what == 2 ) {
-    text_data.title = "Enter start value";
-    s = widget_binary.start_str;
-  } else if( what == 3 ) {
-    text_data.title = "Enter length";
-    s = widget_binary.length_str;
+  text_data.title = "Enter start value";
+  snprintf( text_data.text, sizeof( text_data.text ), "%s", s );
+  widget_do_text( &text_data );
+  if( !widget_text_text ) return;
+
+  value = strtol( widget_text_text, &s, 0 );
+  if( *s != '\0' ) {
+    ui_error( UI_ERROR_ERROR, "Invalid number" );
+    return;
+  }
+
+  if( value < 0 || value > 0xffff ) {
+    ui_error( UI_ERROR_ERROR, "Start must be between 0 and 65535" );
+  } else if( value + widget_binary.length > 0x10000 ) {
+    ui_error( UI_ERROR_ERROR, "Block ends after address 65535" );
+  } else {
+    free( widget_binary.start_str );
+    widget_binary.start_str = utils_safe_strdup( widget_text_text );
+    widget_binary.start = value;
   }
+
+  display_start();
+}
+
+static void
+ask_length( void )
+{
+  long int value;
+  char *s = widget_binary.length_str;
+  widget_text_t text_data;
+
+  text_data.allow = WIDGET_INPUT_ALNUM;
+  text_data.max_length = 9;
+  text_data.title = "Enter length";
   snprintf( text_data.text, sizeof( text_data.text ), "%s", s );
   widget_do_text( &text_data );
   if( !widget_text_text ) return;
@@ -185,34 +222,22 @@ ask_value( int what )
     return;
   }
 
-  if( what == 2 ) {
-    if( value < 0 || value > 0xffff ) {
-      ui_error( UI_ERROR_ERROR, "Start must be between 0 and 65535" );
-    } else if( value + widget_binary.length > 0x10000 ) {
-      ui_error( UI_ERROR_ERROR, "Block ends after address 65535" );
-    } else {
-      free( widget_binary.start_str );
-      widget_binary.start_str = utils_safe_strdup( widget_text_text );
-      widget_binary.start = value;
-    }
-  } else if( what == 3 ) {
-    if( value < 1 || value > 0x10000 ) {
-      ui_error( UI_ERROR_ERROR, "Length must be between 1 and 65536" );
-    } else if( value + widget_binary.start > 0x10000 ) {
-      ui_error( UI_ERROR_ERROR, "Block ends after address 65535" );
-    } else if( widget_binary.load && value > widget_binary.file.length ) {
-      ui_error( UI_ERROR_ERROR, "'%s' contains only %lu bytes",
-                widget_binary.filename, (unsigned long)widget_binary.file.length
-                );
-      return;
-    } else {
-      free( widget_binary.length_str );
-      widget_binary.length_str = utils_safe_strdup( widget_text_text );
-      widget_binary.length = value;
-    }
+  if( value < 1 || value > 0x10000 ) {
+    ui_error( UI_ERROR_ERROR, "Length must be between 1 and 65536" );
+  } else if( value + widget_binary.start > 0x10000 ) {
+    ui_error( UI_ERROR_ERROR, "Block ends after address 65535" );
+  } else if( widget_binary.load && value > widget_binary.file.length ) {
+    ui_error( UI_ERROR_ERROR, "'%s' contains only %lu bytes",
+              widget_binary.filename, (unsigned long)widget_binary.file.length
+              );
+    return;
+  } else {
+    free( widget_binary.length_str );
+    widget_binary.length_str = utils_safe_strdup( widget_text_text );
+    widget_binary.length = value;
   }
 
-  display_values( what );
+  display_length();
 }
 
 static void
@@ -244,13 +269,13 @@ widget_browse_click( void )
 static void
 widget_start_click( void )
 {
-  ask_value( 2 );
+  ask_start();
 }
 
 static void
 widget_length_click( void )
 {
-  ask_value( 3 );
+  ask_length();
 }
 
 static void

[fuse-emulator-cvs] [fuse-utils] 02/02: Change libspectrum.h and config.h include style

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository fuse-utils.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse-utils/ci/bd1aaa7adc7efa307b88694817424a1336f5c8d5/

commit bd1aaa7adc7efa307b88694817424a1336f5c8d5
Author: Fredrick Meunier <fr...@sp...>
AuthorDate: Tue Mar 16 19:23:00 2021 +1100

    Change libspectrum.h and config.h include style
---
 audio2tape.cc                 | 4 ++--
 audio2tape_res.rc             | 2 +-
 compat/amiga/basename.c       | 2 +-
 compat/amiga/osname.c         | 2 +-
 compat/getopt.c               | 2 +-
 compat/getopt1.c              | 2 +-
 compat/unix/basename.c        | 2 +-
 compat/unix/osname.c          | 2 +-
 compat/win32/osname.c         | 2 +-
 configure.ac                  | 2 +-
 converter/romloader.h         | 2 +-
 createhdf.c                   | 2 +-
 createhdf_res.rc              | 2 +-
 fmfconv.c                     | 4 ++--
 fmfconv.h                     | 2 +-
 fmfconv_compr.h               | 2 +-
 fmfconv_output/fmfconv_aiff.c | 2 +-
 fmfconv_output/fmfconv_au.c   | 2 +-
 fmfconv_output/fmfconv_avi.c  | 4 ++--
 fmfconv_output/fmfconv_jpg.c  | 4 ++--
 fmfconv_output/fmfconv_png.c  | 4 ++--
 fmfconv_output/fmfconv_ppm.c  | 2 +-
 fmfconv_output/fmfconv_scr.c  | 2 +-
 fmfconv_output/fmfconv_wav.c  | 2 +-
 fmfconv_output/fmfconv_yuv.c  | 2 +-
 fmfconv_res.rc                | 2 +-
 fmfconv_types.h               | 2 +-
 importer/interpolator.h       | 2 +-
 importer/schmitt.h            | 2 +-
 importer/soundfile.h          | 2 +-
 importer/trigger.h            | 2 +-
 keys.c                        | 4 ++--
 listbasic.c                   | 4 ++--
 listbasic_res.rc              | 2 +-
 profile2map.c                 | 4 ++--
 profile2map_res.rc            | 2 +-
 raw2hdf.c                     | 2 +-
 raw2hdf_res.rc                | 2 +-
 rzxcheck.c                    | 4 ++--
 rzxcheck_res.rc               | 2 +-
 rzxdump.c                     | 4 ++--
 rzxdump_res.rc                | 2 +-
 rzxtool.c                     | 4 ++--
 rzxtool_res.rc                | 2 +-
 scl2trd.c                     | 2 +-
 scl2trd_res.rc                | 2 +-
 snap2tzx.c                    | 4 ++--
 snap2tzx_res.rc               | 2 +-
 snapconv.c                    | 4 ++--
 snapconv_res.rc               | 2 +-
 snapdump.c                    | 4 ++--
 snapdump_res.rc               | 2 +-
 tape2pulses.c                 | 4 ++--
 tape2pulses_res.rc            | 2 +-
 tape2wav.c                    | 4 ++--
 tape2wav_res.rc               | 2 +-
 tapeconv.c                    | 4 ++--
 tapeconv_res.rc               | 2 +-
 tzxlist.c                     | 4 ++--
 tzxlist_res.rc                | 2 +-
 utils.c                       | 4 ++--
 utils.h                       | 2 +-
 62 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/audio2tape.cc b/audio2tape.cc
index d3b3348..ddbe5b8 100644
--- a/audio2tape.cc
+++ b/audio2tape.cc
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <exception>
 #include <iostream>
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 extern "C" {
 #include "utils.h"
diff --git a/audio2tape_res.rc b/audio2tape_res.rc
index e61ba7b..eebc5c2 100644
--- a/audio2tape_res.rc
+++ b/audio2tape_res.rc
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/compat/amiga/basename.c b/compat/amiga/basename.c
index 1585f6b..2e120c6 100644
--- a/compat/amiga/basename.c
+++ b/compat/amiga/basename.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <proto/dos.h>
 
diff --git a/compat/amiga/osname.c b/compat/amiga/osname.c
index 8c3b2e7..06e2585 100644
--- a/compat/amiga/osname.c
+++ b/compat/amiga/osname.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/compat/getopt.c b/compat/getopt.c
index 36fbea2..05aa3a9 100644
--- a/compat/getopt.c
+++ b/compat/getopt.c
@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
 #if !defined __STDC__ || !__STDC__
diff --git a/compat/getopt1.c b/compat/getopt1.c
index 40b3cb2..da95ccc 100644
--- a/compat/getopt1.c
+++ b/compat/getopt1.c
@@ -21,7 +21,7 @@
    02110-1301 USA.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #ifdef _LIBC
diff --git a/compat/unix/basename.c b/compat/unix/basename.c
index 6ede4b2..8767d22 100644
--- a/compat/unix/basename.c
+++ b/compat/unix/basename.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <libgen.h>
 
diff --git a/compat/unix/osname.c b/compat/unix/osname.c
index efb1c60..3b90f4b 100644
--- a/compat/unix/osname.c
+++ b/compat/unix/osname.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/compat/win32/osname.c b/compat/win32/osname.c
index 02fd8ce..1b24f9b 100644
--- a/compat/win32/osname.c
+++ b/compat/win32/osname.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <windows.h>
 
diff --git a/configure.ac b/configure.ac
index 2ff39fd..619b8b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,7 +198,7 @@ ac_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $LIBSPECTRUM_CFLAGS"
 AC_PREPROC_IFELSE(
   [AC_LANG_SOURCE([
-#include <libspectrum.h>
+#include "libspectrum.h"
 #if LIBSPECTRUM_HAS_GLIB_REPLACEMENT == 0
 #error "GLib replacement not found"
 #endif
diff --git a/converter/romloader.h b/converter/romloader.h
index fe61a80..23daf77 100644
--- a/converter/romloader.h
+++ b/converter/romloader.h
@@ -26,7 +26,7 @@
 
 #include <vector>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "converter/romloaderstate.h"
 #include "importer/soundfile.h"
diff --git a/createhdf.c b/createhdf.c
index 2e05209..9c224c2 100644
--- a/createhdf.c
+++ b/createhdf.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/createhdf_res.rc b/createhdf_res.rc
index 787846e..8cddec0 100644
--- a/createhdf_res.rc
+++ b/createhdf_res.rc
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/fmfconv.c b/fmfconv.c
index 35010fd..23639a7 100644
--- a/fmfconv.c
+++ b/fmfconv.c
@@ -21,7 +21,7 @@
    E-mail: sz...@hu...
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -51,7 +51,7 @@
 #define Z_BEST_COMPRESSION 9
 #endif
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "fmfconv.h"
diff --git a/fmfconv.h b/fmfconv.h
index a901c11..0b16701 100644
--- a/fmfconv.h
+++ b/fmfconv.h
@@ -24,7 +24,7 @@
 #ifndef FMFCONV_H
 #define FMFCONV_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "fmfconv_types.h"
 
diff --git a/fmfconv_compr.h b/fmfconv_compr.h
index ea914f5..f7a81d5 100644
--- a/fmfconv_compr.h
+++ b/fmfconv_compr.h
@@ -24,7 +24,7 @@
 #ifndef FMFCONV_COMPR_H
 #define FMFCONV_COMPR_H
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 
diff --git a/fmfconv_output/fmfconv_aiff.c b/fmfconv_output/fmfconv_aiff.c
index f683e4e..b15545b 100644
--- a/fmfconv_output/fmfconv_aiff.c
+++ b/fmfconv_output/fmfconv_aiff.c
@@ -20,7 +20,7 @@
    E-mail: sz...@hu...
 
 */
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/fmfconv_output/fmfconv_au.c b/fmfconv_output/fmfconv_au.c
index 869dd55..49ede63 100644
--- a/fmfconv_output/fmfconv_au.c
+++ b/fmfconv_output/fmfconv_au.c
@@ -20,7 +20,7 @@
    E-mail: sz...@hu...
 
 */
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/fmfconv_output/fmfconv_avi.c b/fmfconv_output/fmfconv_avi.c
index 0b3a39e..9b5d983 100644
--- a/fmfconv_output/fmfconv_avi.c
+++ b/fmfconv_output/fmfconv_avi.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -29,7 +29,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "fmfconv.h"
 
diff --git a/fmfconv_output/fmfconv_jpg.c b/fmfconv_output/fmfconv_jpg.c
index d8af697..f5e9831 100644
--- a/fmfconv_output/fmfconv_jpg.c
+++ b/fmfconv_output/fmfconv_jpg.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -31,7 +31,7 @@
 #define XMD_H
 #include <jpeglib.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "fmfconv.h"
 
diff --git a/fmfconv_output/fmfconv_png.c b/fmfconv_output/fmfconv_png.c
index fdd73e3..e925001 100644
--- a/fmfconv_output/fmfconv_png.c
+++ b/fmfconv_output/fmfconv_png.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -34,7 +34,7 @@
 #define Z_DEFAULT_COMPRESSION 6
 #endif
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "fmfconv.h"
 
diff --git a/fmfconv_output/fmfconv_ppm.c b/fmfconv_output/fmfconv_ppm.c
index 2d557f7..182eba2 100644
--- a/fmfconv_output/fmfconv_ppm.c
+++ b/fmfconv_output/fmfconv_ppm.c
@@ -20,7 +20,7 @@
    E-mail: sz...@hu...
 
 */
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/fmfconv_output/fmfconv_scr.c b/fmfconv_output/fmfconv_scr.c
index 5013a90..67df349 100644
--- a/fmfconv_output/fmfconv_scr.c
+++ b/fmfconv_output/fmfconv_scr.c
@@ -20,7 +20,7 @@
    E-mail: sz...@hu...
 
 */
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/fmfconv_output/fmfconv_wav.c b/fmfconv_output/fmfconv_wav.c
index beca568..587845f 100644
--- a/fmfconv_output/fmfconv_wav.c
+++ b/fmfconv_output/fmfconv_wav.c
@@ -20,7 +20,7 @@
    E-mail: sz...@hu...
 
 */
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/fmfconv_output/fmfconv_yuv.c b/fmfconv_output/fmfconv_yuv.c
index 67a8342..1ea405f 100644
--- a/fmfconv_output/fmfconv_yuv.c
+++ b/fmfconv_output/fmfconv_yuv.c
@@ -20,7 +20,7 @@
    E-mail: sz...@hu...
 
 */
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/fmfconv_res.rc b/fmfconv_res.rc
index b33df9e..c3b49df 100644
--- a/fmfconv_res.rc
+++ b/fmfconv_res.rc
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/fmfconv_types.h b/fmfconv_types.h
index 06dc9ac..d090045 100644
--- a/fmfconv_types.h
+++ b/fmfconv_types.h
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 typedef enum {
   STANDARD,	/* screen type $ -> normal Spectrum */
diff --git a/importer/interpolator.h b/importer/interpolator.h
index 49cc63a..c2d0308 100644
--- a/importer/interpolator.h
+++ b/importer/interpolator.h
@@ -27,7 +27,7 @@
 
 #include <math.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "importer/soundfile.h"
 
diff --git a/importer/schmitt.h b/importer/schmitt.h
index e8c9584..ae764f6 100644
--- a/importer/schmitt.h
+++ b/importer/schmitt.h
@@ -25,7 +25,7 @@
 #ifndef SCHMITT_H
 #define SCHMITT_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "audio2tape.h"
 #include "importer/trigger.h"
diff --git a/importer/soundfile.h b/importer/soundfile.h
index d87b19b..5e654b0 100644
--- a/importer/soundfile.h
+++ b/importer/soundfile.h
@@ -29,7 +29,7 @@
 #include <memory>
 #include <vector>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "trigger.h"
 
diff --git a/importer/trigger.h b/importer/trigger.h
index 74939ec..e944820 100644
--- a/importer/trigger.h
+++ b/importer/trigger.h
@@ -25,7 +25,7 @@
 #ifndef TRIGGER_H
 #define TRIGGER_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 class trigger {
   public:
diff --git a/keys.c b/keys.c
index 2c15051..05e20d5 100644
--- a/keys.c
+++ b/keys.c
@@ -21,9 +21,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "utils.h"
 
diff --git a/listbasic.c b/listbasic.c
index 8747b11..3a49a12 100644
--- a/listbasic.c
+++ b/listbasic.c
@@ -26,7 +26,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <getopt.h>
@@ -37,7 +37,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "utils.h"
 
diff --git a/listbasic_res.rc b/listbasic_res.rc
index 0fc8afb..462e2c8 100644
--- a/listbasic_res.rc
+++ b/listbasic_res.rc
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/profile2map.c b/profile2map.c
index 61aa1a4..cf0c836 100644
--- a/profile2map.c
+++ b/profile2map.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <getopt.h>
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "utils.h"
 
diff --git a/profile2map_res.rc b/profile2map_res.rc
index d1f78e8..c5d43f5 100644
--- a/profile2map_res.rc
+++ b/profile2map_res.rc
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/raw2hdf.c b/raw2hdf.c
index 9fe9c55..2d938de 100644
--- a/raw2hdf.c
+++ b/raw2hdf.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <getopt.h>
diff --git a/raw2hdf_res.rc b/raw2hdf_res.rc
index 44c9ecb..a24f0a1 100644
--- a/raw2hdf_res.rc
+++ b/raw2hdf_res.rc
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/rzxcheck.c b/rzxcheck.c
index c643e8c..72f75a4 100644
--- a/rzxcheck.c
+++ b/rzxcheck.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "utils.h"
 
diff --git a/rzxcheck_res.rc b/rzxcheck_res.rc
index d410f54..add30b2 100644
--- a/rzxcheck_res.rc
+++ b/rzxcheck_res.rc
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/rzxdump.c b/rzxdump.c
index ddd7d45..4e71ab5 100644
--- a/rzxdump.c
+++ b/rzxdump.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stddef.h>
 #include <stdio.h>
@@ -37,7 +37,7 @@
 #include <gcrypt.h>
 #endif				/* #ifdef HAVE_GCRYPT_H */
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "utils.h"
diff --git a/rzxdump_res.rc b/rzxdump_res.rc
index 5752706..65a3d79 100644
--- a/rzxdump_res.rc
+++ b/rzxdump_res.rc
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/rzxtool.c b/rzxtool.c
index fc699b5..6c53053 100644
--- a/rzxtool.c
+++ b/rzxtool.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <getopt.h>
@@ -31,7 +31,7 @@
 #ifdef HAVE_LIB_GLIB
 #include <glib.h>
 #endif				/* #ifdef HAVE_LIB_GLIB */
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "utils.h"
 
diff --git a/rzxtool_res.rc b/rzxtool_res.rc
index 9f6c67d..ecaa87d 100644
--- a/rzxtool_res.rc
+++ b/rzxtool_res.rc
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/scl2trd.c b/scl2trd.c
index 9ac9400..dc6b320 100644
--- a/scl2trd.c
+++ b/scl2trd.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <getopt.h>
 #include <stdio.h>
diff --git a/scl2trd_res.rc b/scl2trd_res.rc
index dd3f8d7..77274cd 100644
--- a/scl2trd_res.rc
+++ b/scl2trd_res.rc
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/snap2tzx.c b/snap2tzx.c
index 6826766..f62692e 100644
--- a/snap2tzx.c
+++ b/snap2tzx.c
@@ -26,7 +26,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <getopt.h>
 #include <errno.h>
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "utils.h"
diff --git a/snap2tzx_res.rc b/snap2tzx_res.rc
index 39fa8e1..ac5c46a 100644
--- a/snap2tzx_res.rc
+++ b/snap2tzx_res.rc
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/snapconv.c b/snapconv.c
index 26102fc..c231578 100644
--- a/snapconv.c
+++ b/snapconv.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <getopt.h>
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "utils.h"
diff --git a/snapconv_res.rc b/snapconv_res.rc
index d75d952..2a696ad 100644
--- a/snapconv_res.rc
+++ b/snapconv_res.rc
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/snapdump.c b/snapdump.c
index 64065e1..7e04d2e 100644
--- a/snapdump.c
+++ b/snapdump.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <getopt.h>
@@ -34,7 +34,7 @@
 #include <gcrypt.h>
 #endif				/* #ifdef HAVE_GCRYPT_H */
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "utils.h"
diff --git a/snapdump_res.rc b/snapdump_res.rc
index 6164d34..ca2f703 100644
--- a/snapdump_res.rc
+++ b/snapdump_res.rc
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/tape2pulses.c b/tape2pulses.c
index a34ae46..ce1e8eb 100644
--- a/tape2pulses.c
+++ b/tape2pulses.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <getopt.h>
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "utils.h"
 
diff --git a/tape2pulses_res.rc b/tape2pulses_res.rc
index f19ab95..b545d1b 100644
--- a/tape2pulses_res.rc
+++ b/tape2pulses_res.rc
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/tape2wav.c b/tape2wav.c
index 9aa47a6..27c01f5 100644
--- a/tape2wav.c
+++ b/tape2wav.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include <audiofile.h>
 
diff --git a/tape2wav_res.rc b/tape2wav_res.rc
index dd0632c..5d08af9 100644
--- a/tape2wav_res.rc
+++ b/tape2wav_res.rc
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/tapeconv.c b/tapeconv.c
index 4eabfad..029b0aa 100644
--- a/tapeconv.c
+++ b/tapeconv.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <getopt.h>
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "utils.h"
 
diff --git a/tapeconv_res.rc b/tapeconv_res.rc
index e41950e..1d1d95b 100644
--- a/tapeconv_res.rc
+++ b/tapeconv_res.rc
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/tzxlist.c b/tzxlist.c
index 59c6697..2d4ac56 100644
--- a/tzxlist.c
+++ b/tzxlist.c
@@ -24,7 +24,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -41,7 +41,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "utils.h"
 
diff --git a/tzxlist_res.rc b/tzxlist_res.rc
index 3e7e17a..80509f6 100644
--- a/tzxlist_res.rc
+++ b/tzxlist_res.rc
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/utils.c b/utils.c
index 4a816cd..1949298 100644
--- a/utils.c
+++ b/utils.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -35,7 +35,7 @@
 #include <sys/utsname.h>
 #endif
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "utils.h"
diff --git a/utils.h b/utils.h
index 50106e1..5caf866 100644
--- a/utils.h
+++ b/utils.h
@@ -24,7 +24,7 @@
 #ifndef FUSE_UTILS_UTILS_H
 #define FUSE_UTILS_UTILS_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 int init_libspectrum( void );
 int get_creator( libspectrum_creator **creator, const char *program );

[fuse-emulator-cvs] [fuse-utils] 01/02: Add some more convenient git ignores

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository fuse-utils.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse-utils/ci/4880523538d60a680775becdaf46b89c98b36524/

commit 4880523538d60a680775becdaf46b89c98b36524
Author: Fredrick Meunier <fr...@sp...>
AuthorDate: Tue Mar 16 19:20:58 2021 +1100

    Add some more convenient git ignores
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index cedc690..fdd79f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 *~
 *.a
+*.avi
+*.bak
+*.fmf
 *.orig
 *.reg
 /aclocal.m4

[fuse-emulator-cvs] [fuse-utils] branch master updated (f5be526 -> bd1aaa7)

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a change to branch master
in repository fuse-utils.

    from f5be526  Update release dates for 1.4.3
     new 4880523  Add some more convenient git ignores
     new bd1aaa7  Change libspectrum.h and config.h include style

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore                    | 3 +++
 audio2tape.cc                 | 4 ++--
 audio2tape_res.rc             | 2 +-
 compat/amiga/basename.c       | 2 +-
 compat/amiga/osname.c         | 2 +-
 compat/getopt.c               | 2 +-
 compat/getopt1.c              | 2 +-
 compat/unix/basename.c        | 2 +-
 compat/unix/osname.c          | 2 +-
 compat/win32/osname.c         | 2 +-
 configure.ac                  | 2 +-
 converter/romloader.h         | 2 +-
 createhdf.c                   | 2 +-
 createhdf_res.rc              | 2 +-
 fmfconv.c                     | 4 ++--
 fmfconv.h                     | 2 +-
 fmfconv_compr.h               | 2 +-
 fmfconv_output/fmfconv_aiff.c | 2 +-
 fmfconv_output/fmfconv_au.c   | 2 +-
 fmfconv_output/fmfconv_avi.c  | 4 ++--
 fmfconv_output/fmfconv_jpg.c  | 4 ++--
 fmfconv_output/fmfconv_png.c  | 4 ++--
 fmfconv_output/fmfconv_ppm.c  | 2 +-
 fmfconv_output/fmfconv_scr.c  | 2 +-
 fmfconv_output/fmfconv_wav.c  | 2 +-
 fmfconv_output/fmfconv_yuv.c  | 2 +-
 fmfconv_res.rc                | 2 +-
 fmfconv_types.h               | 2 +-
 importer/interpolator.h       | 2 +-
 importer/schmitt.h            | 2 +-
 importer/soundfile.h          | 2 +-
 importer/trigger.h            | 2 +-
 keys.c                        | 4 ++--
 listbasic.c                   | 4 ++--
 listbasic_res.rc              | 2 +-
 profile2map.c                 | 4 ++--
 profile2map_res.rc            | 2 +-
 raw2hdf.c                     | 2 +-
 raw2hdf_res.rc                | 2 +-
 rzxcheck.c                    | 4 ++--
 rzxcheck_res.rc               | 2 +-
 rzxdump.c                     | 4 ++--
 rzxdump_res.rc                | 2 +-
 rzxtool.c                     | 4 ++--
 rzxtool_res.rc                | 2 +-
 scl2trd.c                     | 2 +-
 scl2trd_res.rc                | 2 +-
 snap2tzx.c                    | 4 ++--
 snap2tzx_res.rc               | 2 +-
 snapconv.c                    | 4 ++--
 snapconv_res.rc               | 2 +-
 snapdump.c                    | 4 ++--
 snapdump_res.rc               | 2 +-
 tape2pulses.c                 | 4 ++--
 tape2pulses_res.rc            | 2 +-
 tape2wav.c                    | 4 ++--
 tape2wav_res.rc               | 2 +-
 tapeconv.c                    | 4 ++--
 tapeconv_res.rc               | 2 +-
 tzxlist.c                     | 4 ++--
 tzxlist_res.rc                | 2 +-
 utils.c                       | 4 ++--
 utils.h                       | 2 +-
 63 files changed, 84 insertions(+), 81 deletions(-)

[fuse-emulator-cvs] [website] branch master updated: Remove SVGAlib UI

[<sba...@us...>]

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository website.

View the commit online:
https://sourceforge.net/p/fuse-emulator/website/ci/2e22abf8409383c1f712b5f98fbee24972d5ca98/

The following commit(s) were added to refs/heads/master by this push:
     new 2e22abf  Remove SVGAlib UI
2e22abf is described below

commit 2e22abf8409383c1f712b5f98fbee24972d5ca98
Author: Sergio Baldoví <ser...@gm...>
AuthorDate: Tue Mar 16 00:57:19 2021 +0100

    Remove SVGAlib UI
---
 fuse.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fuse.php b/fuse.php
index 199de58..53a0097 100644
--- a/fuse.php
+++ b/fuse.php
@@ -172,7 +172,7 @@ you'll still need <a href="libspectrum.php">libspectrum</a> installed to run the
    <dt>Required:</dt>
    <dd>
     <ul>
-     <li>X, <a href="http://www.libsdl.org/">SDL</a>, <a href="http://www.svgalib.org/">svgalib</a> or framebuffer support. If you have <a href="http://www.gtk.org/">GTK</a> installed, you'll get a (much) nicer user interface under X.</li>
+     <li>X, <a href="http://www.libsdl.org/">SDL</a> or framebuffer support. If you have <a href="http://www.gtk.org/">GTK</a> installed, you'll get a (much) nicer user interface under X.</li>
      <li><a href="libspectrum.php">libspectrum</a>: the Spectrum emulator file format and information library.</li>
     </ul>
    </dd>

[fuse-emulator-cvs] [fuse] branch master updated: Remove SVGAlib UI

[<sba...@us...>]

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/3ee2bf8dc731f72230e5c3d3227ad2a7a265ee7c/

The following commit(s) were added to refs/heads/master by this push:
     new 3ee2bf8d Remove SVGAlib UI
3ee2bf8d is described below

commit 3ee2bf8dc731f72230e5c3d3227ad2a7a265ee7c
Author: Sergio Baldoví <ser...@gm...>
AuthorDate: Tue Mar 16 00:44:54 2021 +0100

    Remove SVGAlib UI
    
    Last SVGAlib release dates from 2001 and is not available in major Linux
    distributions.
---
 .gitignore                      |   1 -
 INSTALL                         |   1 -
 Makefile.am                     |   1 -
 README                          |   2 +-
 configure.ac                    |  27 +-
 data/shell-completion/bash/fuse |   4 +-
 hacking/ui.txt                  |   2 +-
 keysyms.pl                      |  48 +--
 man/fuse.1                      |  50 +--
 settings.dat                    |   2 +-
 ui.c                            |   6 +-
 ui/svga/Makefile.am             |  47 ---
 ui/svga/svgadisplay.c           | 822 ----------------------------------------
 ui/svga/svgadisplay.h           |  30 --
 ui/svga/svgajoystick.c          | 159 --------
 ui/svga/svgakeyboard.c          |  99 -----
 ui/svga/svgakeyboard.h          |  30 --
 ui/svga/svgaui.c                | 124 ------
 18 files changed, 21 insertions(+), 1434 deletions(-)

diff --git a/.gitignore b/.gitignore
index a60502f6..b321f4a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,7 +79,6 @@ tags
 /ui/gtk/options_internals.h
 /ui/null/options.c
 /ui/sdl/keysyms.c
-/ui/svga/keysyms.c
 /ui/widget/fuse.font
 /ui/widget/menu_data.c
 /ui/widget/options.c
diff --git a/INSTALL b/INSTALL
index f517a058..56464b56 100644
--- a/INSTALL
+++ b/INSTALL
@@ -10,7 +10,6 @@ There are now some options you can give to configure; `configure
 
 --with-fb		Use the framebuffer interface, rather than GTK.
 --with-sdl		Use the SDL interface, rather than GTK.
---with-svgalib		Use the SVGAlib interface.
 --without-gtk		Use the plain Xlib interface.
 
 If glib is installed on your system, Fuse will use this for a couple
diff --git a/Makefile.am b/Makefile.am
index 6fdb3454..0e13e4f8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -191,7 +191,6 @@ include ui/gtk/Makefile.am
 include ui/null/Makefile.am
 include ui/scaler/Makefile.am
 include ui/sdl/Makefile.am
-include ui/svga/Makefile.am
 include ui/widget/Makefile.am
 include ui/wii/Makefile.am
 include ui/win32/Makefile.am
diff --git a/README b/README
index 5f7181e2..5193c1ae 100644
--- a/README
+++ b/README
@@ -51,7 +51,7 @@ Unix, Linux, BSD, etc.
 
 Required:
 
-* X, SDL, svgalib or framebuffer support. If you have GTK, you'll get
+* X, SDL or framebuffer support. If you have GTK, you'll get
   a (much) nicer user interface under X.
 * libspectrum: this is available from
   http://fuse-emulator.sourceforge.net/libspectrum.php
diff --git a/configure.ac b/configure.ac
index d6323c18..30645db3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,25 +198,6 @@ if test "$win32" = yes; then
                   AC_MSG_ERROR([Win32 UI not found]))
 fi
 
-dnl Look for svgalib (default=no)
-if test -z "$UI"; then
-  AC_MSG_CHECKING(whether svgalib UI requested)
-  AC_ARG_WITH(svgalib,
-  [  --with-svgalib          use svgalib for user interface],
-  if test "$withval" = no; then svgalib=no; else svgalib=yes; fi,
-  svgalib=no)
-  AC_MSG_RESULT($svgalib)
-  if test "$svgalib" = yes; then
-    AC_CHECK_HEADER(vga.h,
-                    LIBS="$LIBS -lvga";
-                    AC_DEFINE([UI_SVGA], 1, [Defined if svgalib UI in use])
-                    AC_DEFINE([USE_WIDGET], 1,
-                              [Defined if we're using a widget-based UI])
-                    UI=svga; WIDGET=widget,
-                    AC_MSG_ERROR([svgalib not found]))
-  fi
-fi
-
 dnl Look for framebuffer interface for SA1110 (default=no)
 if test -z "$UI"; then
   AC_MSG_CHECKING(whether framebuffer UI requested)
@@ -424,7 +405,7 @@ fi
 dnl Look for Xlib UI (default=yes)
 if test -z "$UI"; then
   if test "$with_x" = no; then
-    AC_MSG_ERROR([Please specify --with-svgalib or --with-fb, not --without-x.])
+    AC_MSG_ERROR([Please specify --with-fb, not --without-x.])
   fi
   AC_PATH_XTRA
   CFLAGS="$CFLAGS $X_CFLAGS";
@@ -462,7 +443,6 @@ AM_CONDITIONAL(UI_FB, test "$UI" = fb)
 AM_CONDITIONAL(UI_GTK, test "$UI" = gtk)
 AM_CONDITIONAL(UI_NULL, test "$UI" = null)
 AM_CONDITIONAL(UI_SDL, test "$UI" = sdl)
-AM_CONDITIONAL(UI_SVGA, test "$UI" = svga)
 AM_CONDITIONAL(UI_WII, test "$UI" = wii)
 AM_CONDITIONAL(UI_WIN32, test "$UI" = win32)
 AM_CONDITIONAL(UI_X, test "$UI" = xlib)
@@ -756,10 +736,9 @@ AC_MSG_RESULT($stick)
 if test "$stick" = yes; then
   dnl We prefer to use UI-specific joystick code. (Default.)
   dnl If there is none, or you override this here, we use libjsw.
-  dnl (svgalib appears to dislike switched joysticks on the parallel port...)
   case "$UI" in
-    svga|sdl|win32)
-      dnl Libraries such as svgalib provide their own joystick code.
+    sdl|win32)
+      dnl Libraries provide their own joystick code
       AC_MSG_CHECKING([whether to use $UI's joystick support])
       AC_ARG_ENABLE(ui-joystick,
       AS_HELP_STRING([--disable-ui-joystick], [use libjsw joystick code (where supported)]),
diff --git a/data/shell-completion/bash/fuse b/data/shell-completion/bash/fuse
index 36b5daed..4b5d73c7 100644
--- a/data/shell-completion/bash/fuse
+++ b/data/shell-completion/bash/fuse
@@ -170,7 +170,7 @@ _fuse()
         --joystick-keyboard-output|--joystick-keyboard-right| \
         --joystick-keyboard-up|--mdr-len|--rate| \
         --sdl-fullscreen-mode|--snet|--sound-device|-d| \
-        --sound-freq|-f|--speccyboot-tap|--speed|--svga-modes| \
+        --sound-freq|-f|--speccyboot-tap|--speed| \
         --teletext-addr-[1-4]|--teletext-port-[1-4]|--volume-ay| \
         --volume-beeper|--volume-covox|--volume-specdrum)
             # argument required but no completions available
@@ -271,7 +271,7 @@ _fuse()
             --snapshot --snet --sound --sound-device --sound-force-8bit
             --sound-freq --speaker-type --speccyboot --speccyboot-tap
             --specdrum --spectranet --spectranet-disable --speed
-            --statusbar --strict-aspect-hint --svga-modes --tape
+            --statusbar --strict-aspect-hint --tape
             --teletext-addr-1 --teletext-addr-2 --teletext-addr-3
             --teletext-addr-4 --teletext-port-1 --teletext-port-2
             --teletext-port-3 --teletext-port-4 --textfile --traps --ttx2000s
diff --git a/hacking/ui.txt b/hacking/ui.txt
index 77809df6..3a7e8f5f 100644
--- a/hacking/ui.txt
+++ b/hacking/ui.txt
@@ -29,7 +29,7 @@ Initialise all of the UI-specific bits except the display (keyboard, etc).
 and is the opportunity for the UI actions to happen. Some of the
 current UIs, for example the GTK UI use this to do most of their
 processing such as reading the keyboard and the like, whilst others,
-for example the SVGAlib UI do much less here.
+for example the framebuffer UI do much less here.
 
 * int ui_verror( ui_error_level severity, const char *format, va_list ap )
 
diff --git a/keysyms.pl b/keysyms.pl
index 8acf5422..7359e1a1 100755
--- a/keysyms.pl
+++ b/keysyms.pl
@@ -33,7 +33,7 @@ my $ui = shift;
 $ui = 'gtk' unless defined $ui;
 
 die "$0: unrecognised user interface: $ui\n"
-  unless 0 < grep { $ui eq $_ } ( 'gtk', 'x', 'svga', 'fb', 'sdl', 'win32', 'wii' );
+  unless 0 < grep { $ui eq $_ } ( 'gtk', 'x', 'fb', 'sdl', 'win32', 'wii' );
 
 sub fb_keysym ($) {
 
@@ -80,25 +80,6 @@ sub sdl_unicode_keysym ($) {
     return $keysym;
 }
 
-sub svga_keysym ($) {
-    
-    my $keysym = shift;
-
-    $keysym =~ tr/a-z/A-Z/;
-    $keysym =~ s/(.*)_L$/LEFT$1/;
-    $keysym =~ s/(.*)_R$/RIGHT$1/;
-    $keysym =~ s/META$/WIN/;		# Fairly sensible mapping
-    $keysym =~ s/^PAGE_/PAGE/;
-
-    # All the magic #defines start with `SCANCODE_'
-    $keysym = "SCANCODE_$keysym";
-    
-    # Apart from this one :-)
-    $keysym = "127" if $keysym eq 'SCANCODE_MODE_SWITCH';
-
-    return $keysym;
-}
-
 sub win32_keysym ($) {
 
     my $keysym = shift;
@@ -220,25 +201,6 @@ my %ui_data = (
 	      unicode_function => \&sdl_unicode_keysym,
 	    },
 
-    svga => { headers => [ 'vgakeyboard.h' ],
-	      max_length => 26,
-	      skips => { map { $_ => 1 } qw( Hyper_L Hyper_R Super_L Super_R
-                 dollar less greater exclam ampersand parenleft parenright
-                 asterisk plus colon asciicircum dead_circumflex bar ) },
-	      translations => {
-		  Caps_Lock  => 'CAPSLOCK',
-		  numbersign => 'BACKSLASH',
-		  Return     => 'ENTER',
-		  Delete     => 'REMOVE',
-		  Left       => 'CURSORBLOCKLEFT',
-		  Down       => 'CURSORBLOCKDOWN',
-		  Up         => 'CURSORBLOCKUP',
-		  Right      => 'CURSORBLOCKRIGHT',
-		  KP_Enter   => 'KEYPADENTER',
-	      },
-	      function => \&svga_keysym,
-	    },
-
     x    => { headers => [ 'X11/keysym.h' ],
 	      max_length => 15,
 	      skips => { },
@@ -361,10 +323,6 @@ foreach( @keys ) {
 
     $ui_keysym = $ui_data{$ui}{function}->( $ui_keysym );
 
-    if( $ui eq 'svga' and $ui_keysym =~ /WIN$/ ) {
-	print "#ifdef $ui_keysym\n";
-    }
-
     if( $ui eq 'fb' ) {
 
 	for( my $i = 0; $i <= $#cooked_keysyms; $i++ ) {
@@ -381,10 +339,6 @@ foreach( @keys ) {
 
     }
 
-    if( $ui eq 'svga' and $ui_keysym =~ /WIN$/ ) {
-	print "#endif                          /* #ifdef $keysym */\n";
-    }
-
 }
 
 print << "CODE";
diff --git a/man/fuse.1 b/man/fuse.1
index c8b948a1..1b5fbab9 100644
--- a/man/fuse.1
+++ b/man/fuse.1
@@ -1834,25 +1834,6 @@ prevent others (for example,
 from being able resize the window away from square.
 .RE
 .PP
-.B \-\-svga\-modes
-.I mode1,mode2,mode3
-.RS
-Specify which SVGA mode to use for the SVGAlib UI at different screen
-sizes. Available values for
-.IR mode1 ", " mode2 " and " mode3
-are listed in a table, when Fuse called with
-.B \-\-svga\-modes
-.I list
-command line option.
-When user select a not available mode for a size, Fuse just ignore
-and try to find the best mode for it. e.g. with
-.B "\-\-svga\-modes 0,0,12"
-Fuse use the specified 1024\(mu768\(mu256 SVGA mode for triple size filters,
-but select SVGA modes automatically for normal or double size filters.
-The above mode number is just an example, and mode numbers and their
-meanings may vary graphics card by graphics card.
-.RE
-.PP
 .B \-t
 .I file
 .br
@@ -2089,7 +2070,7 @@ section for details.
 .\"
 .SH "THE VARIOUS FRONT-ENDS"
 Fuse supports various front-ends, or UIs (user interfaces). The usual
-one is GTK-based, but there are also SDL, Win32, Xlib, SVGAlib and
+one is GTK-based, but there are also SDL, Win32, Xlib and
 framebuffer ones.
 .PP
 The important difference to note is that GTK and Win32 versions uses
@@ -4162,7 +4143,7 @@ emulating machine's monitor. These filters can be used to do various
 forms of smoothing, emulation of TV scanlines and various other
 possibilities. Support for graphics filters varies between the
 different user interfaces, but there are two general classes: the GTK,
-Win32, Xlib, SVGAlib and SDL user interfaces (and the saving of .png
+Win32, Xlib and SDL user interfaces (and the saving of .png
 screenshots) support `interpolating' filters which use a palette larger
 than the Spectrum's 16\ colours, while the framebuffer user interface
 currently does not support filters at all.
@@ -4205,15 +4186,13 @@ Scale the displayed screen up to double size.
 .PP
 .IR "Triple size " ( 3x )
 .RS
-Scale the displayed screen up to triple size. Available only with the
-GTK, Win32, Xlib and SDL user interfaces or when saving screenshots of
-non-Timex machines.
+Scale the displayed screen up to triple size. Available when saving
+screenshots of non-Timex machines.
 .RE
 .PP
 .IR "Quadruple size " ( 4x )
 .RS
-Scale the displayed screen up to quadruple size. Available only with the
-GTK, Win32 and SDL user interfaces.
+Scale the displayed screen up to quadruple size.
 .RE
 .PP
 .IR "2xSaI " ( 2xsai )
@@ -4236,9 +4215,8 @@ diagonal lines.
 .RS
 Very similar to
 .IR AdvMAME2x ,
-except that it triples the size of the displayed screen. Available
-only with the GTK, Win32, Xlib and SDL user interfaces or when saving
-screenshots of non-Timex machines.
+except that it triples the size of the displayed screen. Available when
+saving screenshots of non-Timex machines.
 .RE
 .PP
 .IR "TV\ 2x " ( tv2x )
@@ -4281,16 +4259,14 @@ display.
 .RS
 An interpolating Timex-specific filter which scales the Timex screen
 up to 1.5\(mu its usual size (which is therefore 3\(mu the size of a
-`normal' Spectrum screen). Available only for the GTK, Win32 and SDL
-user interfaces or when saving screenshots.
+`normal' Spectrum screen).
 .RE
 .PP
 .IR "Timex\ 2x " ( timex2x )
 .RS
 A non-interpolating Timex-specific filter which scales the Timex screen
 up to 2\(mu its usual size (which is therefore 4\(mu the size of a
-`normal' Spectrum screen). Available only for the GTK, Win32 and SDL
-user interfaces or when saving screenshots.
+`normal' Spectrum screen).
 .RE
 .PP
 .IR "HQ\ 2x " ( hq2x )
@@ -5675,14 +5651,6 @@ or Beta disk images.
 .\"------------------------------------------------------------------
 .\"
 .SH BUGS
-Selecting a startup filter doesn't work properly with user interfaces
-other than SDL, Win32 and GTK.
-.PP
-Changing virtual consoles when using SVGAlib for joystick support
-causes Fuse to exit. If this is a problem, compile Fuse with the
-.RB ` \-\-disable\-ui\-joystick '
-option.
-.PP
 The poke finder can't search outside `normal' RAM.
 .PP
 The libao file output devices not work properly with the GTK UI.
diff --git a/settings.dat b/settings.dat
index 7c2382df..d400cef0 100644
--- a/settings.dat
+++ b/settings.dat
@@ -201,7 +201,7 @@ printer_text_filename, string, "printout.txt",, textfile
 aspect_hint, boolean, 1
 strict_aspect_hint, boolean, 0
 fb_mode, numeric, 320, 'v', fbmode
-svga_modes, string, NULL
+svga_modes, null, 0
 sdl_fullscreen_mode, string, NULL
 doublescan_mode, numeric, 1, 'D', doublescan-mode
 
diff --git a/ui.c b/ui.c
index a72e5f64..9356a1ba 100644
--- a/ui.c
+++ b/ui.c
@@ -113,13 +113,13 @@ print_error_to_stderr( ui_error_level severity, const char *message )
      informational */
   if( severity > UI_ERROR_INFO ) {
 
-    /* For the fb and svgalib UIs, we don't want to write to stderr if
+    /* For the fb UI, we don't want to write to stderr if
        it's a terminal, as it's then likely to be what we're currently
        using for graphics output, and writing text to it isn't a good
        idea. Things are OK if we're exiting though */
-#if defined( UI_FB ) || defined( UI_SVGA )
+#ifdef UI_FB
     if( isatty( STDERR_FILENO ) && !fuse_exiting ) return 1;
-#endif			/* #if defined( UI_FB ) || defined( UI_SVGA ) */
+#endif			/* #ifdef UI_FB */
 
     fprintf( stderr, "%s: ", fuse_progname );
 
diff --git a/ui/svga/Makefile.am b/ui/svga/Makefile.am
deleted file mode 100644
index cd037e18..00000000
--- a/ui/svga/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Copyright (c) 2001-2004 Philip Kendall
-## Copyright (c) 2015 Sergio Baldoví
-
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License along
-## with this program; if not, write to the Free Software Foundation, Inc.,
-## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-##
-## Author contact information:
-##
-## E-mail: phi...@sh...
-
-if UI_SVGA
-
-fuse_SOURCES += $(ui_svga_files)
-
-BUILT_SOURCES += $(ui_svga_built)
-
-endif
-
-
-CLEANFILES += $(ui_svga_built)
-
-ui_svga_files = \
-                ui/svga/keysyms.c \
-                ui/svga/svgadisplay.c \
-                ui/svga/svgadisplay.h \
-                ui/svga/svgajoystick.c \
-                ui/svga/svgakeyboard.c \
-                ui/svga/svgakeyboard.h \
-                ui/svga/svgaui.c
-
-ui_svga_built = ui/svga/keysyms.c
-
-ui/svga/keysyms.c: $(srcdir)/keysyms.pl $(srcdir)/keysyms.dat
-	@$(MKDIR_P) ui/svga
-	$(AM_V_GEN)$(PERL) -I$(srcdir)/perl $(srcdir)/keysyms.pl svga $(srcdir)/keysyms.dat > $@.tmp && mv $@.tmp $@
diff --git a/ui/svga/svgadisplay.c b/ui/svga/svgadisplay.c
deleted file mode 100644
index c093b0f2..00000000
--- a/ui/svga/svgadisplay.c
+++ /dev/null
@@ -1,822 +0,0 @@
-/* svgadisplay.c: Routines for dealing with the svgalib display
-   Copyright (c) 2000-2003 Philip Kendall, Matan Ziv-Av, Witold Filipczyk,
-			   Russell Marks
-   Copyright (c) 2015 Stuart Brady
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-   Author contact information:
-
-   E-mail: phi...@sh...
-
-*/
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <vga.h>
-#include <vgakeyboard.h>
-
-#include "fuse.h"
-#include "display.h"
-#include "screenshot.h"
-#include "settings.h"
-#include "ui/ui.h"
-#include "ui/uidisplay.h"
-
-/* The size of a 1x1 image in units of
-   DISPLAY_ASPECT WIDTH x DISPLAY_SCREEN_HEIGHT
-   scale * 4, so 2 => 0.5, 6 => 1.5, 4 => 1.0 */
-static int image_scale = 1;
-
-/* The height and width of a 1x1 image in pixels */
-static int image_width, image_height, scaled_image_w, scaled_image_h;
-
-/* A copy of every pixel on the screen */
-static libspectrum_word
-  rgb_image[2 * ( DISPLAY_SCREEN_HEIGHT + 4 )][2 * ( DISPLAY_SCREEN_WIDTH  + 3 )];
-static const int rgb_pitch = 2 * ( DISPLAY_SCREEN_WIDTH + 3 );
-
-/* A scaled copy of the image displayed on the Spectrum's screen */
-static libspectrum_word
-  scaled_image[3*DISPLAY_SCREEN_HEIGHT][3*DISPLAY_SCREEN_WIDTH];
-static const ptrdiff_t scaled_pitch =
-  3 * DISPLAY_SCREEN_WIDTH * sizeof( libspectrum_word );
-
-/* The line buffer for svga_putpixel ...*/
-static libspectrum_byte
-  line_buff[3*4*DISPLAY_SCREEN_WIDTH];
-static libspectrum_byte *line_buff_ptr;
-static int bytesperpixel = 0;
-static int xoffs, yoffs, xclip, yclip;
-
-static int svgadisplay_current_size = 0;
-static int svgadisplay_depth = -1;
-static int svgadisplay_bw = -1;
-static int rShift = 16, gShift = 8, bShift = 0;
-
-/* This is a rule of thumb for the maximum number of rects that can be updated
-   each frame. If more are generated we just update the whole screen */
-typedef struct {
-  int x; int y; int w; int h;
-} SVGA_Rect;
-#define MAX_UPDATE_RECT 300
-static SVGA_Rect updated_rects[MAX_UPDATE_RECT];
-static int num_rects = 0;
-static libspectrum_byte svgadisplay_force_full_refresh = 1;
-
-typedef void svgadisplay_update_rect_t( int x, int y, int w, int h );
-
-static svgadisplay_update_rect_t *svgadisplay_update_rect;
-static svgadisplay_update_rect_t svgadisplay_update_rect_noscale;
-static svgadisplay_update_rect_t svgadisplay_update_rect_scale;
-
-typedef void svgadisplay_putpixel_t( int x, int y, libspectrum_word *color );
-
-static svgadisplay_putpixel_t *svgadisplay_putpixel;
-
-static svgadisplay_putpixel_t svgadisplay_putpixel_4;
-static svgadisplay_putpixel_t svgadisplay_putpixel_8;
-static svgadisplay_putpixel_t svgadisplay_putpixel_15;
-static svgadisplay_putpixel_t svgadisplay_putpixel_16;
-static svgadisplay_putpixel_t svgadisplay_putpixel_24;
-
-static int svgadisplay_allocate_colours4( void );
-static int svgadisplay_allocate_colours8( void );
-
-
-static libspectrum_word pal_colour[16] = {
-  0x0000, 0x0017, 0xb800, 0xb817, 0x05e0, 0x05f7, 0xbde0, 0xbdf7,
-  0x0000, 0x001f, 0xf800, 0xf81f, 0x07e0, 0x07ff, 0xffe0, 0xffff,
-};
-
-static libspectrum_word pal_grey[16] = {
-  0x0000, 0x39c7, 0x18a3, 0x526a, 0x738e, 0xad55, 0x8430, 0xbdf7,
-  0x0000, 0x4a69, 0x20e4, 0x6b4d, 0x94b2, 0xdf1b, 0xb596, 0xffff,
-};
-
-static  int rgb_for_4[] = {
-  0x00, 0x00, 0x00,
-  0x00, 0x00, 0xBF,
-  0xBF, 0x00, 0x00,
-  0xBF, 0x00, 0xBF,
-  0x00, 0xBF, 0x00,
-  0x00, 0xBF, 0xBF,
-  0xBF, 0xBF, 0x00,
-  0xBF, 0xBF, 0xBF,
-  0x00, 0x00, 0x00,
-  0x00, 0x00, 0xFF,
-  0xFF, 0x00, 0x00,
-  0xFF, 0x00, 0xFF,
-  0x00, 0xFF, 0x00,
-  0x00, 0xFF, 0xFF,
-  0xFF, 0xFF, 0x00,
-  0xFF, 0xFF, 0xFF
-};
-
-static void register_scalers( void );
-
-typedef struct svga_mode_t {
-  int n;
-  /* vga_modeinfo *inf; */
-  int width, height, bytesperpixel, colors;
-  int depth;
-} svga_mode_t;
-
-#define SIZE_1x_REGISTER(p,s) if( modes[0].n != -1 && ( p || modes[0].depth > 4 ) ) scaler_register( s )
-#define SIZE_2x_REGISTER(p,s) if( modes[1].n != -1 && ( p || modes[1].depth > 4 ) ) scaler_register( s )
-#define SIZE_3x_REGISTER(p,s) if( modes[2].n != -1 && ( p || modes[2].depth > 4 ) ) scaler_register( s )
-
-svga_mode_t modes[] = {
-  { -1, 0, 0, 0, 0, 0, },		/* 320x240 */
-  { -1, 0, 0, 0, 0, 0, },		/* 640x480 */
-  { -1, 0, 0, 0, 0, 0, },		/* 960x720 */
-};
-
-void
-set_mode( int i, int n, vga_modeinfo *inf )
-{
-  if( inf->colors >= 16 && !( inf->flags & IS_MODEX ) &&
-	inf->width >= 256 * ( i + 1 ) &&
-	  inf->height >= 192 * ( i + 1 ) ) {
-    modes[i].n = n;
-    modes[i].width  = inf->width;
-    modes[i].height = inf->height;
-    modes[i].colors = inf->colors;
-    modes[i].bytesperpixel = inf->bytesperpixel ? inf->bytesperpixel : 1;
-    modes[i].depth = inf->colors == 16 ? 4 : 
-		    ( inf->colors == 256 ? 8 : 
-			( inf->colors == 32768 ? 15 :
-			    ( inf->colors == 65536 ? 16 :
-				inf->bytesperpixel == 3 ? 24 : 32 ) ) );
-  }
-}
-
-void
-find_mode( int exact )
-{
-  vga_modeinfo *inf;
-  int i, j, w, h;
-
-  for( i = 0; i <= vga_lastmodenumber(); i++ ) {
-    if( vga_hasmode( i ) ) {
-      inf = vga_getmodeinfo( i );
-      if( inf->colors >= 16 && !( inf->flags & IS_MODEX ) &&
-    	    inf->width >= 320 && inf->height >= 240 &&
-		inf->width <= 1280 && inf->height <= 1024 ) {
-	/* try exact match */
-	for( j = 0; j < 3; j++ ) {
-	  w = DISPLAY_ASPECT_WIDTH * ( j + 1 );
-	  h = DISPLAY_SCREEN_HEIGHT * ( j + 1 );
-	  if( exact == 0 && inf->width == w && inf->height == h &&
-	    ( modes[j].n == -1 ||
-		( ( modes[j].width != w || modes[j].height != h ||
-		    modes[j].depth != 16 ) && (
-			inf->colors == 65536 || 
-			    inf->colors > modes[j].colors ) ) ) ) {
-	    set_mode( j, i, inf );
-	  }
-
-	  if( exact == 1 && inf->width >= w && inf->height >= h &&
-		inf->width < w * 5 / 4 && inf->height < h * 5 / 4 &&
-	    ( modes[j].n == -1 ||
-		( ( modes[j].width > inf->width ||
-			     modes[j].height > inf->height ||
-		    modes[j].depth != 16 ) && (
-			inf->colors == 65536 || 
-			    inf->colors > modes[j].colors ) ) ) ) {
-	    set_mode( j, i, inf );
-	  }
-
-	  if( exact == -1 && inf->width <= w && inf->height <= h &&
-		inf->width > w * 3 / 4 && inf->height > h * 3 / 4 &&
-	    ( modes[j].n == -1 ||
-		( ( modes[j].width < inf->width ||
-			     modes[j].height < inf->height ||
-		    modes[j].depth != 16 ) && (
-			inf->colors == 65536 || 
-			    inf->colors > modes[j].colors ) ) ) ) {
-	    set_mode( j, i, inf );
-	  }
-	}
-      }
-    }
-  }
-}
-
-static void
-svgadisplay_setmode( int i )
-{
-  int w, h;
-  w = DISPLAY_ASPECT_WIDTH  * ( i + 1 );
-  h = DISPLAY_SCREEN_HEIGHT * ( i + 1 );
-  vga_setmode( modes[i].n );
-  svgadisplay_depth = modes[i].depth;
-  bytesperpixel = modes[i].bytesperpixel;
-  xoffs = xclip = 0;
-  if( modes[i].width > w ) {
-    xoffs = ( modes[i].width - w ) >> 1;
-  } else if( modes[i].width < w ) {
-    xclip = ( w - modes[i].width ) >> 1;
-  }
-  yoffs = yclip = 0;
-  if( modes[i].height > h ) {
-    yoffs = ( modes[i].height - h ) >> 1;
-  } else if( modes[i].height < h ) {
-    yclip = ( h - modes[i].height ) >> 1;
-  }
-  if( svgadisplay_depth == 4 )
-    svgadisplay_allocate_colours4();
-  if( svgadisplay_depth == 8 )
-    svgadisplay_allocate_colours8();
-}
-
-int
-svgadisplay_init( void )
-{
-  int i, j, found_mode = 0;
-  int n0 = -1, n1 = -1, n2 = -1;
-  vga_modeinfo *inf;
-  vga_init();
-  
-  if( settings_current.svga_modes && 
-	strcmp( settings_current.svga_modes, "list" ) == 0 ) {
-    fprintf( stderr, 
-    "=====================================================================\n"
-    " List of available SVGA modes:\n" 
-    "---------------------------------------------------------------------\n"
-    "  No. width height colors     Normal       Double       Triple\n"
-    "---------------------------------------------------------------------\n"
-    );
-    for( j = 0; j <= vga_lastmodenumber(); j++ ) {
-      if( vga_hasmode( j ) ) {
-        inf = vga_getmodeinfo( j );
-        if( inf->colors >= 16 && !( inf->flags & IS_MODEX ) &&
-		inf->width >= 256 &&
-		inf->height >= 192 ) {
-	  fprintf( stderr, "% 4d  % 5d% 5d    %s   % 4d%%% 4d%%", j, inf->width, inf->height,
-		( inf->colors == 16 ? " 16 " : 
-		    ( inf->colors == 256 ? "256 " : 
-			( inf->colors == 32768 ? " 32k" :
-			    ( inf->colors == 65536 ? " 64k" : " 16M" ) ) ) ),
-			inf->width  * 100 / DISPLAY_ASPECT_WIDTH,
-			inf->height * 100 / DISPLAY_SCREEN_HEIGHT );
-	  if( inf->width >= 512 && inf->height >= 384 ) {
-	    fprintf( stderr, "   % 4d%%% 4d%%",
-	    		inf->width  * 50 / DISPLAY_ASPECT_WIDTH,
-			inf->height * 50 / DISPLAY_SCREEN_HEIGHT );
-	  } else {
-	    fprintf( stderr, "       N/A   " );
-	  }
-	  if( inf->width >= 768 && inf->height >= 576 ) {
-	    fprintf( stderr, "   % 4d%%% 4d%%\n",
-	    		inf->width  * 100 / DISPLAY_ASPECT_WIDTH / 3,
-			inf->height * 100 / DISPLAY_SCREEN_HEIGHT / 3 );
-	  } else {
-	    fprintf( stderr, "       N/A\n" );
-	  }
-	}
-      }
-    }
-    return 1;
-  }
-
-  find_mode( 0 );
-  find_mode( 1 );
-  find_mode( -1 );
-  
-
-  if( settings_current.svga_modes ) {
-    sscanf( settings_current.svga_modes, " %i%*[ ,;/|] %i%*[ ,;/|] %i", &n0, &n1, &n2 );
-    if( n0 > 0 && vga_hasmode( n0 ) ) set_mode( 0, n0, vga_getmodeinfo( n0 ) );
-    if( n1 > 0 && vga_hasmode( n1 ) ) set_mode( 1, n1, vga_getmodeinfo( n1 ) );
-    if( n2 > 0 && vga_hasmode( n2 ) ) set_mode( 2, n2, vga_getmodeinfo( n2 ) );
-  }
-
-#if 0		/* for debugging */
-  for( i = 0; i < 3; i++ ) {
-    fprintf( stderr, "svgadisplay_size: %d:", i );
-    if( modes[i].n != -1 ) {
-      fprintf( stderr, " %d %dx%d %s (%d)", modes[i].n, modes[i].width, modes[i].height, 
-    			vga_getmodename( modes[i].n ), modes[i].depth );
-    }
-    fprintf( stderr, "\n" );
-  }
-#endif
-
-  for( i = 0; i < 3; i++ ) {
-    if( modes[i].n != -1 ) {
-      svgadisplay_current_size = i + 1;
-      svgadisplay_setmode( i );
-      found_mode = 1;
-      break;
-    }
-  }
-
-  /* Error out if we couldn't find a VGA mode */
-  if( !found_mode ) {
-    ui_error( UI_ERROR_ERROR, "couldn't find a mode to start in" );
-    return 1;
-  }
-
-  return 0;
-}
-
-static void
-svgadisplay_putpixel_4( int x, int y, libspectrum_word *colour)
-{
-  *line_buff_ptr++ = *colour;
-}
-
-static void
-svgadisplay_putpixel_8( int x, int y, libspectrum_word *colour)
-{
-  libspectrum_word c = *colour;
-
-  c = (       c         & 0x1f ) * 3 / 31 +
-      ( ( ( ( c >>  5 ) & 0x3f ) * 7 / 63 ) << 2 ) +
-        ( ( ( c >> 11 )          * 3 / 31 ) << 5 );
-  *line_buff_ptr++ = c;
-}
-
-static void
-svgadisplay_putpixel_15( int x, int y, libspectrum_word *colour )
-{
-  libspectrum_word c = *colour;
-
-  *(libspectrum_word *)line_buff_ptr = 
-		( c & 0x1f ) + ( ( c >>  1 ) & 0xffe0 );
-  line_buff_ptr += 2;
-}
-
-static void
-svgadisplay_putpixel_16( int x, int y, libspectrum_word *colour )
-{
-  libspectrum_word c = *colour;
-
-  *(libspectrum_word *)line_buff_ptr = c;
-  line_buff_ptr += 2;
-}
-
-static void
-svgadisplay_putpixel_24( int x, int y, libspectrum_word *colour )
-{
-  libspectrum_dword c = *colour;
-
-  c =   ( ( ( c >> 11 )          * 255 / 31 ) << rShift ) +
-        ( ( ( ( c >>  5 ) & 0x3f ) * 255 / 63 ) << gShift ) +
-          ( ( ( c         & 0x1f ) * 255 / 31 ) << bShift );
-  *(libspectrum_dword *)line_buff_ptr = c;
-  line_buff_ptr += 3;
-}
-
-static void
-svgadisplay_putpixel_32( int x, int y, libspectrum_word *colour )
-{
-  libspectrum_dword c = *colour;
-
-  c =   ( ( ( c >> 11 )          * 255 / 31 ) << rShift ) +
-        ( ( ( ( c >>  5 ) & 0x3f ) * 255 / 63 ) << gShift ) +
-          ( ( ( c         & 0x1f ) * 255 / 31 ) << bShift );
-  *(libspectrum_dword *)line_buff_ptr = c;
-  line_buff_ptr += 4;
-}
-
-static int
-svgadisplay_allocate_colours4( void )
-{
-  int i;
-  int red, green, blue;
-
-/*    Y  =  0.29900 * R + 0.58700 * G + 0.11400 * B */
-
-  if( settings_current.bw_tv ) {
-    for( i=0; i<16; i++ ) {	/* grey */
-      red = green = blue = (
-	    rgb_for_4[i * 3    ] * 4822 / 255 +
-	    rgb_for_4[i * 3 + 1] * 9467 / 255 +
-	    rgb_for_4[i * 3 + 2] * 1839 / 255 ) >> 8;
-      vga_setpalette( i, red, green, blue );
-    }
-  } else {
-    for( i=0; i<16; i++ ) {	/* rgb */
-      red   = rgb_for_4[i * 3    ] * 63 / 255;
-      green = rgb_for_4[i * 3 + 1] * 63 / 255;
-      blue  = rgb_for_4[i * 3 + 2] * 63 / 255;
-      vga_setpalette( i, red, green, blue );
-    }
-  }
-
-  return 0;
-}
-
-static int
-svgadisplay_allocate_colours8( void )
-{
-  int i, r, g, b;
-  int red, green, blue;
-
-  i = 0;
-  for( r=0; r<4; r++ )		/* rgb232 => 128 */
-    for( g=0; g<8; g++ )
-      for( b=0; b<4; b++ ) {
-        if( settings_current.bw_tv ) {
-          red = green = blue = (
-		r * 4822 / 3 +
-		g * 9467 / 7 +
-		b * 1839 / 3 ) >> 8;
-	} else {
-          red = r * 63 / 3;
-	  green = g * 63 / 7;
-          blue = b * 63 / 3;
-	}
-	vga_setpalette( i, red, green, blue );
-	i++;
-      }
-
-  return 0;
-}
-  
-
-int
-uidisplay_init( int width, int height )
-{
-  image_width  = width;
-  image_height = height;
-  if( !scaler_is_supported( current_scaler ) ) {
-    if( machine_current->timex )
-      scaler_select_scaler( SCALER_HALFSKIP );
-    else
-      scaler_select_scaler( SCALER_NORMAL );
-  }
-  register_scalers();
-  display_ui_initialised = 1;
-
-  display_refresh_all();
-
-  return 0;
-}
-
-static void
-register_scalers( void )
-{
-  int f = -1;
-  
-  scaler_register_clear();
-  scaler_select_bitformat( 565 );		/* 16bit always */
-
-  if( machine_current->timex ) {
-    SIZE_1x_REGISTER( 0, SCALER_HALF );
-    SIZE_1x_REGISTER( 1, SCALER_HALFSKIP );
-    SIZE_2x_REGISTER( 1, SCALER_NORMAL );
-    SIZE_2x_REGISTER( 0, SCALER_PALTV );
-    SIZE_3x_REGISTER( 0, SCALER_TIMEXTV );
-    SIZE_3x_REGISTER( 1, SCALER_TIMEX1_5X );
-  } else {
-    SIZE_1x_REGISTER( 1, SCALER_NORMAL );
-    SIZE_1x_REGISTER( 0, SCALER_PALTV );
-    
-    SIZE_2x_REGISTER( 1, SCALER_DOUBLESIZE );
-    SIZE_2x_REGISTER( 0, SCALER_2XSAI );
-    SIZE_2x_REGISTER( 0, SCALER_SUPER2XSAI );
-    SIZE_2x_REGISTER( 0, SCALER_SUPEREAGLE );
-    SIZE_2x_REGISTER( 1, SCALER_ADVMAME2X );
-    SIZE_2x_REGISTER( 0, SCALER_TV2X );
-    SIZE_2x_REGISTER( 0, SCALER_DOTMATRIX );
-    SIZE_2x_REGISTER( 0, SCALER_PALTV2X );
-    SIZE_2x_REGISTER( 0, SCALER_HQ2X );
-
-    SIZE_3x_REGISTER( 1, SCALER_TRIPLESIZE );
-    SIZE_3x_REGISTER( 1, SCALER_ADVMAME3X );
-    SIZE_3x_REGISTER( 0, SCALER_TV3X );
-    SIZE_3x_REGISTER( 0, SCALER_PALTV3X );
-    SIZE_3x_REGISTER( 0, SCALER_HQ3X );
-  }
-  if( current_scaler != SCALER_NUM )
-    f = 4.0 * scaler_get_scaling_factor( current_scaler ) * 
-	    ( machine_current->timex ? 2 : 1 );
-  if( scaler_is_supported( current_scaler ) &&
-	( svgadisplay_current_size * 4 == f ) ) {
-    uidisplay_hotswap_gfx_mode();
-  } else {
-    switch( svgadisplay_current_size ) {
-    case 1:
-      scaler_select_scaler( machine_current->timex ? SCALER_HALF : SCALER_NORMAL );
-      break;
-    case 2:
-      scaler_select_scaler( machine_current->timex ? SCALER_NORMAL : SCALER_DOUBLESIZE );
-      break;
-    case 3:
-      scaler_select_scaler( machine_current->timex ? SCALER_TIMEX1_5X : SCALER_TRIPLESIZE );
-      break;
-    }
-  }
-}
-
-static void
-svgadisplay_setup_rgb_putpixel( void )
-{
-  switch( svgadisplay_depth ) {
-  case 4:
-    svgadisplay_putpixel = svgadisplay_putpixel_4;
-    break;
-  case 8:
-    svgadisplay_putpixel = svgadisplay_putpixel_8;
-    break;
-  case 15:
-    svgadisplay_putpixel = svgadisplay_putpixel_15;
-    break;
-  case 16:
-    svgadisplay_putpixel = svgadisplay_putpixel_16;
-    break;
-  case 24:
-    svgadisplay_putpixel = svgadisplay_putpixel_24;
-    break;
-  case 32:
-    svgadisplay_putpixel = svgadisplay_putpixel_32;
-    break;
-  }
-/*  resize_window( scaled_image_w, scaled_image_h ); */
-}
-
-int
-uidisplay_hotswap_gfx_mode( void )
-{
-  image_scale = 4.0 * scaler_get_scaling_factor( current_scaler );
-  scaled_image_w = image_width  * image_scale >> 2;
-  scaled_image_h = image_height * image_scale >> 2;
-
-  if( svgadisplay_current_size * 4 != 
-	image_scale * ( machine_current->timex ? 2 : 1 ) ) {
-    svgadisplay_current_size = ( image_scale * ( machine_current->timex ? 2 : 1 ) ) >> 2;
-    svgadisplay_setmode( svgadisplay_current_size - 1 );
-  }
-
-  if( current_scaler == SCALER_NORMAL )
-    svgadisplay_update_rect = svgadisplay_update_rect_noscale;
-  else
-    svgadisplay_update_rect = svgadisplay_update_rect_scale;
-
-  svgadisplay_force_full_refresh = 1;
-
-  svgadisplay_setup_rgb_putpixel();
-
-  if( settings_current.bw_tv != svgadisplay_bw ) {
-    svgadisplay_bw = settings_current.bw_tv;
-    if( svgadisplay_depth == 4 )
-      svgadisplay_allocate_colours4();
-    else if( svgadisplay_depth == 8 )
-      svgadisplay_allocate_colours8();
-  }
-  display_refresh_all();
-  return 0;
-}
-
-static void
-svgadisplay_update_rect_noscale( int x, int y, int w, int h )
-{
-  int yy, xx;
-
-  if( xclip || yclip ) {
-    if( x < xclip ) w -= xclip - x, x = xclip;
-    if( y < yclip ) h -= yclip - y, y = yclip;
-    if( x + w > scaled_image_w - xclip ) w = scaled_image_w - xclip - x;
-    if( y + h > scaled_image_h - yclip ) h = scaled_image_h - yclip - y;
-  }
-  /* Call putpixel multiple times */
-  for( yy = y; yy < y + h; yy++ ) {
-    line_buff_ptr = line_buff;
-    for( xx = x; xx < x + w; xx++ )
-      svgadisplay_putpixel( xx, yy, &rgb_image[yy + 2][xx + 1] );
-    if( w > 0 )
-      vga_drawscansegment( line_buff, x + xoffs - xclip, yy + yoffs - yclip, w * bytesperpixel );
-  }
-}
-
-static void
-svgadisplay_update_rect_scale( int x, int y, int w, int h )
-{
-  int yy = y, xx = x;
-
-  y = y * image_scale >> 2;
-  x = x * image_scale >> 2;
-  scaler_proc16(
-        (libspectrum_byte *)&(rgb_image[yy + 2][xx + 1]),
-        rgb_pitch * sizeof(rgb_image[0][0]),
-        (libspectrum_byte *)&(scaled_image[y][x]),
-        scaled_pitch,
-        w, h
-      );
-
-  w = w * image_scale >> 2;
-  h = h * image_scale >> 2;
-  
-  if( xclip || yclip ) {
-    if( x < xclip ) w -= xclip - x, x = xclip;
-    if( y < yclip ) h -= yclip - y, y = yclip;
-    if( x + w > scaled_image_w - xclip ) w = scaled_image_w - xclip - x;
-    if( y + h > scaled_image_h - yclip ) h = scaled_image_h - yclip - y;
-  }
-  /* Call putpixel multiple times */
-  for( yy = y; yy < y + h; yy++ ) {
-    line_buff_ptr = line_buff;
-    for( xx = x; xx < x + w; xx++ )
-      svgadisplay_putpixel( xx, yy, &scaled_image[yy][xx] );
-    if( w > 0 )
-      vga_drawscansegment( line_buff, x + xoffs - xclip, yy + yoffs - yclip, w * bytesperpixel );
-  }
-}
-
-void
-uidisplay_frame_end( void ) 
-{
-  SVGA_Rect *r, *last_rect;
-
-  /* Force a full redraw if requested */
-  if ( svgadisplay_force_full_refresh ) {
-    num_rects = 1;
-
-    updated_rects[0].x = 0;
-    updated_rects[0].y = 0;
-    updated_rects[0].w = image_width;
-    updated_rects[0].h = image_height;
-  }
-
-  if ( !( ui_widget_level >= 0 ) && num_rects == 0 ) return;
-
-  last_rect = updated_rects + num_rects;
-
-  for( r = updated_rects; r != last_rect; r++ )
-    svgadisplay_update_rect( r->x, r->y, r->w, r->h );
-  num_rects = 0;
-  svgadisplay_force_full_refresh = 0;
-}
-
-void
-uidisplay_area( int x, int y, int w, int h )
-{
-  if ( svgadisplay_force_full_refresh )
-    return;
-
-  if( num_rects == MAX_UPDATE_RECT ) {
-    svgadisplay_force_full_refresh = 1;
-    return;
-  }
-
-  /* Extend the dirty region by 1 pixel for scalers
-     that "smear" the screen, e.g. 2xSAI */
-  if( scaler_flags & SCALER_FLAGS_EXPAND )
-    scaler_expander( &x, &y, &w, &h, image_width, image_height );
-
-  updated_rects[num_rects].x = x;
-  updated_rects[num_rects].y = y;
-  updated_rects[num_rects].w = w;
-  updated_rects[num_rects].h = h;
-  num_rects++;
-}
-
-int
-uidisplay_end( void )
-{
-  display_ui_initialised = 0;
-  return 0;
-}
-
-/* Set one pixel in the display */
-void
-uidisplay_putpixel( int x, int y, int colour )
-{
-  libspectrum_word pc = svgadisplay_depth == 4 ? colour :
-		( settings_current.bw_tv ? pal_grey[ colour ] :
-                        	pal_colour[ colour ] );
-
-  if( machine_current->timex ) {
-    x <<= 1; y <<= 1;
-    rgb_image[y + 2][x + 1] = pc;
-    rgb_image[y + 2][x + 2] = pc;
-    rgb_image[y + 3][x + 1] = pc;
-    rgb_image[y + 3][x + 2] = pc;
-  } else {
-    rgb_image[y + 2][x + 1] = pc;
-  }
-}
-
-/* Print the 8 pixels in `data' using ink colour `ink' and paper
-   colour `paper' to the screen at ( (8*x) , y ) */
-void
-uidisplay_plot8( int x, int y, libspectrum_byte data,
-	         libspectrum_byte ink, libspectrum_byte paper )
-{
-  libspectrum_word *dest;
-  libspectrum_word pi = svgadisplay_depth == 4 ? ink :
-			( settings_current.bw_tv ? pal_grey[ ink ] :
-                        	pal_colour[ ink ] );
-  libspectrum_word pp = svgadisplay_depth == 4 ? paper :
-			( settings_current.bw_tv ? pal_grey[ paper ] :
-                        	pal_colour[ paper ] );
-
-  if( machine_current->timex ) {
-
-    x <<= 4; y <<= 1;
-
-    dest = &(rgb_image[y + 2][x + 1]);
-
-    *(dest + rgb_pitch) = *dest = ( data & 0x80 ) ? pi : pp; dest++;
-    *(dest + rgb_pitch) = *dest = ( data & 0x80 ) ? pi : pp; dest++;
-    *(dest + rgb_pitch) = *dest = ( data & 0x40 ) ? pi : pp; dest++;
-    *(dest + rgb_pitch) = *dest = ( data & 0x40 ) ? pi : pp; dest++;
-    *(dest + rgb_pitch) = *dest = ( data & 0x20 ) ? pi : pp; dest++;
-    *(dest + rgb_pitch) = *dest = ( data & 0x20 ) ? pi : pp; dest++;
-    *(dest + rgb_pitch) = *dest = ( data & 0x10 ) ? pi : pp; dest++;
-    *(dest + rgb_pitch) = *dest = ( data & 0x10 ) ? pi : pp; dest++;
-    *(dest + rgb_pitch) = *dest = ( data & 0x08 ) ? pi : pp; dest++;
-    *(dest + rgb_pitch) = *dest = ( data & 0x08 ) ? pi : pp; dest++;
-    *(dest + rgb_pitch) = *dest = ( data & 0x04 ) ? pi : pp; dest++;
-    *(dest + rgb_pitch) = *dest = ( data & 0x04 ) ? pi : pp; dest++;
-    *(dest + rgb_pitch) = *dest = ( data & 0x02 ) ? pi : pp; dest++;
-    *(dest + rgb_pitch) = *dest = ( data & 0x02 ) ? pi : pp; dest++;
-    *(dest + rgb_pitch) = *dest = ( data & 0x01 ) ? pi : pp; dest++;
-    *(dest + rgb_pitch) = *dest = ( data & 0x01 ) ? pi : pp;
-  } else {
-    x <<= 3;
-
-    dest = &(rgb_image[y + 2][x + 1]);
-
-    *(dest++) = ( data & 0x80 ) ? pi : pp;
-    *(dest++) = ( data & 0x40 ) ? pi : pp;
-    *(dest++) = ( data & 0x20 ) ? pi : pp;
-    *(dest++) = ( data & 0x10 ) ? pi : pp;
-    *(dest++) = ( data & 0x08 ) ? pi : pp;
-    *(dest++) = ( data & 0x04 ) ? pi : pp;
-    *(dest++) = ( data & 0x02 ) ? pi : pp;
-    *dest     = ( data & 0x01 ) ? pi : pp;
-  }
-}
-
-/* Print the 16 pixels in `data' using ink colour `ink' and paper
-   colour `paper' to the screen at ( (16*x) , y ) */
-void
-uidisplay_plot16( int x, int y, libspectrum_word data,
-                 libspectrum_byte ink, libspectrum_byte paper )
-{
-  libspectrum_word *dest;
-  libspectrum_word pi = svgadisplay_depth == 4 ? ink :
-			( settings_current.bw_tv ? pal_grey[ ink ] :
-                        	pal_colour[ ink ] );
-  libspectrum_word pp = svgadisplay_depth == 4 ? paper :
-			( settings_current.bw_tv ? pal_grey[ paper ] :
-                        	pal_colour[ paper ] );
-  x <<= 4; y <<= 1;
-
-  dest = &(rgb_image[y + 2][x + 1]);
-  *(dest + rgb_pitch) = *dest = ( data & 0x8000 ) ? pi : pp; dest++;
-  *(dest + rgb_pitch) = *dest = ( data & 0x4000 ) ? pi : pp; dest++;
-  *(dest + rgb_pitch) = *dest = ( data & 0x2000 ) ? pi : pp; dest++;
-  *(dest + rgb_pitch) = *dest = ( data & 0x1000 ) ? pi : pp; dest++;
-  *(dest + rgb_pitch) = *dest = ( data & 0x0800 ) ? pi : pp; dest++;
-  *(dest + rgb_pitch) = *dest = ( data & 0x0400 ) ? pi : pp; dest++;
-  *(dest + rgb_pitch) = *dest = ( data & 0x0200 ) ? pi : pp; dest++;
-  *(dest + rgb_pitch) = *dest = ( data & 0x0100 ) ? pi : pp; dest++;
-  *(dest + rgb_pitch) = *dest = ( data & 0x0080 ) ? pi : pp; dest++;
-  *(dest + rgb_pitch) = *dest = ( data & 0x0040 ) ? pi : pp; dest++;
-  *(dest + rgb_pitch) = *dest = ( data & 0x0020 ) ? pi : pp; dest++;
-  *(dest + rgb_pitch) = *dest = ( data & 0x0010 ) ? pi : pp; dest++;
-  *(dest + rgb_pitch) = *dest = ( data & 0x0008 ) ? pi : pp; dest++;
-  *(dest + rgb_pitch) = *dest = ( data & 0x0004 ) ? pi : pp; dest++;
-  *(dest + rgb_pitch) = *dest = ( data & 0x0002 ) ? pi : pp; dest++;
-  *(dest + rgb_pitch) = *dest = ( data & 0x0001 ) ? pi : pp;
-}
-
-int svgadisplay_end( void )
-{
-  vga_setmode( TEXT );
-  return 0;
-}
-
-void
-uidisplay_frame_save( void )
-{
-  /* FIXME: Save current framebuffer state as the widget UI wants to scribble
-     in here */
-}
-
-void
-uidisplay_frame_restore( void )
-{
-  /* FIXME: Restore saved framebuffer state as the widget UI wants to draw a
-     new menu */
-}
diff --git a/ui/svga/svgadisplay.h b/ui/svga/svgadisplay.h
deleted file mode 100644
index 7293ae44..00000000
--- a/ui/svga/svgadisplay.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* svgadisplay.h: Routines for dealing with the svgalib display
-   Copyright (c) 2003 Philip Kendall
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-   Author contact information:
-
-   E-mail: phi...@sh...
-
-*/
-
-#ifndef FUSE_SVGADISPLAY_H
-#define FUSE_SVGADISPLAY_H
-
-int svgadisplay_init( void );
-int svgadisplay_end( void );
-
-#endif			/* #ifndef FUSE_SVGADISPLAY_H */
diff --git a/ui/svga/svgajoystick.c b/ui/svga/svgajoystick.c
deleted file mode 100644
index 0195b425..00000000
--- a/ui/svga/svgajoystick.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/* svgajoystick.c: Joystick emulation (using svgalib)
-   Copyright (c) 2003-4 Darren Salt
-   Copyright (c) 2015 UB880D
-   Copyright (c) 2015 Sergio Baldoví
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-   Author contact information:
-
-   E-mail: phi...@sh...
-
-   Darren: li...@yo...
-
-*/
-
-#include "config.h"
-#include "peripherals/joystick.h"
-
-#if !defined USE_JOYSTICK || defined HAVE_JSW_H
-
-/* Fake joystick, or override UI-specific handling */
-#include "../uijoystick.c"
-
-#else			/* #if !defined USE_JOYSTICK || defined HAVE_JSW_H */
-
-/* Use the svgalib joystick support */
-
-#include <string.h>
-#include <errno.h>
-
-#include "libspectrum.h"
-#include <vgajoystick.h>
-
-#include "fuse.h"
-#include "keyboard.h"
-#include "settings.h"
-#include "spectrum.h"
-#include "machine.h"
-#include "ui/ui.h"
-#include "ui/uijoystick.h"
-
-static int sticks = 0;
-static int buttons[2];
-
-static void joy_handler( int ev, int number, char value, int which );
-
-static int
-init_stick( int which )
-{
-  if( !joystick_init( which, JOY_CALIB_STDOUT ) ) {
-    ui_error( UI_ERROR_ERROR, "failed to initialise joystick %i: %s",
-	      which + 1, errno ? strerror (errno) : "not configured?" );
-    return 1;
-  }
-
-  if( joystick_getnumaxes( which ) < 2    ||
-      joystick_getnumbuttons( which ) < 1    ) {
-    joystick_close( which );
-    ui_error( UI_ERROR_ERROR, "sorry, joystick %i is inadequate!", which + 1 );
-    return 1;
-  }
-
-  buttons[which] = joystick_getnumbuttons( which );
-  if( buttons[which] > NUM_JOY_BUTTONS ) buttons[which] = NUM_JOY_BUTTONS;
-
-  return 0;
-}
-
-int
-ui_joystick_init( void )
-{
-  int i;
-
-  /* If we can't init the first, don't try the second */
-  if( init_stick( 0 ) ) {
-    sticks = 0;
-  } else if( init_stick( 1 ) ) {
-    sticks = 1;
-  } else {
-    sticks = 2;
-  }
-
-  for( i = 0; i < sticks; i++ ) {
-    joystick_sethandler( i, joy_handler );
-  }
-
-  return sticks;
-}
-
-void
-ui_joystick_end( void )
-{
-  joystick_close( -1 );
-}
-
-static void
-do_axis( int which, int position, input_key negative, input_key positive )
-{
-  input_event_t event1, event2;
-
-  event1.types.joystick.which = event2.types.joystick.which = which;
-
-  event1.types.joystick.button = positive;
-  event2.types.joystick.button = negative;
-
-  event1.type = position > 0 ? INPUT_EVENT_JOYSTICK_PRESS :
-                               INPUT_EVENT_JOYSTICK_RELEASE;
-  event2.type = position < 0 ? INPUT_EVENT_JOYSTICK_PRESS :
-                               INPUT_EVENT_JOYSTICK_RELEASE;
-
-  input_event( &event1 );
-  input_event( &event2 );
-}
-
-static void
-joy_handler( int ev, int number, char value, int which )
-{
-  input_event_t event;
-
-  switch ( ev ) {
-  case JOY_EVENTAXIS:
-    if( number == 0 )
-      do_axis( which, value, INPUT_JOYSTICK_LEFT, INPUT_JOYSTICK_RIGHT );
-    else if( number == 1 )
-      do_axis( which, value, INPUT_JOYSTICK_UP, INPUT_JOYSTICK_DOWN );
-    break;
-  case JOY_EVENTBUTTONDOWN:
-  case JOY_EVENTBUTTONUP:
-    if( number >= buttons[which] ) return;
-    event.types.joystick.which = which;
-    event.types.joystick.button = INPUT_JOYSTICK_FIRE_1 + number;
-    event.type = ( ev == JOY_EVENTBUTTONDOWN )
-               ? INPUT_EVENT_JOYSTICK_PRESS
-               : INPUT_EVENT_JOYSTICK_RELEASE;
-    input_event( &event );
-    break;
-  default:
-    break;
-  }
-}
-
-void
-ui_joystick_poll( void )
-{
-}
-
-#endif			/* #if !defined USE_JOYSTICK || defined HAVE_JSW_H */
diff --git a/ui/svga/svgakeyboard.c b/ui/svga/svgakeyboard.c
deleted file mode 100644
index 8da76fdc..00000000
--- a/ui/svga/svgakeyboard.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* svgakeyboard.c: svgalib routines for dealing with the keyboard
-   Copyright (c) 2000-2004 Philip Kendall, Matan Ziv-Av
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-   Author contact information:
-
-   E-mail: phi...@sh...
-
-*/
-
-#include "config.h"
-
-#include <stdio.h>
-
-#include <vga.h>
-#include <vgakeyboard.h>
-
-#include "display.h"
-#include "fuse.h"
-#include "keyboard.h"
-#include "machine.h"
-#include "settings.h"
-#include "snapshot.h"
-#include "spectrum.h"
-#include "tape.h"
-#include "ui/ui.h"
-#include "utils.h"
-
-static void svgakeyboard_keystroke(int scancode, int press);
-static int svgakeyboard_keypress( int keysym );
-static int svgakeyboard_keyrelease( int keysym );
-
-int svgakeyboard_init(void)
-{
-  keyboard_init();
-  keyboard_seteventhandler(svgakeyboard_keystroke);
-  return 0;
-}
-
-static void svgakeyboard_keystroke(int scancode, int press)  {
-  if(press) {
-    svgakeyboard_keypress(scancode);
-  } else {
-    svgakeyboard_keyrelease(scancode);
-  }
-}
-
-static int
-svgakeyboard_keypress( int keysym )
-{
-  input_key fuse_keysym;
-  input_event_t fuse_event;
-
-  fuse_keysym = keysyms_remap( keysym );
-
-  if( fuse_keysym == INPUT_KEY_NONE ) return 0;
-
-  fuse_event.type = INPUT_EVENT_KEYPRESS;
-  fuse_event.types.key.native_key = fuse_keysym;
-  fuse_event.types.key.spectrum_key = fuse_keysym;
-
-  return input_event( &fuse_event );
-}
-
-static int
-svgakeyboard_keyrelease( int keysym )
-{
-  input_key fuse_keysym;
-  input_event_t fuse_event;
-
-  fuse_keysym = keysyms_remap( keysym );
-
-  if( fuse_keysym == INPUT_KEY_NONE ) return 0;
-
-  fuse_event.type = INPUT_EVENT_KEYRELEASE;
-  fuse_event.types.key.native_key = fuse_keysym;
-  fuse_event.types.key.spectrum_key = fuse_keysym;
-
-  return input_event( &fuse_event );
-}
-
-int svgakeyboard_end(void)
-{
-  keyboard_close();
-  return 0;
-}
diff --git a/ui/svga/svgakeyboard.h b/ui/svga/svgakeyboard.h
deleted file mode 100644
index 834c1690..00000000
--- a/ui/svga/svgakeyboard.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* svgakeyboard.h: svgalib routines for dealing with the keyboard
-   Copyright (c) 2000-2002 Philip Kendall, Matan Ziv-Av
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-   Author contact information:
-
-   E-mail: phi...@sh...
-
-*/
-
-#ifndef FUSE_SVGAKEYBOARD_H
-#define FUSE_SVGAKEYBOARD_H
-
-int svgakeyboard_init(void);
-int svgakeyboard_end(void);
-
-#endif			/* #ifndef FUSE_SVGAKEYBOARD_H */
diff --git a/ui/svga/svgaui.c b/ui/svga/svgaui.c
deleted file mode 100644
index aebfd1e5..00000000
--- a/ui/svga/svgaui.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* svgaui.c: Routines for dealing with the svgalib user interface
-   Copyright (c) 2000-2003 Philip Kendall, Matan Ziv-Av, Russell Marks
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-   Author contact information:
-
-   E-mail: phi...@sh...
-
-*/
-
-#include "config.h"
-
-#include <stdio.h>
-
-#include <vga.h>
-
-#if defined USE_JOYSTICK && !defined HAVE_JSW_H
-#include <vgajoystick.h>
-#endif
-
-#include <vgakeyboard.h>
-#include <vgamouse.h>
-
-#include "display.h"
-#include "fuse.h"
-#include "svgadisplay.h"
-#include "svgakeyboard.h"
-#include "ui/ui.h"
-#include "ui/uidisplay.h"
-
-static int oldbutton = 0, oldx = 0, oldy = 0;
-
-int ui_init(int *argc, char ***argv)
-{
-  int error;
-
-  if( ui_widget_init() ) return 1;
-
-  error = svgadisplay_init();
-  if(error) return error;
-
-  error = svgakeyboard_init();
-  if(error) return error;
-
-  vga_setmousesupport( 1 );
-  mouse_setxrange( 0, 255);
-  mouse_setyrange( 0, 255);
-  mouse_setscale( 64 );
-  mouse_setwrap( MOUSE_WRAPX | MOUSE_WRAPY );
-  mouse_setposition( 128, 128 );
-
-  ui_mouse_present = 1;
-
-  return 0;
-}
-
-int
-ui_event( void )
-{
-  int x, y, b, bd;
-
-  keyboard_update();
-  mouse_update();
-#if defined USE_JOYSTICK && !defined HAVE_JSW_H
-  joystick_update();
-#endif
-
-  x = mouse_getx();
-  y = mouse_gety();
-  b = mouse_getbutton();
-
-  bd = b ^ oldbutton;
-  if( bd & MOUSE_LEFTBUTTON ) ui_mouse_button( 1, b & MOUSE_LEFTBUTTON );
-  if( bd & MOUSE_MIDDLEBUTTON ) ui_mouse_button( 2, b & MOUSE_MIDDLEBUTTON );
-  if( bd & MOUSE_RIGHTBUTTON ) ui_mouse_button( 3, b & MOUSE_RIGHTBUTTON );
-  oldbutton = b;
-
-  if( x != oldx || y != oldy ) {
-    ui_mouse_motion( x - oldx, y - oldy );
-    oldx = x; oldy = y;
-  }
-
-  return 0;
-}
-
-int ui_end(void)
-{
-  int error;
-
-  error = svgakeyboard_end();
-  if(error) return error;
-
-  error = svgadisplay_end();
-  if(error) return error;
-
-  ui_widget_end();
-
-  return 0;
-}
-
-int
-ui_mouse_grab( int startup GCC_UNUSED )
-{
-  return 1;
-}
-
-int
-ui_mouse_release( int suspend )
-{
-  return !suspend;
-}

[fuse-emulator-cvs] [fuse] branch master updated: Change libspectrum.h and config.h include style

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/a44a74e3a79eaeb090a30f65c3b22626227dbaa6/

The following commit(s) were added to refs/heads/master by this push:
     new a44a74e3 Change libspectrum.h and config.h include style
a44a74e3 is described below

commit a44a74e3a79eaeb090a30f65c3b22626227dbaa6
Author: Fredrick Meunier <fr...@sp...>
AuthorDate: Mon Mar 15 23:04:27 2021 +1100

    Change libspectrum.h and config.h include style
---
 compat/amiga/osname.c            | 2 +-
 compat/amiga/paths.c             | 2 +-
 compat/dirname.c                 | 2 +-
 compat/getopt.c                  | 2 +-
 compat/getopt1.c                 | 2 +-
 compat/linux/relative_paths.c    | 2 +-
 compat/morphos/osname.c          | 2 +-
 compat/unix/dir.c                | 2 +-
 compat/unix/file.c               | 2 +-
 compat/unix/osname.c             | 2 +-
 compat/unix/paths.c              | 2 +-
 compat/unix/relative_paths.c     | 2 +-
 compat/unix/socket.c             | 2 +-
 compat/unix/timer.c              | 2 +-
 compat/wii/dir.c                 | 2 +-
 compat/wii/osname.c              | 2 +-
 compat/wii/paths.c               | 2 +-
 compat/wii/timer.c               | 2 +-
 compat/win32/osname.c            | 2 +-
 compat/win32/paths.c             | 2 +-
 compat/win32/socket.c            | 2 +-
 compat/win32/timer.c             | 2 +-
 debugger/breakpoint.c            | 4 ++--
 debugger/command.c               | 2 +-
 debugger/commandl.l              | 2 +-
 debugger/commandy.y              | 2 +-
 debugger/debugger.c              | 2 +-
 debugger/debugger.h              | 2 +-
 debugger/disassemble.c           | 4 ++--
 debugger/event.c                 | 4 ++--
 debugger/expression.c            | 2 +-
 debugger/system_variable.c       | 4 ++--
 debugger/variable.c              | 4 ++--
 display.c                        | 2 +-
 display.h                        | 2 +-
 event.c                          | 4 ++--
 event.h                          | 2 +-
 fuse.c                           | 2 +-
 fuse.h                           | 2 +-
 infrastructure/startup_manager.c | 4 ++--
 input.c                          | 2 +-
 keyboard.c                       | 4 ++--
 keyboard.h                       | 2 +-
 keysyms.pl                       | 2 +-
 loader.c                         | 2 +-
 loader.h                         | 2 +-
 machine.c                        | 2 +-
 machine.h                        | 2 +-
 machines/machines.h              | 2 +-
 machines/machines_periph.c       | 2 +-
 machines/pentagon.c              | 4 ++--
 machines/pentagon.h              | 2 +-
 machines/pentagon1024.c          | 4 ++--
 machines/pentagon512.c           | 4 ++--
 machines/scorpion.c              | 4 ++--
 machines/spec128.c               | 4 ++--
 machines/spec128.h               | 2 +-
 machines/spec16.c                | 4 ++--
 machines/spec48.c                | 4 ++--
 machines/spec48.h                | 2 +-
 machines/spec48_ntsc.c           | 4 ++--
 machines/spec_se.c               | 4 ++--
 machines/specplus2.c             | 4 ++--
 machines/specplus2a.c            | 4 ++--
 machines/specplus3.c             | 4 ++--
 machines/specplus3.h             | 2 +-
 machines/specplus3e.c            | 2 +-
 machines/tc2048.c                | 4 ++--
 machines/tc2068.c                | 4 ++--
 machines/tc2068.h                | 2 +-
 machines/ts2068.c                | 4 ++--
 memory_pages.c                   | 4 ++--
 memory_pages.h                   | 2 +-
 mempool.c                        | 4 ++--
 menu.c                           | 4 ++--
 menu.h                           | 4 ++--
 menu_data.pl                     | 2 +-
 module.c                         | 4 ++--
 module.h                         | 2 +-
 movie.c                          | 4 ++--
 periph.c                         | 4 ++--
 periph.h                         | 2 +-
 peripherals/ay.c                 | 2 +-
 peripherals/ay.h                 | 2 +-
 peripherals/covox.c              | 4 ++--
 peripherals/covox.h              | 2 +-
 peripherals/dck.c                | 4 ++--
 peripherals/disk/beta.c          | 4 ++--
 peripherals/disk/beta.h          | 2 +-
 peripherals/disk/crc.c           | 4 ++--
 peripherals/disk/didaktik.c      | 4 ++--
 peripherals/disk/didaktik.h      | 2 +-
 peripherals/disk/disciple.c      | 4 ++--
 peripherals/disk/disciple.h      | 2 +-
 peripherals/disk/disk.c          | 4 ++--
 peripherals/disk/fdd.c           | 4 ++--
 peripherals/disk/opus.c          | 4 ++--
 peripherals/disk/opus.h          | 2 +-
 peripherals/disk/plusd.c         | 4 ++--
 peripherals/disk/plusd.h         | 2 +-
 peripherals/disk/trdos.c         | 2 +-
 peripherals/disk/trdos.h         | 2 +-
 peripherals/disk/upd_fdc.c       | 4 ++--
 peripherals/disk/upd_fdc.h       | 2 +-
 peripherals/disk/wd_fdc.c        | 4 ++--
 peripherals/disk/wd_fdc.h        | 2 +-
 peripherals/flash/am29f010.c     | 2 +-
 peripherals/flash/am29f010.h     | 2 +-
 peripherals/fuller.c             | 4 ++--
 peripherals/ide/divide.c         | 4 ++--
 peripherals/ide/divide.h         | 2 +-
 peripherals/ide/divmmc.c         | 4 ++--
 peripherals/ide/divmmc.h         | 2 +-
 peripherals/ide/divxxx.c         | 4 ++--
 peripherals/ide/divxxx.h         | 2 +-
 peripherals/ide/ide.c            | 4 ++--
 peripherals/ide/simpleide.c      | 4 ++--
 peripherals/ide/simpleide.h      | 2 +-
 peripherals/ide/zxatasp.c        | 4 ++--
 peripherals/ide/zxatasp.h        | 2 +-
 peripherals/ide/zxcf.c           | 4 ++--
 peripherals/ide/zxcf.h           | 2 +-
 peripherals/ide/zxmmc.c          | 4 ++--
 peripherals/ide/zxmmc.h          | 2 +-
 peripherals/if1.c                | 2 +-
 peripherals/if1.h                | 2 +-
 peripherals/if2.c                | 2 +-
 peripherals/if2.h                | 2 +-
 peripherals/joystick.c           | 4 ++--
 peripherals/joystick.h           | 2 +-
 peripherals/kempmouse.c          | 4 ++--
 peripherals/melodik.c            | 4 ++--
 peripherals/multiface.c          | 2 +-
 peripherals/nic/enc28j60.c       | 2 +-
 peripherals/nic/w5100.c          | 2 +-
 peripherals/nic/w5100.h          | 2 +-
 peripherals/nic/w5100_socket.c   | 2 +-
 peripherals/printer.c            | 2 +-
 peripherals/printer.h            | 2 +-
 peripherals/scld.c               | 2 +-
 peripherals/speccyboot.c         | 2 +-
 peripherals/specdrum.c           | 4 ++--
 peripherals/specdrum.h           | 2 +-
 peripherals/spectranet.c         | 2 +-
 peripherals/ttx2000s.c           | 4 ++--
 peripherals/ula.c                | 4 ++--
 peripherals/usource.c            | 4 ++--
 phantom_typist.c                 | 4 ++--
 pokefinder/pokefinder.c          | 4 ++--
 pokefinder/pokefinder.h          | 2 +-
 pokefinder/pokemem.c             | 2 +-
 pokefinder/pokemem.h             | 4 ++--
 profile.c                        | 4 ++--
 psg.c                            | 2 +-
 psg.h                            | 2 +-
 rectangle.c                      | 2 +-
 rzx.c                            | 2 +-
 rzx.h                            | 2 +-
 screenshot.c                     | 4 ++--
 settings.pl                      | 2 +-
 slt.c                            | 4 ++--
 slt.h                            | 2 +-
 snapshot.c                       | 4 ++--
 snapshot.h                       | 2 +-
 sound.c                          | 2 +-
 sound.h                          | 2 +-
 sound/alsasound.c                | 2 +-
 sound/aosound.c                  | 2 +-
 sound/blipbuffer.c               | 2 +-
 sound/coreaudiosound.c           | 2 +-
 sound/dxsound.c                  | 2 +-
 sound/hpsound.c                  | 2 +-
 sound/nullsound.c                | 2 +-
 sound/osssound.c                 | 2 +-
 sound/pulsesound.c               | 4 ++--
 sound/sdlsound.c                 | 2 +-
 sound/sfifo.c                    | 2 +-
 sound/sunsound.c                 | 2 +-
 sound/wiisound.c                 | 2 +-
 sound/win32sound.c               | 2 +-
 spectrum.c                       | 4 ++--
 spectrum.h                       | 2 +-
 svg.c                            | 2 +-
 tape.c                           | 4 ++--
 tape.h                           | 2 +-
 timer/native.c                   | 2 +-
 timer/sdl.c                      | 2 +-
 timer/timer.c                    | 2 +-
 timer/timer.h                    | 2 +-
 ui.c                             | 4 ++--
 ui/fb/fbdisplay.c                | 2 +-
 ui/fb/fbjoystick.c               | 2 +-
 ui/fb/fbkeyboard.c               | 2 +-
 ui/fb/fbmouse.c                  | 2 +-
 ui/fb/fbui.c                     | 2 +-
 ui/gtk/binary.c                  | 4 ++--
 ui/gtk/browse.c                  | 2 +-
 ui/gtk/confirm.c                 | 2 +-
 ui/gtk/debugger.c                | 4 ++--
 ui/gtk/fileselector.c            | 2 +-
 ui/gtk/gtkcompat.c               | 2 +-
 ui/gtk/gtkdisplay.c              | 2 +-
 ui/gtk/gtkinternals.h            | 2 +-
 ui/gtk/gtkjoystick.c             | 2 +-
 ui/gtk/gtkkeyboard.c             | 2 +-
 ui/gtk/gtkmouse.c                | 2 +-
 ui/gtk/gtkui.c                   | 4 ++--
 ui/gtk/memory.c                  | 2 +-
 ui/gtk/memory_gtk2.c             | 2 +-
 ui/gtk/options.pl                | 2 +-
 ui/gtk/picture.c                 | 2 +-
 ui/gtk/pixmaps.c                 | 2 +-
 ui/gtk/pokefinder.c              | 2 +-
 ui/gtk/pokemem.c                 | 2 +-
 ui/gtk/rollback.c                | 2 +-
 ui/gtk/roms.c                    | 2 +-
 ui/gtk/statusbar.c               | 2 +-
 ui/gtk/stock.c                   | 2 +-
 ui/null/null_ui.c                | 2 +-
 ui/null/options.pl               | 2 +-
 ui/scaler/scaler.c               | 4 ++--
 ui/scaler/scaler.h               | 2 +-
 ui/scaler/scalers.c              | 4 ++--
 ui/sdl/sdldisplay.c              | 4 ++--
 ui/sdl/sdljoystick.c             | 2 +-
 ui/sdl/sdlkeyboard.c             | 2 +-
 ui/sdl/sdlui.c                   | 2 +-
 ui/svga/svgadisplay.c            | 2 +-
 ui/svga/svgajoystick.c           | 4 ++--
 ui/svga/svgakeyboard.c           | 2 +-
 ui/svga/svgaui.c                 | 2 +-
 ui/ui.h                          | 2 +-
 ui/uidisplay.h                   | 2 +-
 ui/uijoystick.c                  | 4 ++--
 ui/widget/about.c                | 2 +-
 ui/widget/binary.c               | 2 +-
 ui/widget/browse.c               | 4 ++--
 ui/widget/debugger.c             | 4 ++--
 ui/widget/error.c                | 2 +-
 ui/widget/filesel.c              | 2 +-
 ui/widget/memory.c               | 2 +-
 ui/widget/menu.c                 | 2 +-
 ui/widget/options.pl             | 2 +-
 ui/widget/picture.c              | 2 +-
 ui/widget/pokefinder.c           | 2 +-
 ui/widget/pokemem.c              | 2 +-
 ui/widget/query.c                | 2 +-
 ui/widget/roms.c                 | 2 +-
 ui/widget/select.c               | 2 +-
 ui/widget/text.c                 | 2 +-
 ui/widget/widget.c               | 2 +-
 ui/widget/widget_internals.h     | 2 +-
 ui/wii/wiidisplay.c              | 2 +-
 ui/wii/wiijoystick.c             | 2 +-
 ui/wii/wiikeyboard.c             | 2 +-
 ui/wii/wiimouse.c                | 2 +-
 ui/wii/wiiui.c                   | 2 +-
 ui/win32/about.c                 | 2 +-
 ui/win32/binary.c                | 4 ++--
 ui/win32/browse.c                | 4 ++--
 ui/win32/confirm.c               | 2 +-
 ui/win32/debugger.c              | 4 ++--
 ui/win32/fileselector.c          | 2 +-
 ui/win32/memorybrowser.c         | 4 ++--
 ui/win32/options.pl              | 4 ++--
 ui/win32/picture.c               | 2 +-
 ui/win32/pokefinder.c            | 2 +-
 ui/win32/pokemem.c               | 2 +-
 ui/win32/rollback.c              | 2 +-
 ui/win32/roms.c                  | 2 +-
 ui/win32/statusbar.c             | 2 +-
 ui/win32/win32display.c          | 2 +-
 ui/win32/win32internals.h        | 2 +-
 ui/win32/win32joystick.c         | 2 +-
 ui/win32/win32keyboard.c         | 4 ++--
 ui/win32/win32mouse.c            | 2 +-
 ui/win32/win32ui.c               | 2 +-
 ui/xlib/xdisplay.c               | 4 ++--
 ui/xlib/xerror.c                 | 2 +-
 ui/xlib/xjoystick.c              | 2 +-
 ui/xlib/xkeyboard.c              | 2 +-
 ui/xlib/xui.c                    | 2 +-
 uidisplay.c                      | 4 ++--
 uimedia.c                        | 2 +-
 unittests/unittests.c            | 4 ++--
 utils.c                          | 4 ++--
 utils.h                          | 2 +-
 windres.rc                       | 2 +-
 z80/coretest.c                   | 2 +-
 z80/z80.c                        | 4 ++--
 z80/z80_debugger_variables.c     | 4 ++--
 z80/z80_ops.c                    | 2 +-
 292 files changed, 383 insertions(+), 383 deletions(-)

diff --git a/compat/amiga/osname.c b/compat/amiga/osname.c
index 61df98ee..aa3aebc9 100644
--- a/compat/amiga/osname.c
+++ b/compat/amiga/osname.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/compat/amiga/paths.c b/compat/amiga/paths.c
index b9817236..2e012ce5 100644
--- a/compat/amiga/paths.c
+++ b/compat/amiga/paths.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #ifdef HAVE_LIBGEN_H
diff --git a/compat/dirname.c b/compat/dirname.c
index 570d718c..98e7376d 100644
--- a/compat/dirname.c
+++ b/compat/dirname.c
@@ -24,7 +24,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
diff --git a/compat/getopt.c b/compat/getopt.c
index 36fbea2d..05aa3a9a 100644
--- a/compat/getopt.c
+++ b/compat/getopt.c
@@ -31,7 +31,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
 #if !defined __STDC__ || !__STDC__
diff --git a/compat/getopt1.c b/compat/getopt1.c
index 40b3cb21..da95cccf 100644
--- a/compat/getopt1.c
+++ b/compat/getopt1.c
@@ -21,7 +21,7 @@
    02110-1301 USA.  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #ifdef _LIBC
diff --git a/compat/linux/relative_paths.c b/compat/linux/relative_paths.c
index bbdbc042..d1f98363 100644
--- a/compat/linux/relative_paths.c
+++ b/compat/linux/relative_paths.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <string.h>
diff --git a/compat/morphos/osname.c b/compat/morphos/osname.c
index 1cd0f1c7..d00ee886 100644
--- a/compat/morphos/osname.c
+++ b/compat/morphos/osname.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/compat/unix/dir.c b/compat/unix/dir.c
index 7064313d..aae932ba 100644
--- a/compat/unix/dir.c
+++ b/compat/unix/dir.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <string.h>
diff --git a/compat/unix/file.c b/compat/unix/file.c
index f7e9ff23..d81120cf 100644
--- a/compat/unix/file.c
+++ b/compat/unix/file.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/compat/unix/osname.c b/compat/unix/osname.c
index eb5c65fa..febd3c5c 100644
--- a/compat/unix/osname.c
+++ b/compat/unix/osname.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/compat/unix/paths.c b/compat/unix/paths.c
index a3c89a1c..b776ec4c 100644
--- a/compat/unix/paths.c
+++ b/compat/unix/paths.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_LIBGEN_H
 #include <libgen.h>
diff --git a/compat/unix/relative_paths.c b/compat/unix/relative_paths.c
index b6263f88..b63c55d8 100644
--- a/compat/unix/relative_paths.c
+++ b/compat/unix/relative_paths.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <string.h>
diff --git a/compat/unix/socket.c b/compat/unix/socket.c
index 9f00af7f..f182a0d5 100644
--- a/compat/unix/socket.c
+++ b/compat/unix/socket.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <string.h>
diff --git a/compat/unix/timer.c b/compat/unix/timer.c
index 95a0d6f0..ec5afbca 100644
--- a/compat/unix/timer.c
+++ b/compat/unix/timer.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <string.h>
diff --git a/compat/wii/dir.c b/compat/wii/dir.c
index 7876019c..709c5b29 100644
--- a/compat/wii/dir.c
+++ b/compat/wii/dir.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include "compat.h"
 
diff --git a/compat/wii/osname.c b/compat/wii/osname.c
index ca9e446f..0e1931e0 100644
--- a/compat/wii/osname.c
+++ b/compat/wii/osname.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/compat/wii/paths.c b/compat/wii/paths.c
index ae888f2e..1e0193a2 100644
--- a/compat/wii/paths.c
+++ b/compat/wii/paths.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #ifdef HAVE_LIBGEN_H
diff --git a/compat/wii/timer.c b/compat/wii/timer.c
index 842ebb40..bef5018d 100644
--- a/compat/wii/timer.c
+++ b/compat/wii/timer.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <string.h>
diff --git a/compat/win32/osname.c b/compat/win32/osname.c
index 1379a5c6..67526891 100644
--- a/compat/win32/osname.c
+++ b/compat/win32/osname.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/compat/win32/paths.c b/compat/win32/paths.c
index 4ccc0ae1..88c697d4 100644
--- a/compat/win32/paths.c
+++ b/compat/win32/paths.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_LIBGEN_H
 #include <libgen.h>
diff --git a/compat/win32/socket.c b/compat/win32/socket.c
index 961e6771..013cc82d 100644
--- a/compat/win32/socket.c
+++ b/compat/win32/socket.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <winsock2.h>
 #include <ws2tcpip.h>
diff --git a/compat/win32/timer.c b/compat/win32/timer.c
index 3099f570..66c988ee 100644
--- a/compat/win32/timer.c
+++ b/compat/win32/timer.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/debugger/breakpoint.c b/debugger/breakpoint.c
index c7580af2..73df22e8 100644
--- a/debugger/breakpoint.c
+++ b/debugger/breakpoint.c
@@ -24,12 +24,12 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <ctype.h>
 #include <string.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "debugger_internals.h"
 #include "event.h"
diff --git a/debugger/command.c b/debugger/command.c
index 3bfb20a7..80c61ec7 100644
--- a/debugger/command.c
+++ b/debugger/command.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/debugger/commandl.l b/debugger/commandl.l
index 2bad0c76..02ee0427 100644
--- a/debugger/commandl.l
+++ b/debugger/commandl.l
@@ -23,7 +23,7 @@
 
 %{
 
-#include <config.h>
+#include "config.h"
 
 #include <ctype.h>
 
diff --git a/debugger/commandy.y b/debugger/commandy.y
index 212425d4..8bedf0cb 100644
--- a/debugger/commandy.y
+++ b/debugger/commandy.y
@@ -24,7 +24,7 @@
 
 %{
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>		/* Needed by NetBSD yacc */
 #include <stdlib.h>
diff --git a/debugger/debugger.c b/debugger/debugger.c
index cf5a661e..1b9b1234 100644
--- a/debugger/debugger.c
+++ b/debugger/debugger.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include "debugger.h"
 #include "debugger_internals.h"
diff --git a/debugger/debugger.h b/debugger/debugger.h
index 4257fe50..13422f66 100644
--- a/debugger/debugger.h
+++ b/debugger/debugger.h
@@ -30,7 +30,7 @@
 #include <glib.h>
 #endif				/* #ifdef HAVE_LIB_GLIB */
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "breakpoint.h"
 
diff --git a/debugger/disassemble.c b/debugger/disassemble.c
index 5d69af7d..d0d60159 100644
--- a/debugger/disassemble.c
+++ b/debugger/disassemble.c
@@ -24,12 +24,12 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "debugger.h"
 #include "fuse.h"
diff --git a/debugger/event.c b/debugger/event.c
index 39b8a82c..153dae17 100644
--- a/debugger/event.c
+++ b/debugger/event.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 #ifdef HAVE_STRINGS_STRCASECMP
@@ -33,7 +33,7 @@
 #include <glib.h>
 #endif				/* #ifdef HAVE_LIB_GLIB */
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "debugger_internals.h"
 #include "fuse.h"
diff --git a/debugger/expression.c b/debugger/expression.c
index b13fa4bb..08a94230 100644
--- a/debugger/expression.c
+++ b/debugger/expression.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/debugger/system_variable.c b/debugger/system_variable.c
index 8210e8a0..314b180f 100644
--- a/debugger/system_variable.c
+++ b/debugger/system_variable.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 #ifdef HAVE_STRINGS_STRCASECMP
@@ -32,7 +32,7 @@
 #include <glib.h>
 #endif				/* #ifdef HAVE_LIB_GLIB */
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "debugger_internals.h"
 #include "fuse.h"
diff --git a/debugger/variable.c b/debugger/variable.c
index 2937e762..b440d14b 100644
--- a/debugger/variable.c
+++ b/debugger/variable.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
@@ -30,7 +30,7 @@
 #include <glib.h>
 #endif				/* #ifdef HAVE_LIB_GLIB */
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "debugger_internals.h"
 #include "ui/ui.h"
diff --git a/display.c b/display.c
index 12d01bd8..00c36390 100644
--- a/display.c
+++ b/display.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <assert.h>
 #include <stddef.h>
diff --git a/display.h b/display.h
index f7e4dbe5..2353607b 100644
--- a/display.h
+++ b/display.h
@@ -26,7 +26,7 @@
 
 #include <stddef.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 /* The width and height of the Speccy's screen */
 #define DISPLAY_WIDTH_COLS  32
diff --git a/event.c b/event.c
index 1b53f10b..cd0fc245 100644
--- a/event.c
+++ b/event.c
@@ -21,11 +21,11 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "event.h"
 #include "infrastructure/startup_manager.h"
diff --git a/event.h b/event.h
index b8e59747..7a5d3a34 100644
--- a/event.h
+++ b/event.h
@@ -28,7 +28,7 @@
 #include <glib.h>
 #endif				/* #ifdef HAVE_LIB_GLIB */
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 /* Information about an event */
 typedef struct event_t {
diff --git a/fuse.c b/fuse.c
index e126b6c4..8ecfb260 100644
--- a/fuse.c
+++ b/fuse.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <limits.h>
diff --git a/fuse.h b/fuse.h
index 820d2e80..298c3e8e 100644
--- a/fuse.h
+++ b/fuse.h
@@ -26,7 +26,7 @@
 
 #include <limits.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 
diff --git a/infrastructure/startup_manager.c b/infrastructure/startup_manager.c
index 1ba65aad..a5ee762c 100644
--- a/infrastructure/startup_manager.c
+++ b/infrastructure/startup_manager.c
@@ -21,13 +21,13 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_LIB_GLIB
 #include <glib.h>
 #endif				/* #ifdef HAVE_LIB_GLIB */
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "startup_manager.h"
 #include "ui/ui.h"
diff --git a/input.c b/input.c
index e8c4528e..82980511 100644
--- a/input.c
+++ b/input.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include "fuse.h"
 #include "input.h"
diff --git a/keyboard.c b/keyboard.c
index 50926b4d..104daee4 100644
--- a/keyboard.c
+++ b/keyboard.c
@@ -21,13 +21,13 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_LIB_GLIB
 #include <glib.h>
 #endif				/* #ifdef HAVE_LIB_GLIB */
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "infrastructure/startup_manager.h"
 #include "keyboard.h"
diff --git a/keyboard.h b/keyboard.h
index 50b2d3b1..bddc789c 100644
--- a/keyboard.h
+++ b/keyboard.h
@@ -24,7 +24,7 @@
 #ifndef FUSE_KEYBOARD_H
 #define FUSE_KEYBOARD_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "input.h"
 
diff --git a/keysyms.pl b/keysyms.pl
index 169ddff7..8acf5422 100755
--- a/keysyms.pl
+++ b/keysyms.pl
@@ -326,7 +326,7 @@ print Fuse::GPL(
 /* This file is autogenerated from keysyms.dat by keysyms.pl.
    Do not edit unless you know what you're doing! */
 
-#include <config.h>
+#include "config.h"
 
 CODE
 
diff --git a/loader.c b/loader.c
index 7159bbe6..7cfd8069 100644
--- a/loader.c
+++ b/loader.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include "event.h"
 #include "loader.h"
diff --git a/loader.h b/loader.h
index e73467ab..9d207c7f 100644
--- a/loader.h
+++ b/loader.h
@@ -24,7 +24,7 @@
 #ifndef FUSE_LOADER_H
 #define FUSE_LOADER_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 void loader_frame( libspectrum_dword frame_length );
 void loader_tape_play( void );
diff --git a/machine.c b/machine.c
index 9cebc32e..1a33176b 100644
--- a/machine.c
+++ b/machine.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/machine.h b/machine.h
index 002b938a..1afd4d4f 100644
--- a/machine.h
+++ b/machine.h
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "display.h"
 #include "peripherals/ay.h"
diff --git a/machines/machines.h b/machines/machines.h
index 1c7e30a3..957744f1 100644
--- a/machines/machines.h
+++ b/machines/machines.h
@@ -24,7 +24,7 @@
 #ifndef FUSE_MACHINES_H
 #define FUSE_MACHINES_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "machine.h"
 
diff --git a/machines/machines_periph.c b/machines/machines_periph.c
index 5e032dae..d84d1bcd 100644
--- a/machines/machines_periph.c
+++ b/machines/machines_periph.c
@@ -23,7 +23,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include "fuse.h"
 #include "infrastructure/startup_manager.h"
diff --git a/machines/pentagon.c b/machines/pentagon.c
index 545a7c7a..5994629e 100644
--- a/machines/pentagon.c
+++ b/machines/pentagon.c
@@ -24,9 +24,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "machine.h"
diff --git a/machines/pentagon.h b/machines/pentagon.h
index 5847e92d..da84aaee 100644
--- a/machines/pentagon.h
+++ b/machines/pentagon.h
@@ -25,7 +25,7 @@
 #ifndef FUSE_PENTAGON_H
 #define FUSE_PENTAGON_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "machine.h"
 
diff --git a/machines/pentagon1024.c b/machines/pentagon1024.c
index 9254f1eb..cf71879f 100644
--- a/machines/pentagon1024.c
+++ b/machines/pentagon1024.c
@@ -22,9 +22,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "machine.h"
diff --git a/machines/pentagon512.c b/machines/pentagon512.c
index 8f80f148..75f56c1c 100644
--- a/machines/pentagon512.c
+++ b/machines/pentagon512.c
@@ -26,9 +26,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "machine.h"
diff --git a/machines/scorpion.c b/machines/scorpion.c
index 657bff6b..df3320c6 100644
--- a/machines/scorpion.c
+++ b/machines/scorpion.c
@@ -21,12 +21,12 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <unistd.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "machine.h"
diff --git a/machines/spec128.c b/machines/spec128.c
index 42769889..fe5aaf36 100644
--- a/machines/spec128.c
+++ b/machines/spec128.c
@@ -21,11 +21,11 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "machine.h"
diff --git a/machines/spec128.h b/machines/spec128.h
index 2d317bfd..d076a495 100644
--- a/machines/spec128.h
+++ b/machines/spec128.h
@@ -24,7 +24,7 @@
 #ifndef FUSE_SPEC128_H
 #define FUSE_SPEC128_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "machine.h"
 
diff --git a/machines/spec16.c b/machines/spec16.c
index 723f8d17..ef7b108a 100644
--- a/machines/spec16.c
+++ b/machines/spec16.c
@@ -22,12 +22,12 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "machine.h"
 #include "machines.h"
diff --git a/machines/spec48.c b/machines/spec48.c
index dee76a94..48cf141b 100644
--- a/machines/spec48.c
+++ b/machines/spec48.c
@@ -21,11 +21,11 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "machine.h"
 #include "machines_periph.h"
diff --git a/machines/spec48.h b/machines/spec48.h
index 362a6cf6..2371b89d 100644
--- a/machines/spec48.h
+++ b/machines/spec48.h
@@ -24,7 +24,7 @@
 #ifndef FUSE_SPEC48_H
 #define FUSE_SPEC48_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "machine.h"
 
diff --git a/machines/spec48_ntsc.c b/machines/spec48_ntsc.c
index f5a37992..720ad22d 100644
--- a/machines/spec48_ntsc.c
+++ b/machines/spec48_ntsc.c
@@ -21,11 +21,11 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "machine.h"
 #include "machines.h"
diff --git a/machines/spec_se.c b/machines/spec_se.c
index 8b8b09a1..afbff55e 100644
--- a/machines/spec_se.c
+++ b/machines/spec_se.c
@@ -21,12 +21,12 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "fuse.h"
 #include "keyboard.h"
diff --git a/machines/specplus2.c b/machines/specplus2.c
index 29f70470..d4b0ea71 100644
--- a/machines/specplus2.c
+++ b/machines/specplus2.c
@@ -21,11 +21,11 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "machine.h"
 #include "machines_periph.h"
diff --git a/machines/specplus2a.c b/machines/specplus2a.c
index 3eaae428..f92d697c 100644
--- a/machines/specplus2a.c
+++ b/machines/specplus2a.c
@@ -21,9 +21,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "machine.h"
 #include "machines.h"
diff --git a/machines/specplus3.c b/machines/specplus3.c
index a857e3e4..9b7febc9 100644
--- a/machines/specplus3.c
+++ b/machines/specplus3.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "fuse.h"
diff --git a/machines/specplus3.h b/machines/specplus3.h
index b09f84f0..45b8bef3 100644
--- a/machines/specplus3.h
+++ b/machines/specplus3.h
@@ -25,7 +25,7 @@
 #ifndef FUSE_SPECPLUS3_H
 #define FUSE_SPECPLUS3_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "machine.h"
 #include "periph.h"
diff --git a/machines/specplus3e.c b/machines/specplus3e.c
index da601079..1825da09 100644
--- a/machines/specplus3e.c
+++ b/machines/specplus3e.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include "machines.h"
 #include "machines_periph.h"
diff --git a/machines/tc2048.c b/machines/tc2048.c
index cbf6f32c..fdcbbcd9 100644
--- a/machines/tc2048.c
+++ b/machines/tc2048.c
@@ -21,11 +21,11 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "machine.h"
 #include "machines.h"
diff --git a/machines/tc2068.c b/machines/tc2068.c
index a023b6de..e36127b2 100644
--- a/machines/tc2068.c
+++ b/machines/tc2068.c
@@ -24,11 +24,11 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "machine.h"
 #include "machines.h"
diff --git a/machines/tc2068.h b/machines/tc2068.h
index 581af9be..41db8f47 100644
--- a/machines/tc2068.h
+++ b/machines/tc2068.h
@@ -25,7 +25,7 @@
 #ifndef FUSE_TS2068_H
 #define FUSE_TS2068_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "machine.h"
 
diff --git a/machines/ts2068.c b/machines/ts2068.c
index 4a7b2fb8..94eb295b 100644
--- a/machines/ts2068.c
+++ b/machines/ts2068.c
@@ -22,11 +22,11 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "machine.h"
 #include "machines.h"
diff --git a/memory_pages.c b/memory_pages.c
index f314e774..ddc79a32 100644
--- a/memory_pages.c
+++ b/memory_pages.c
@@ -23,14 +23,14 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 #ifdef HAVE_STRINGS_STRCASECMP
 #include <strings.h>
 #endif      /* #ifdef HAVE_STRINGS_STRCASECMP */
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "debugger/debugger.h"
 #include "display.h"
diff --git a/memory_pages.h b/memory_pages.h
index c2e073b5..acb52d81 100644
--- a/memory_pages.h
+++ b/memory_pages.h
@@ -25,7 +25,7 @@
 #ifndef FUSE_MEMORY_PAGES_H
 #define FUSE_MEMORY_PAGES_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 /* Register a new memory source */
 int memory_source_register( const char *description );
diff --git a/mempool.c b/mempool.c
index c8c91a4c..38d9396c 100644
--- a/mempool.c
+++ b/mempool.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
@@ -29,7 +29,7 @@
 #include <glib.h>
 #endif				/* #ifdef HAVE_LIB_GLIB */
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "fuse.h"
 #include "infrastructure/startup_manager.h"
diff --git a/menu.c b/menu.c
index 22a6fd95..7168ed3b 100644
--- a/menu.c
+++ b/menu.c
@@ -21,9 +21,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "event.h"
 #include "fuse.h"
diff --git a/menu.h b/menu.h
index c250e888..cb14156f 100644
--- a/menu.h
+++ b/menu.h
@@ -24,9 +24,9 @@
 #ifndef FUSE_MENU_H
 #define FUSE_MENU_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
-#include <config.h>
+#include "config.h"
 
 #include "ui/scaler/scaler.h"
 
diff --git a/menu_data.pl b/menu_data.pl
index f73b36ef..b5079156 100755
--- a/menu_data.pl
+++ b/menu_data.pl
@@ -63,7 +63,7 @@ print Fuse::GPL( $filename . ': menu structure for Fuse',
 /* This file is autogenerated from menu_data.dat by $0.
    Any changes made here will not be preserved. */
 
-#include <config.h>
+#include "config.h"
 
 #include "menu.h"
 
diff --git a/module.c b/module.c
index b8697c60..6a80a7df 100644
--- a/module.c
+++ b/module.c
@@ -21,13 +21,13 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_LIB_GLIB
 #include <glib.h>
 #endif				/* #ifdef HAVE_LIB_GLIB */
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "module.h"
diff --git a/module.h b/module.h
index 2f4c9adf..f12d6319 100644
--- a/module.h
+++ b/module.h
@@ -24,7 +24,7 @@
 #ifndef FUSE_MODULE_H
 #define FUSE_MODULE_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 typedef void (*module_reset_fn)( int hard_reset );
 typedef void (*module_romcs_fn)( void );
diff --git a/movie.c b/movie.c
index 5bc9f618..5c41f44d 100644
--- a/movie.c
+++ b/movie.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <stdio.h>
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 #ifdef HAVE_ZLIB_H
 #define ZLIB_CONST
 #include <zlib.h>
diff --git a/periph.c b/periph.c
index 87bfae4a..cf68f8e5 100644
--- a/periph.c
+++ b/periph.c
@@ -22,9 +22,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "debugger/debugger.h"
 #include "event.h"
diff --git a/periph.h b/periph.h
index 31b6371d..8f82fa28 100644
--- a/periph.h
+++ b/periph.h
@@ -25,7 +25,7 @@
 #ifndef FUSE_PERIPH_H
 #define FUSE_PERIPH_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 /* The types of peripheral Fuse knows about */
 typedef enum periph_type {
diff --git a/peripherals/ay.c b/peripherals/ay.c
index b55b896e..7253ed63 100644
--- a/peripherals/ay.c
+++ b/peripherals/ay.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
diff --git a/peripherals/ay.h b/peripherals/ay.h
index e9a0a913..666f87a6 100644
--- a/peripherals/ay.h
+++ b/peripherals/ay.h
@@ -25,7 +25,7 @@
 #ifndef FUSE_AY_H
 #define FUSE_AY_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #define AY_REGISTERS 16
 
diff --git a/peripherals/covox.c b/peripherals/covox.c
index 4e4bfbeb..b5e8e81b 100644
--- a/peripherals/covox.c
+++ b/peripherals/covox.c
@@ -25,9 +25,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "infrastructure/startup_manager.h"
diff --git a/peripherals/covox.h b/peripherals/covox.h
index 5118deec..dfba3a05 100644
--- a/peripherals/covox.h
+++ b/peripherals/covox.h
@@ -26,7 +26,7 @@
 #ifndef FUSE_COVOX_H
 #define FUSE_COVOX_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 typedef struct covox_info {
   libspectrum_byte covox_dac; /* Current byte in the Covox 8bit DAC */
diff --git a/peripherals/dck.c b/peripherals/dck.c
index 63eca474..0a31c2fc 100644
--- a/peripherals/dck.c
+++ b/peripherals/dck.c
@@ -26,13 +26,13 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "dck.h"
 #include "machine.h"
diff --git a/peripherals/disk/beta.c b/peripherals/disk/beta.c
index cc1b72be..9d67358c 100644
--- a/peripherals/disk/beta.c
+++ b/peripherals/disk/beta.c
@@ -23,7 +23,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <stdlib.h>
@@ -37,7 +37,7 @@
 #include <limits.h>
 #include <sys/stat.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "beta.h"
 #include "compat.h"
diff --git a/peripherals/disk/beta.h b/peripherals/disk/beta.h
index 92e52a7b..0005ba47 100644
--- a/peripherals/disk/beta.h
+++ b/peripherals/disk/beta.h
@@ -27,7 +27,7 @@
 #ifndef FUSE_BETA_H
 #define FUSE_BETA_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "memory_pages.h"
 #include "fdd.h"
diff --git a/peripherals/disk/crc.c b/peripherals/disk/crc.c
index 51bd257c..6b9a1c6e 100644
--- a/peripherals/disk/crc.c
+++ b/peripherals/disk/crc.c
@@ -21,9 +21,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "crc.h"
 
diff --git a/peripherals/disk/didaktik.c b/peripherals/disk/didaktik.c
index 2b6129a6..00e04680 100644
--- a/peripherals/disk/didaktik.c
+++ b/peripherals/disk/didaktik.c
@@ -24,9 +24,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include <string.h>
 
diff --git a/peripherals/disk/didaktik.h b/peripherals/disk/didaktik.h
index f04ac19e..c4a53ec7 100644
--- a/peripherals/disk/didaktik.h
+++ b/peripherals/disk/didaktik.h
@@ -24,7 +24,7 @@
 #ifndef FUSE_DIDAKTIK80_H
 #define FUSE_DIDAKTIK80_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "fdd.h"
 
diff --git a/peripherals/disk/disciple.c b/peripherals/disk/disciple.c
index 32fb1b52..a52f3a32 100644
--- a/peripherals/disk/disciple.c
+++ b/peripherals/disk/disciple.c
@@ -24,9 +24,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include <string.h>
 
diff --git a/peripherals/disk/disciple.h b/peripherals/disk/disciple.h
index 6d010434..fb84ad9c 100644
--- a/peripherals/disk/disciple.h
+++ b/peripherals/disk/disciple.h
@@ -32,7 +32,7 @@ typedef enum disciple_drive_number {
   DISCIPLE_NUM_DRIVES,
 } disciple_drive_number;
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "fdd.h"
 
diff --git a/peripherals/disk/disk.c b/peripherals/disk/disk.c
index 46b65dbc..7d0b9f41 100644
--- a/peripherals/disk/disk.c
+++ b/peripherals/disk/disk.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 #ifdef HAVE_STRINGS_STRCASECMP
@@ -31,7 +31,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "bitmap.h"
 #include "crc.h"
diff --git a/peripherals/disk/fdd.c b/peripherals/disk/fdd.c
index 659ffb09..c15c1885 100644
--- a/peripherals/disk/fdd.c
+++ b/peripherals/disk/fdd.c
@@ -23,9 +23,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "bitmap.h"
 #include "compat.h"
diff --git a/peripherals/disk/opus.c b/peripherals/disk/opus.c
index 7b928eba..6bdd2708 100644
--- a/peripherals/disk/opus.c
+++ b/peripherals/disk/opus.c
@@ -24,9 +24,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include <string.h>
 
diff --git a/peripherals/disk/opus.h b/peripherals/disk/opus.h
index bca042ea..e195635c 100644
--- a/peripherals/disk/opus.h
+++ b/peripherals/disk/opus.h
@@ -26,7 +26,7 @@
 #ifndef FUSE_OPUS_H
 #define FUSE_OPUS_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "fdd.h"
 
diff --git a/peripherals/disk/plusd.c b/peripherals/disk/plusd.c
index f31311e1..b5645b8c 100644
--- a/peripherals/disk/plusd.c
+++ b/peripherals/disk/plusd.c
@@ -24,9 +24,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include <string.h>
 
diff --git a/peripherals/disk/plusd.h b/peripherals/disk/plusd.h
index 0721f774..a0cdb36f 100644
--- a/peripherals/disk/plusd.h
+++ b/peripherals/disk/plusd.h
@@ -32,7 +32,7 @@ typedef enum plusd_drive_number {
   PLUSD_NUM_DRIVES,
 } plusd_drive_number;
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "fdd.h"
 
diff --git a/peripherals/disk/trdos.c b/peripherals/disk/trdos.c
index 767d2837..dad89caa 100644
--- a/peripherals/disk/trdos.c
+++ b/peripherals/disk/trdos.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 #include "trdos.h"
diff --git a/peripherals/disk/trdos.h b/peripherals/disk/trdos.h
index e6a0e889..79adcc89 100644
--- a/peripherals/disk/trdos.h
+++ b/peripherals/disk/trdos.h
@@ -24,7 +24,7 @@
 #ifndef FUSE_TRDOS_H
 #define FUSE_TRDOS_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 typedef struct trdos_spec_t {
   libspectrum_byte first_free_sector; /* 0 to 15 */
diff --git a/peripherals/disk/upd_fdc.c b/peripherals/disk/upd_fdc.c
index 2a17673e..b1263e4d 100644
--- a/peripherals/disk/upd_fdc.c
+++ b/peripherals/disk/upd_fdc.c
@@ -20,9 +20,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "crc.h"
 #include "event.h"
diff --git a/peripherals/disk/upd_fdc.h b/peripherals/disk/upd_fdc.h
index 400920ea..cffcf9d2 100644
--- a/peripherals/disk/upd_fdc.h
+++ b/peripherals/disk/upd_fdc.h
@@ -27,7 +27,7 @@
 #ifndef FUSE_UPD_FDC_H
 #define FUSE_UPD_FDC_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "event.h"
 #include "fdd.h"
diff --git a/peripherals/disk/wd_fdc.c b/peripherals/disk/wd_fdc.c
index 7ba25aa3..909d9618 100644
--- a/peripherals/disk/wd_fdc.c
+++ b/peripherals/disk/wd_fdc.c
@@ -25,9 +25,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "crc.h"
 #include "event.h"
diff --git a/peripherals/disk/wd_fdc.h b/peripherals/disk/wd_fdc.h
index 5a3415e4..2cac3236 100644
--- a/peripherals/disk/wd_fdc.h
+++ b/peripherals/disk/wd_fdc.h
@@ -27,7 +27,7 @@
 #ifndef FUSE_WD_FDC_H
 #define FUSE_WD_FDC_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "event.h"
 #include "fdd.h"
diff --git a/peripherals/flash/am29f010.c b/peripherals/flash/am29f010.c
index 7899f3ba..3cb216a6 100644
--- a/peripherals/flash/am29f010.c
+++ b/peripherals/flash/am29f010.c
@@ -19,7 +19,7 @@
  
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
diff --git a/peripherals/flash/am29f010.h b/peripherals/flash/am29f010.h
index 9297d39f..6c452d3a 100644
--- a/peripherals/flash/am29f010.h
+++ b/peripherals/flash/am29f010.h
@@ -23,7 +23,7 @@
 #ifndef FUSE_AM29F010_H
 #define FUSE_AM29F010_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 typedef struct flash_am29f010_t flash_am29f010_t;
 
diff --git a/peripherals/fuller.c b/peripherals/fuller.c
index 58e5b7d8..d9f8d8f5 100644
--- a/peripherals/fuller.c
+++ b/peripherals/fuller.c
@@ -21,9 +21,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "ay.h"
 #include "compat.h"
diff --git a/peripherals/ide/divide.c b/peripherals/ide/divide.c
index f6ee94fa..0e97b709 100644
--- a/peripherals/ide/divide.c
+++ b/peripherals/ide/divide.c
@@ -22,9 +22,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include <string.h>
 
diff --git a/peripherals/ide/divide.h b/peripherals/ide/divide.h
index a4c8fd3c..79a658fe 100644
--- a/peripherals/ide/divide.h
+++ b/peripherals/ide/divide.h
@@ -24,7 +24,7 @@
 #ifndef FUSE_DIVIDE_H
 #define FUSE_DIVIDE_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 /* Whether DivIDE is currently paged in */
 extern int divide_active;
diff --git a/peripherals/ide/divmmc.c b/peripherals/ide/divmmc.c
index 6541dc0c..35084113 100644
--- a/peripherals/ide/divmmc.c
+++ b/peripherals/ide/divmmc.c
@@ -22,9 +22,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include <string.h>
 
diff --git a/peripherals/ide/divmmc.h b/peripherals/ide/divmmc.h
index 1f2010e4..64f06dac 100644
--- a/peripherals/ide/divmmc.h
+++ b/peripherals/ide/divmmc.h
@@ -24,7 +24,7 @@
 #ifndef FUSE_DIVMMC_H
 #define FUSE_DIVMMC_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 /* Whether DivMMC is currently paged in */
 extern int divmmc_active;
diff --git a/peripherals/ide/divxxx.c b/peripherals/ide/divxxx.c
index dc4ffb56..619f82ec 100644
--- a/peripherals/ide/divxxx.c
+++ b/peripherals/ide/divxxx.c
@@ -21,11 +21,11 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "debugger/debugger.h"
 #include "divxxx.h"
diff --git a/peripherals/ide/divxxx.h b/peripherals/ide/divxxx.h
index 26d66135..c6214a4e 100644
--- a/peripherals/ide/divxxx.h
+++ b/peripherals/ide/divxxx.h
@@ -24,7 +24,7 @@
 #ifndef FUSE_DIVXXX_H
 #define FUSE_DIVXXX_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 /* Type definition */
 
diff --git a/peripherals/ide/ide.c b/peripherals/ide/ide.c
index dc9244dc..93282c7a 100644
--- a/peripherals/ide/ide.c
+++ b/peripherals/ide/ide.c
@@ -21,9 +21,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "ide.h"
 #include "ui/ui.h"
diff --git a/peripherals/ide/simpleide.c b/peripherals/ide/simpleide.c
index 6026d559..0767fc46 100644
--- a/peripherals/ide/simpleide.c
+++ b/peripherals/ide/simpleide.c
@@ -23,9 +23,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "ide.h"
 #include "infrastructure/startup_manager.h"
diff --git a/peripherals/ide/simpleide.h b/peripherals/ide/simpleide.h
index 3f2dd1b5..b887fd26 100644
--- a/peripherals/ide/simpleide.h
+++ b/peripherals/ide/simpleide.h
@@ -22,7 +22,7 @@
 #ifndef FUSE_SIMPLEIDE_H
 #define FUSE_SIMPLEIDE_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 void simpleide_register_startup( void );
 void simpleide_reset( int hard_reset );
diff --git a/peripherals/ide/zxatasp.c b/peripherals/ide/zxatasp.c
index 3ae07108..3e7f0a1e 100644
--- a/peripherals/ide/zxatasp.c
+++ b/peripherals/ide/zxatasp.c
@@ -23,11 +23,11 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "debugger/debugger.h"
 #include "ide.h"
diff --git a/peripherals/ide/zxatasp.h b/peripherals/ide/zxatasp.h
index 5945496d..5e8599f1 100644
--- a/peripherals/ide/zxatasp.h
+++ b/peripherals/ide/zxatasp.h
@@ -24,7 +24,7 @@
 #ifndef FUSE_ZXATASP_H
 #define FUSE_ZXATASP_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 void zxatasp_register_startup( void );
 int zxatasp_insert( const char *filename, libspectrum_ide_unit unit );
diff --git a/peripherals/ide/zxcf.c b/peripherals/ide/zxcf.c
index f160aa6d..019e7c69 100644
--- a/peripherals/ide/zxcf.c
+++ b/peripherals/ide/zxcf.c
@@ -23,11 +23,11 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "debugger/debugger.h"
 #include "ide.h"
diff --git a/peripherals/ide/zxcf.h b/peripherals/ide/zxcf.h
index 8873ff50..f0fcf9c6 100644
--- a/peripherals/ide/zxcf.h
+++ b/peripherals/ide/zxcf.h
@@ -25,7 +25,7 @@
 #ifndef FUSE_ZXCF_H
 #define FUSE_ZXCF_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 void zxcf_register_startup( void );
 int zxcf_insert( const char *filename );
diff --git a/peripherals/ide/zxmmc.c b/peripherals/ide/zxmmc.c
index d7b205bd..631699d7 100644
--- a/peripherals/ide/zxmmc.c
+++ b/peripherals/ide/zxmmc.c
@@ -21,9 +21,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include <string.h>
 
diff --git a/peripherals/ide/zxmmc.h b/peripherals/ide/zxmmc.h
index a294c89c..07a32e1f 100644
--- a/peripherals/ide/zxmmc.h
+++ b/peripherals/ide/zxmmc.h
@@ -24,7 +24,7 @@
 #ifndef FUSE_ZXMMC_H
 #define FUSE_ZXMMC_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 void zxmmc_register_startup( void );
 int zxmmc_insert( const char *filename );
diff --git a/peripherals/if1.c b/peripherals/if1.c
index f7a84e7b..b4ff3298 100644
--- a/peripherals/if1.c
+++ b/peripherals/if1.c
@@ -22,7 +22,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 #include <errno.h>
diff --git a/peripherals/if1.h b/peripherals/if1.h
index fefb5ad9..4dc26c20 100644
--- a/peripherals/if1.h
+++ b/peripherals/if1.h
@@ -25,7 +25,7 @@
 #ifndef FUSE_IF1_H
 #define FUSE_IF1_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 /* IF1 */
 extern int if1_active;
diff --git a/peripherals/if2.c b/peripherals/if2.c
index a543a6a8..05a07cc6 100644
--- a/peripherals/if2.c
+++ b/peripherals/if2.c
@@ -24,7 +24,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
diff --git a/peripherals/if2.h b/peripherals/if2.h
index ff5f83e6..37ef353b 100644
--- a/peripherals/if2.h
+++ b/peripherals/if2.h
@@ -26,7 +26,7 @@
 #ifndef FUSE_IF2_H
 #define FUSE_IF2_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 /* IF2 cart inserted? */
 extern int if2_active;
diff --git a/peripherals/joystick.c b/peripherals/joystick.c
index 6154aad3..93328575 100644
--- a/peripherals/joystick.c
+++ b/peripherals/joystick.c
@@ -22,9 +22,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "fuse.h"
 #include "infrastructure/startup_manager.h"
diff --git a/peripherals/joystick.h b/peripherals/joystick.h
index dc27d166..9afba382 100644
--- a/peripherals/joystick.h
+++ b/peripherals/joystick.h
@@ -26,7 +26,7 @@
 #ifndef FUSE_JOYSTICK_H
 #define FUSE_JOYSTICK_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 /* Number of joysticks known about & initialised */
 extern int joysticks_supported;
diff --git a/peripherals/kempmouse.c b/peripherals/kempmouse.c
index cb379050..79d0261d 100644
--- a/peripherals/kempmouse.c
+++ b/peripherals/kempmouse.c
@@ -23,9 +23,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "infrastructure/startup_manager.h"
 #include "kempmouse.h"
diff --git a/peripherals/melodik.c b/peripherals/melodik.c
index 7a25d7cd..3f21b34c 100644
--- a/peripherals/melodik.c
+++ b/peripherals/melodik.c
@@ -22,9 +22,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "ay.h"
 #include "compat.h"
diff --git a/peripherals/multiface.c b/peripherals/multiface.c
index 9f79cda9..471e33e6 100644
--- a/peripherals/multiface.c
+++ b/peripherals/multiface.c
@@ -24,7 +24,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 #include <errno.h>
diff --git a/peripherals/nic/enc28j60.c b/peripherals/nic/enc28j60.c
index 30a3c79a..4e108eda 100644
--- a/peripherals/nic/enc28j60.c
+++ b/peripherals/nic/enc28j60.c
@@ -29,7 +29,7 @@
  
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 #include <unistd.h>
diff --git a/peripherals/nic/w5100.c b/peripherals/nic/w5100.c
index 885de078..6152b392 100644
--- a/peripherals/nic/w5100.c
+++ b/peripherals/nic/w5100.c
@@ -24,7 +24,7 @@
  
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <pthread.h>
 #include <string.h>
diff --git a/peripherals/nic/w5100.h b/peripherals/nic/w5100.h
index b8ea2d6d..098c97f6 100644
--- a/peripherals/nic/w5100.h
+++ b/peripherals/nic/w5100.h
@@ -27,7 +27,7 @@
 #ifndef FUSE_W5100_H
 #define FUSE_W5100_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 typedef struct nic_w5100_t nic_w5100_t;
 
diff --git a/peripherals/nic/w5100_socket.c b/peripherals/nic/w5100_socket.c
index bbd7a0c0..8f1db4c9 100644
--- a/peripherals/nic/w5100_socket.c
+++ b/peripherals/nic/w5100_socket.c
@@ -24,7 +24,7 @@
  
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <pthread.h>
 #include <string.h>
diff --git a/peripherals/printer.c b/peripherals/printer.c
index a654aa1f..62d26dcd 100644
--- a/peripherals/printer.c
+++ b/peripherals/printer.c
@@ -28,7 +28,7 @@
  * Well, `based' is an understatement, it's almost exactly the same. :-)
  */
    
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/peripherals/printer.h b/peripherals/printer.h
index a52c5e55..1741f97b 100644
--- a/peripherals/printer.h
+++ b/peripherals/printer.h
@@ -24,7 +24,7 @@
 #ifndef FUSE_PRINTER_H
 #define FUSE_PRINTER_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 void printer_frame( void );
 void printer_serial_write( libspectrum_byte b );
diff --git a/peripherals/scld.c b/peripherals/scld.c
index 74dd2f87..947f273e 100644
--- a/peripherals/scld.c
+++ b/peripherals/scld.c
@@ -24,7 +24,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/peripherals/speccyboot.c b/peripherals/speccyboot.c
index b5fd18a8..43f6c817 100644
--- a/peripherals/speccyboot.c
+++ b/peripherals/speccyboot.c
@@ -24,7 +24,7 @@
    
 */
 
-#include <config.h>
+#include "config.h"
 
 #include "compat.h"
 #include "debugger/debugger.h"
diff --git a/peripherals/specdrum.c b/peripherals/specdrum.c
index 424320cd..1e309fe1 100644
--- a/peripherals/specdrum.c
+++ b/peripherals/specdrum.c
@@ -24,9 +24,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "infrastructure/startup_manager.h"
diff --git a/peripherals/specdrum.h b/peripherals/specdrum.h
index e1dcf81f..b0c65483 100644
--- a/peripherals/specdrum.h
+++ b/peripherals/specdrum.h
@@ -26,7 +26,7 @@
 #ifndef FUSE_SPECDRUM_H
 #define FUSE_SPECDRUM_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 typedef struct specdrum_info {
   libspectrum_signed_byte specdrum_dac; /* Current byte in the SpecDrum 8bit DAC */
diff --git a/peripherals/spectranet.c b/peripherals/spectranet.c
index dd53ed7d..db18fa71 100644
--- a/peripherals/spectranet.c
+++ b/peripherals/spectranet.c
@@ -22,7 +22,7 @@
    
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
diff --git a/peripherals/ttx2000s.c b/peripherals/ttx2000s.c
index 78677dd0..687933b7 100644
--- a/peripherals/ttx2000s.c
+++ b/peripherals/ttx2000s.c
@@ -17,9 +17,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "debugger/debugger.h"
diff --git a/peripherals/ula.c b/peripherals/ula.c
index ae9086ad..55737d31 100644
--- a/peripherals/ula.c
+++ b/peripherals/ula.c
@@ -23,9 +23,9 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "debugger/debugger.h"
diff --git a/peripherals/usource.c b/peripherals/usource.c
index a388e7de..cf6182dc 100644
--- a/peripherals/usource.c
+++ b/peripherals/usource.c
@@ -24,11 +24,11 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "infrastructure/startup_manager.h"
diff --git a/phantom_typist.c b/phantom_typist.c
index 9452db76..d0be2dcd 100644
--- a/phantom_typist.c
+++ b/phantom_typist.c
@@ -26,9 +26,9 @@
 #include <strings.h>
 #endif      /* #ifdef HAVE_STRINGS_STRCASECMP */
 
-#include <config.h>
+#include "config.h"
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "compat.h"
 #include "infrastructure/startup_manager.h"
diff --git a/pokefinder/pokefinder.c b/pokefinder/pokefinder.c
index 7cf6111b..98bcd48e 100644
--- a/pokefinder/pokefinder.c
+++ b/pokefinder/pokefinder.c
@@ -21,11 +21,11 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "machine.h"
 #include "memory_pages.h"
diff --git a/pokefinder/pokefinder.h b/pokefinder/pokefinder.h
index 48ec0035..03263fa5 100644
--- a/pokefinder/pokefinder.h
+++ b/pokefinder/pokefinder.h
@@ -24,7 +24,7 @@
 #ifndef FUSE_POKEFINDER_H
 #define FUSE_POKEFINDER_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 extern libspectrum_byte pokefinder_possible[][ MEMORY_PAGE_SIZE ];
 extern libspectrum_byte pokefinder_impossible[][ MEMORY_PAGE_SIZE / 8 ];
diff --git a/pokefinder/pokemem.c b/pokefinder/pokemem.c
index e2df16f4..a08e0f5c 100644
--- a/pokefinder/pokemem.c
+++ b/pokefinder/pokemem.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <ctype.h>
 #include <string.h>
diff --git a/pokefinder/pokemem.h b/pokefinder/pokemem.h
index b657dbf6..b1fb4b5f 100644
--- a/pokefinder/pokemem.h
+++ b/pokefinder/pokemem.h
@@ -24,13 +24,13 @@
 #ifndef POKEMEM_H
 #define POKEMEM_H
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_LIB_GLIB
 #include <glib.h>
 #endif				/* #ifdef HAVE_LIB_GLIB */
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 extern GSList *trainer_list;
 
diff --git a/profile.c b/profile.c
index bfcfab5e..f049134d 100644
--- a/profile.c
+++ b/profile.c
@@ -21,12 +21,12 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 #include "event.h"
 #include "infrastructure/startup_manager.h"
diff --git a/psg.c b/psg.c
index 99f316d2..c00013a0 100644
--- a/psg.c
+++ b/psg.c
@@ -21,7 +21,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 
diff --git a/psg.h b/psg.h
index 519a6d16..8241e5d4 100644
--- a/psg.h
+++ b/psg.h
@@ -24,7 +24,7 @@
 #ifndef FUSE_PSG_H
 #define FUSE_PSG_H
 
-#include <libspectrum.h>
+#include "libspectrum.h"
 
 /* Are we currently recording a .psg file? */
 extern int psg_recording;
diff --git a/rectangle.c b/rectangle.c
index a5250243..9782e030 100644
--- a/rectangle.c
+++ b/rectangle.c
@@ -23,7 +23,7 @@
 
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdlib.h>
 
diff --git a/rzx.c b/rzx.c
index 114867f8..38038e9b 100644...
 
[truncated message content]

[fuse-emulator-cvs] [libspectrum] branch master updated: Include <string.h> for 'strlen' and 'memcpy'

[<fr...@us...>]

This is an automated email from the git hooks/post-receive-user script.

fredm pushed a commit to branch master
in repository libspectrum.

View the commit online:
https://sourceforge.net/p/fuse-emulator/libspectrum/ci/8c4f2c4260e0717777116065e96c0efbe3c39119/

The following commit(s) were added to refs/heads/master by this push:
     new 8c4f2c4  Include <string.h> for 'strlen' and 'memcpy'
8c4f2c4 is described below

commit 8c4f2c4260e0717777116065e96c0efbe3c39119
Author: Fredrick Meunier <fr...@sp...>
AuthorDate: Mon Mar 15 21:56:54 2021 +1100

    Include <string.h> for 'strlen' and 'memcpy'
---
 utilities.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/utilities.c b/utilities.c
index 9555154..eb0fa44 100644
--- a/utilities.c
+++ b/utilities.c
@@ -23,6 +23,10 @@
 
 #include "config.h"
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif				/* #ifdef HAVE_STRING_H */
+
 #include "internals.h"
 
 #define TZX_HZ 3500000

[fuse-emulator-cvs] [fuse] 04/04: Remove a C99 comment

[<sba...@us...>]

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/240b79404871a1ef6c09739e9de1632199ac710a/

commit 240b79404871a1ef6c09739e9de1632199ac710a
Author: Sergio Baldoví <ser...@gm...>
AuthorDate: Sun Mar 14 20:23:16 2021 +0100

    Remove a C99 comment
---
 peripherals/ide/divmmc.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/peripherals/ide/divmmc.c b/peripherals/ide/divmmc.c
index 10c0666f..6541dc0c 100644
--- a/peripherals/ide/divmmc.c
+++ b/peripherals/ide/divmmc.c
@@ -238,8 +238,6 @@ divmmc_control_write( libspectrum_word port GCC_UNUSED, libspectrum_byte data )
 static void
 divmmc_card_select( libspectrum_word port GCC_UNUSED, libspectrum_byte data )
 {
-//  printf("divmmc_card_select( 0x%02x )\n", data );
-
   /* D0 = MMC0, D1 = MMC1, active LOW
      somehow logic prevents enabling both cards at the same time */
   switch( data & 0x03 ) {