Improving HAL directory structure (#191)

To accomodate for testing different platform implementations of same-name units. Also updated corresponding makefiles and workflow definitions.
rsksmart · Aug 8, 2024 · 85c304d · 85c304d
1 parent a0791fc
commit 85c304d
Show file tree

Hide file tree

Showing 56 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -24,7 +24,7 @@ jobs:
         run: firmware/test/test-all
 
       - name: Firmware HAL's unit tests
-        run: firmware/src/hal/test/run-all.sh
+        run: firmware/src/hal/x86/test/run-all.sh
 
       - name: Firmware common lib unit tests
         run: firmware/src/common/test/run-all.sh

diff --git a/firmware/src/hal/common/.gitkeep b/firmware/src/hal/common/.gitkeep
diff --git a/firmware/src/hal/src/common/communication.c → firmware/src/hal/common/src/communication.c b/firmware/src/hal/src/common/communication.c → firmware/src/hal/common/src/communication.c
diff --git a/firmware/src/hal/src/common/sha256.c → firmware/src/hal/common/src/sha256.c b/firmware/src/hal/src/common/sha256.c → firmware/src/hal/common/src/sha256.c
diff --git a/firmware/src/hal/src/common/sha256.h → firmware/src/hal/common/src/sha256.h b/firmware/src/hal/src/common/sha256.h → firmware/src/hal/common/src/sha256.h
diff --git a/firmware/src/hal/ledger/src/communication.c b/firmware/src/hal/ledger/src/communication.c
@@ -0,0 +1 @@
+../../common/src/communication.c
diff --git a/firmware/src/hal/src/ledger/endorsement.c → firmware/src/hal/ledger/src/endorsement.c b/firmware/src/hal/src/ledger/endorsement.c → firmware/src/hal/ledger/src/endorsement.c
diff --git a/firmware/src/hal/src/ledger/hash.c → firmware/src/hal/ledger/src/hash.c b/firmware/src/hal/src/ledger/hash.c → firmware/src/hal/ledger/src/hash.c
diff --git a/firmware/src/hal/src/ledger/nvmem.c → firmware/src/hal/ledger/src/nvmem.c b/firmware/src/hal/src/ledger/nvmem.c → firmware/src/hal/ledger/src/nvmem.c
diff --git a/firmware/src/hal/src/ledger/platform.c → firmware/src/hal/ledger/src/platform.c b/firmware/src/hal/src/ledger/platform.c → firmware/src/hal/ledger/src/platform.c
diff --git a/firmware/src/hal/src/ledger/seed.c → firmware/src/hal/ledger/src/seed.c b/firmware/src/hal/src/ledger/seed.c → firmware/src/hal/ledger/src/seed.c
diff --git a/firmware/src/hal/ledger/src/sha256.c b/firmware/src/hal/ledger/src/sha256.c
@@ -0,0 +1 @@
+../../common/src/sha256.c
diff --git a/firmware/src/hal/ledger/src/sha256.h b/firmware/src/hal/ledger/src/sha256.h
@@ -0,0 +1 @@
+../../common/src/sha256.h
diff --git a/firmware/src/hal/ledger/test/.gitkeep b/firmware/src/hal/ledger/test/.gitkeep
diff --git a/firmware/src/hal/src/ledger/communication.c b/firmware/src/hal/src/ledger/communication.c
diff --git a/firmware/src/hal/src/ledger/sha256.c b/firmware/src/hal/src/ledger/sha256.c
diff --git a/firmware/src/hal/src/ledger/sha256.h b/firmware/src/hal/src/ledger/sha256.h
diff --git a/firmware/src/hal/src/x86/communication.c b/firmware/src/hal/src/x86/communication.c
diff --git a/firmware/src/hal/src/x86/sha256.c b/firmware/src/hal/src/x86/sha256.c
diff --git a/firmware/src/hal/src/x86/sha256.h b/firmware/src/hal/src/x86/sha256.h
diff --git a/firmware/src/hal/src/x86/bip32.c → firmware/src/hal/x86/src/bip32.c b/firmware/src/hal/src/x86/bip32.c → firmware/src/hal/x86/src/bip32.c
diff --git a/firmware/src/hal/src/x86/bip32.h → firmware/src/hal/x86/src/bip32.h b/firmware/src/hal/src/x86/bip32.h → firmware/src/hal/x86/src/bip32.h
diff --git a/firmware/src/hal/src/x86/cJSON.c → firmware/src/hal/x86/src/cJSON.c b/firmware/src/hal/src/x86/cJSON.c → firmware/src/hal/x86/src/cJSON.c
diff --git a/firmware/src/hal/src/x86/cJSON.h → firmware/src/hal/x86/src/cJSON.h b/firmware/src/hal/src/x86/cJSON.h → firmware/src/hal/x86/src/cJSON.h
diff --git a/firmware/src/hal/x86/src/communication.c b/firmware/src/hal/x86/src/communication.c
@@ -0,0 +1 @@
+../../common/src/communication.c
diff --git a/firmware/src/hal/src/x86/endorsement.c → firmware/src/hal/x86/src/endorsement.c b/firmware/src/hal/src/x86/endorsement.c → firmware/src/hal/x86/src/endorsement.c
diff --git a/firmware/src/hal/src/x86/exceptions.c → firmware/src/hal/x86/src/exceptions.c b/firmware/src/hal/src/x86/exceptions.c → firmware/src/hal/x86/src/exceptions.c
diff --git a/firmware/src/hal/src/x86/explicit_bzero.c → firmware/src/hal/x86/src/explicit_bzero.c b/firmware/src/hal/src/x86/explicit_bzero.c → firmware/src/hal/x86/src/explicit_bzero.c
diff --git a/firmware/src/hal/src/x86/explicit_bzero.h → firmware/src/hal/x86/src/explicit_bzero.h b/firmware/src/hal/src/x86/explicit_bzero.h → firmware/src/hal/x86/src/explicit_bzero.h
diff --git a/firmware/src/hal/src/x86/hash.c → firmware/src/hal/x86/src/hash.c b/firmware/src/hal/src/x86/hash.c → firmware/src/hal/x86/src/hash.c
diff --git a/firmware/src/hal/src/x86/hex_reader.c → firmware/src/hal/x86/src/hex_reader.c b/firmware/src/hal/src/x86/hex_reader.c → firmware/src/hal/x86/src/hex_reader.c
diff --git a/firmware/src/hal/src/x86/hex_reader.h → firmware/src/hal/x86/src/hex_reader.h b/firmware/src/hal/src/x86/hex_reader.h → firmware/src/hal/x86/src/hex_reader.h
diff --git a/firmware/src/hal/src/x86/hmac_sha256.c → firmware/src/hal/x86/src/hmac_sha256.c b/firmware/src/hal/src/x86/hmac_sha256.c → firmware/src/hal/x86/src/hmac_sha256.c
diff --git a/firmware/src/hal/src/x86/hmac_sha256.h → firmware/src/hal/x86/src/hmac_sha256.h b/firmware/src/hal/src/x86/hmac_sha256.h → firmware/src/hal/x86/src/hmac_sha256.h
diff --git a/firmware/src/hal/src/x86/json.c → firmware/src/hal/x86/src/json.c b/firmware/src/hal/src/x86/json.c → firmware/src/hal/x86/src/json.c
diff --git a/firmware/src/hal/src/x86/json.h → firmware/src/hal/x86/src/json.h b/firmware/src/hal/src/x86/json.h → firmware/src/hal/x86/src/json.h
diff --git a/firmware/src/hal/src/x86/keccak256.c → firmware/src/hal/x86/src/keccak256.c b/firmware/src/hal/src/x86/keccak256.c → firmware/src/hal/x86/src/keccak256.c
diff --git a/firmware/src/hal/src/x86/keccak256.h → firmware/src/hal/x86/src/keccak256.h b/firmware/src/hal/src/x86/keccak256.h → firmware/src/hal/x86/src/keccak256.h
diff --git a/firmware/src/hal/src/x86/log.c → firmware/src/hal/x86/src/log.c b/firmware/src/hal/src/x86/log.c → firmware/src/hal/x86/src/log.c
diff --git a/firmware/src/hal/src/x86/nvmem.c → firmware/src/hal/x86/src/nvmem.c b/firmware/src/hal/src/x86/nvmem.c → firmware/src/hal/x86/src/nvmem.c
diff --git a/firmware/src/hal/src/x86/platform.c → firmware/src/hal/x86/src/platform.c b/firmware/src/hal/src/x86/platform.c → firmware/src/hal/x86/src/platform.c
diff --git a/firmware/src/hal/src/x86/random.c → firmware/src/hal/x86/src/random.c b/firmware/src/hal/src/x86/random.c → firmware/src/hal/x86/src/random.c
diff --git a/firmware/src/hal/src/x86/random.h → firmware/src/hal/x86/src/random.h b/firmware/src/hal/src/x86/random.h → firmware/src/hal/x86/src/random.h
diff --git a/firmware/src/hal/src/x86/seed.c → firmware/src/hal/x86/src/seed.c b/firmware/src/hal/src/x86/seed.c → firmware/src/hal/x86/src/seed.c
diff --git a/firmware/src/hal/x86/src/sha256.c b/firmware/src/hal/x86/src/sha256.c
@@ -0,0 +1 @@
+../../common/src/sha256.c
diff --git a/firmware/src/hal/x86/src/sha256.h b/firmware/src/hal/x86/src/sha256.h
@@ -0,0 +1 @@
+../../common/src/sha256.h
diff --git a/firmware/src/hal/test/bip32/Makefile → firmware/src/hal/x86/test/bip32/Makefile b/firmware/src/hal/test/bip32/Makefile → firmware/src/hal/x86/test/bip32/Makefile
diff --git a/firmware/src/hal/test/bip32/test_bip32.c → firmware/src/hal/x86/test/bip32/test_bip32.c b/firmware/src/hal/test/bip32/test_bip32.c → firmware/src/hal/x86/test/bip32/test_bip32.c
diff --git a/firmware/src/hal/test/common.mk → firmware/src/hal/x86/test/common.mk b/firmware/src/hal/test/common.mk → firmware/src/hal/x86/test/common.mk
@@ -20,12 +20,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-INCDIR = ../../include
-SRCDIR = ../../src/x86
+INCDIR = ../../../include
+SRCDIR = ../../src
 CFLAGS  = -iquote $(INCDIR) -iquote $(SRCDIR)
 CFLAGS += -DHSM_PLATFORM_X86
 
-include ../../../../coverage/coverage.mk
+include ../../../../../coverage/coverage.mk
 
 CFLAGS += $(COVFLAGS)
 

diff --git a/firmware/src/hal/test/hmac_sha256/Makefile → ...are/src/hal/x86/test/hmac_sha256/Makefile b/firmware/src/hal/test/hmac_sha256/Makefile → ...are/src/hal/x86/test/hmac_sha256/Makefile
diff --git a/...c/hal/test/hmac_sha256/test_hmac_sha256.c → ...l/x86/test/hmac_sha256/test_hmac_sha256.c b/...c/hal/test/hmac_sha256/test_hmac_sha256.c → ...l/x86/test/hmac_sha256/test_hmac_sha256.c
diff --git a/firmware/src/hal/test/run-all.sh → firmware/src/hal/x86/test/run-all.sh b/firmware/src/hal/test/run-all.sh → firmware/src/hal/x86/test/run-all.sh
diff --git a/firmware/src/ledger/signer/Makefile b/firmware/src/ledger/signer/Makefile
@@ -50,7 +50,7 @@ APPFLAGS = 0x00
 PROG = "app"
 
 # Build configuration
-APP_SOURCE_PATH += src ../../powhsm/src ../../common/src ../../hal/src/ledger
+APP_SOURCE_PATH += src ../../powhsm/src ../../common/src ../../hal/ledger/src
 SDK_SOURCE_PATH += lib_stusb lib_stusb_impl
 
 DEFINES += APPVERSION=\"$(APPVERSION)\"

diff --git a/firmware/src/ledger/ui/test/mock/common.mk b/firmware/src/ledger/ui/test/mock/common.mk
@@ -25,7 +25,7 @@ COMMONDIR = ../../../../common/src
 MOCKDIR = ../mock
 THISMOCKDIR = ./mock
 HALINCDIR = ../../../../hal/include
-HALSRCDIR = ../../../../hal/src/x86
+HALSRCDIR = ../../../../hal/x86/src
 CFLAGS  = -iquote $(THISMOCKDIR) -iquote $(COMMONDIR) -iquote $(MOCKDIR)
 CFLAGS += -iquote $(SRCDIR) -iquote $(HALINCDIR) -iquote $(HALSRCDIR)
 CFLAGS += -DHSM_PLATFORM_X86

diff --git a/firmware/src/powhsm/test/common/common.mk b/firmware/src/powhsm/test/common/common.mk
@@ -1,7 +1,7 @@
 TESTCOMMONDIR = ../common
 SRCDIR = ../../src
 HALINCDIR = ../../../hal/include
-HALSRCDIR = ../../../hal/src/x86
+HALSRCDIR = ../../../hal/x86/src
 COMMONDIR = ../../../common/src
 CFLAGS  = -iquote $(SRCDIR) -iquote $(HALINCDIR) -iquote $(HALSRCDIR) 
 CFLAGS += -iquote $(TESTCOMMONDIR) -iquote $(COMMONDIR)

diff --git a/firmware/src/tcpsigner/Makefile b/firmware/src/tcpsigner/Makefile
@@ -23,7 +23,7 @@
 SRCPATH = ./src
 POWHSMSRCPATH = ../powhsm/src
 COMMONPATH = ../common/src
-HALSRCPATH = ../hal/src/x86
+HALSRCPATH = ../hal/x86/src
 HALINCPATH = ../hal/include
 HALPATH = $(HALINCPATH):$(HALSRCPATH)
 VPATH = $(SRCPATH):$(POWHSMSRCPATH):$(COMMONPATH):$(HALPATH)