diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml index aa3f797..85e1a4f 100644 --- a/.github/workflows/clang.yml +++ b/.github/workflows/clang.yml @@ -9,12 +9,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v20 + - uses: cachix/install-nix-action@v27 with: extra_nix_config: | auto-optimise-store = true experimental-features = nix-command flakes - - uses: cachix/cachix-action@v12 + - uses: cachix/cachix-action@v15 with: name: pain authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 55a0248..32aa50f 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -9,12 +9,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v20 + - uses: cachix/install-nix-action@v27 with: extra_nix_config: | auto-optimise-store = true experimental-features = nix-command flakes - - uses: cachix/cachix-action@v12 + - uses: cachix/cachix-action@v15 with: name: pain authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' diff --git a/include/bus.hh b/include/bus.hh index 06ebdba..bcfdb11 100644 --- a/include/bus.hh +++ b/include/bus.hh @@ -1,7 +1,7 @@ #pragma once -#include "memory.hh" #include "io/io.hh" +#include "memory.hh" #include namespace matar { diff --git a/include/io/sound.hh b/include/io/sound.hh index b983789..20f9fbf 100644 --- a/include/io/sound.hh +++ b/include/io/sound.hh @@ -30,7 +30,7 @@ 40000A4h 4 W FIFO_B Channel B FIFO, Data 0-3 */ -struct sound{ +struct sound { using u16 = uint16_t; // channel 1