Add AXI4

.ci/test_whitespace.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -xou pipefail
+
+grep \
+  -E ' $' -n -r . \
+  --include=*.{hs,hs-boot,sh,cabal,md,yml} \
+  --exclude-dir=dist-newstyle --exclude-dir=deps
+if [[ $? == 0 ]]; then
+    echo "EOL whitespace detected. See ^"
+    exit 1;
+fi

.github/workflows/ci.yml

@@ -0,0 +1,96 @@
+name: CI
+
+# Trigger the workflow on all pull requests and pushes/merges to master branch
+on:
+  pull_request:
+  push:
+    branches: [master]
+
+jobs:
+  stack:
+    name: Stack tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Stack / GHC
+        uses: haskell/actions/setup@v1
+        with:
+          ghc-version: '8.10.7' # Exact version of ghc to use
+          enable-stack: true
+          stack-version: 'latest'
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.stack
+          key: ${{ runner.os }}-ghc-${{ matrix.ghc }}-${{ github.ref }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-ghc-${{ matrix.ghc }}-${{ github.ref }}-${{ github.sha }}
+            ${{ runner.os }}-ghc-${{ matrix.ghc }}-${{ github.ref }}-
+            ${{ runner.os }}-ghc-${{ matrix.ghc }}-
+
+      # Ask Stack to use system GHC instead of installing its own copy
+      - name: Use system GHC
+        run: |
+          stack config set system-ghc --global true
+
+      - name: Test with Stack
+        run: |
+          .ci/test_stack.sh
+
+  cabal:
+    name: Cabal tests - ${{ matrix.os }} / ghc ${{ matrix.ghc }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        cabal:
+          - "3.2"
+        ghc:
+          - "8.10.7"
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Haskell
+        uses: haskell/actions/setup@v1
+        id: setup-haskell-cabal
+        with:
+          ghc-version: ${{ matrix.ghc }}
+          cabal-version: ${{ matrix.cabal }}
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.cabal
+          key: ${{ runner.os }}-ghc-${{ matrix.ghc }}-${{ github.ref }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-ghc-${{ matrix.ghc }}-${{ github.ref }}-${{ github.sha }}
+            ${{ runner.os }}-ghc-${{ matrix.ghc }}-${{ github.ref }}-
+            ${{ runner.os }}-ghc-${{ matrix.ghc }}-
+
+      - name: Build
+        run: |
+          cabal build all -fci
+
+      - name: Test
+        run: |
+          .ci/test_cabal.sh
+
+      - name: Documentation
+        run: |
+          .ci/build_docs.sh
+
+  linting:
+    name: Source code linting
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Whitespace
+        run: |
+          .ci/test_whitespace.sh

cabal.project

@@ -11,7 +11,7 @@ package clash-prelude
 source-repository-package
     type: git
     location: https://github.com/cchalmers/circuit-notation.git
-    tag: 0fe897cb95bd1be87abed044f4072f104dec2f7d
+    tag: 2574640364eef12222517af059b9e4a7e6b503a7
 
 source-repository-package
     type: git

clash-protocols.cabal

@@ -124,19 +124,29 @@ library
   build-depends:
       -- inline-circuit-notation
       circuit-notation
-    , extra
     , data-default
     , deepseq
-    , hedgehog >= 1.0.2
+    , extra
     , ghc >= 8.6
+    , hedgehog >= 1.0.2
     , pretty-show
+    , strict-tuple
 
       -- To be removed; we need 'Test.Tasty.Hedgehog.Extra' to fix upstream issues
     , tasty >= 1.2 && < 1.5
     , tasty-hedgehog
 
   exposed-modules:
     Protocols
+
+    Protocols.Axi4.Common
+
+    Protocols.Axi4.ReadAddress
+    Protocols.Axi4.ReadData
+    Protocols.Axi4.WriteAddress
+    Protocols.Axi4.WriteData
+    Protocols.Axi4.WriteResponse
+
     Protocols.Df
     Protocols.DfLike
     Protocols.Hedgehog

src/Protocols.hs

@@ -47,7 +47,7 @@ module Protocols
   , def
 
     -- * Circuit notation plugin
-  , circuit
+  , circuit, (-<)
   ) where
 
 import Data.Default (def)