80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
OBattler
2024-05-04 11:40:19 +02:00
parent 2d0b7f81d3 57abafde92
commit bd55fdb96b
8 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/cmake_linux.yml vendored
View File

@@ -8,7 +8,7 @@ on:
- cmake/** - cmake/**
- "**/CMakeLists.txt" - "**/CMakeLists.txt"
- "CMakePresets.json" - "CMakePresets.json"
- .github/workflows/cmake.yml - .github/workflows/cmake_linux.yml
- vcpkg.json - vcpkg.json
- "!**/Makefile*" - "!**/Makefile*"
@@ -19,7 +19,7 @@ on:
- "**/CMakeLists.txt" - "**/CMakeLists.txt"
- "CMakePresets.json" - "CMakePresets.json"
- .github/workflows/** - .github/workflows/**
- .github/workflows/cmake.yml - .github/workflows/cmake_linux.yml
- vcpkg.json - vcpkg.json
- "!**/Makefile*" - "!**/Makefile*"
@@ -115,7 +115,7 @@ jobs:
cmake --install build cmake --install build
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-UbuntuJammy-x86_64-gha${{ github.run_number }}' name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-UbuntuJammy-x86_64-gha${{ github.run_number }}'
path: build/artifacts/** path: build/artifacts/**

6
.github/workflows/cmake_macos.yml vendored
View File

@@ -8,7 +8,7 @@ on:
- cmake/** - cmake/**
- "**/CMakeLists.txt" - "**/CMakeLists.txt"
- "CMakePresets.json" - "CMakePresets.json"
- .github/workflows/cmake.yml - .github/workflows/cmake_macos.yml
- vcpkg.json - vcpkg.json
- "!**/Makefile*" - "!**/Makefile*"
@@ -19,7 +19,7 @@ on:
- "**/CMakeLists.txt" - "**/CMakeLists.txt"
- "CMakePresets.json" - "CMakePresets.json"
- .github/workflows/** - .github/workflows/**
- .github/workflows/cmake.yml - .github/workflows/cmake_macos.yml
- vcpkg.json - vcpkg.json
- "!**/Makefile*" - "!**/Makefile*"
@@ -120,7 +120,7 @@ jobs:
cmake --install build cmake --install build
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}' name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}'
path: build/artifacts/** path: build/artifacts/**

6
.github/workflows/cmake_windows_llvm.yml vendored
View File

@@ -8,7 +8,7 @@ on:
- cmake/** - cmake/**
- "**/CMakeLists.txt" - "**/CMakeLists.txt"
- "CMakePresets.json" - "CMakePresets.json"
- .github/workflows/cmake.yml - .github/workflows/cmake_windows_llvm.yml
- vcpkg.json - vcpkg.json
- "!**/Makefile*" - "!**/Makefile*"
@@ -19,7 +19,7 @@ on:
- "**/CMakeLists.txt" - "**/CMakeLists.txt"
- "CMakePresets.json" - "CMakePresets.json"
- .github/workflows/** - .github/workflows/**
- .github/workflows/cmake.yml - .github/workflows/cmake_windows_llvm.yml
- vcpkg.json - vcpkg.json
- "!**/Makefile*" - "!**/Makefile*"
@@ -157,7 +157,7 @@ jobs:
cmake --install build cmake --install build
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-Windows-LLVM-${{ matrix.target.name }}-gha${{ github.run_number }}' name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-Windows-LLVM-${{ matrix.target.name }}-gha${{ github.run_number }}'
path: build/artifacts/** path: build/artifacts/**

6
.github/workflows/cmake_windows_msys2.yml vendored
View File

@@ -8,7 +8,7 @@ on:
- cmake/** - cmake/**
- "**/CMakeLists.txt" - "**/CMakeLists.txt"
- "CMakePresets.json" - "CMakePresets.json"
- .github/workflows/cmake.yml - .github/workflows/cmake_windows_msys2.yml
- vcpkg.json - vcpkg.json
- "!**/Makefile*" - "!**/Makefile*"
@@ -19,7 +19,7 @@ on:
- "**/CMakeLists.txt" - "**/CMakeLists.txt"
- "CMakePresets.json" - "CMakePresets.json"
- .github/workflows/** - .github/workflows/**
- .github/workflows/cmake.yml - .github/workflows/cmake_windows_msys2.yml
- vcpkg.json - vcpkg.json
- "!**/Makefile*" - "!**/Makefile*"
@@ -138,7 +138,7 @@ jobs:
run: cmake --install build run: cmake --install build
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-Windows-${{ matrix.environment.msystem }}-gha${{ github.run_number }}' name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-Windows-${{ matrix.environment.msystem }}-gha${{ github.run_number }}'
path: build/artifacts/** path: build/artifacts/**

8
.github/workflows/codeql_linux.yml vendored
View File

@@ -8,7 +8,7 @@ on:
- cmake/** - cmake/**
- "**/CMakeLists.txt" - "**/CMakeLists.txt"
- "CMakePresets.json" - "CMakePresets.json"
- .github/workflows/codeql.yml - .github/workflows/codeql_linux.yml
- vcpkg.json - vcpkg.json
- "!**/Makefile*" - "!**/Makefile*"
@@ -19,7 +19,7 @@ on:
- "**/CMakeLists.txt" - "**/CMakeLists.txt"
- "CMakePresets.json" - "CMakePresets.json"
- .github/workflows/** - .github/workflows/**
- .github/workflows/codeql.yml - .github/workflows/codeql_linux.yml
- vcpkg.json - vcpkg.json
- "!**/Makefile*" - "!**/Makefile*"
@@ -89,7 +89,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@v2 uses: github/codeql-action/init@v3
with: with:
languages: ${{ matrix.language }} languages: ${{ matrix.language }}
config-file: ./.github/codeql/codeql-config.yml config-file: ./.github/codeql/codeql-config.yml
@@ -106,6 +106,6 @@ jobs:
run: cmake --build build run: cmake --build build
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2 uses: github/codeql-action/analyze@v3
with: with:
category: "/language:${{matrix.language}}" category: "/language:${{matrix.language}}"

8
.github/workflows/codeql_macos.yml vendored
View File

@@ -8,7 +8,7 @@ on:
- cmake/** - cmake/**
- "**/CMakeLists.txt" - "**/CMakeLists.txt"
- "CMakePresets.json" - "CMakePresets.json"
- .github/workflows/codeql.yml - .github/workflows/codeql_macos.yml
- vcpkg.json - vcpkg.json
- "!**/Makefile*" - "!**/Makefile*"
@@ -19,7 +19,7 @@ on:
- "**/CMakeLists.txt" - "**/CMakeLists.txt"
- "CMakePresets.json" - "CMakePresets.json"
- .github/workflows/** - .github/workflows/**
- .github/workflows/codeql.yml - .github/workflows/codeql_macos.yml
- vcpkg.json - vcpkg.json
- "!**/Makefile*" - "!**/Makefile*"
@@ -82,7 +82,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@v2 uses: github/codeql-action/init@v3
with: with:
languages: ${{ matrix.language }} languages: ${{ matrix.language }}
config-file: ./.github/codeql/codeql-config.yml config-file: ./.github/codeql/codeql-config.yml
@@ -102,6 +102,6 @@ jobs:
run: cmake --build build run: cmake --build build
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2 uses: github/codeql-action/analyze@v3
with: with:
category: "/language:${{matrix.language}}" category: "/language:${{matrix.language}}"

8
.github/workflows/codeql_windows_msys2.yml vendored
View File

@@ -8,7 +8,7 @@ on:
- cmake/** - cmake/**
- "**/CMakeLists.txt" - "**/CMakeLists.txt"
- "CMakePresets.json" - "CMakePresets.json"
- .github/workflows/codeql.yml - .github/workflows/codeql_windows_msys2.yml
- vcpkg.json - vcpkg.json
- "!**/Makefile*" - "!**/Makefile*"
@@ -19,7 +19,7 @@ on:
- "**/CMakeLists.txt" - "**/CMakeLists.txt"
- "CMakePresets.json" - "CMakePresets.json"
- .github/workflows/** - .github/workflows/**
- .github/workflows/codeql.yml - .github/workflows/codeql_windows_msys2.yml
- vcpkg.json - vcpkg.json
- "!**/Makefile*" - "!**/Makefile*"
@@ -114,7 +114,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@v2 uses: github/codeql-action/init@v3
with: with:
languages: ${{ matrix.language }} languages: ${{ matrix.language }}
config-file: ./.github/codeql/codeql-config.yml config-file: ./.github/codeql/codeql-config.yml
@@ -133,6 +133,6 @@ jobs:
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2 uses: github/codeql-action/analyze@v3
with: with:
category: "/language:${{matrix.language}}" category: "/language:${{matrix.language}}"

1
src/sound/snd_sb.c
View File

@@ -1292,6 +1292,7 @@ sb_ct1745_mixer_read(uint16_t addr, void *priv)
break; break;
case 0x82: case 0x82:
; /* Empty statement to make compilers happy about the following variable declaration. */
/* The Interrupt status register, addressed as register 82h on the Mixer register map, /* The Interrupt status register, addressed as register 82h on the Mixer register map,
is used by the ISR to determine whether the interrupt is meant for it or for some is used by the ISR to determine whether the interrupt is meant for it or for some
other ISR, in which case it should chain to the previous routine. */ other ISR, in which case it should chain to the previous routine. */