From 4f0c3b8b9e84d649903835bdff14286211b6a1ff Mon Sep 17 00:00:00 2001 From: Mathias Rasmussen Date: Wed, 27 Jan 2021 21:12:12 +0100 Subject: [PATCH] refactor: Make crossbar skip pins on port 2 --- Bluejay.asm | 5 +++++ targets/A.inc | 2 ++ targets/B.inc | 2 ++ targets/C.inc | 2 ++ targets/D.inc | 2 ++ targets/E.inc | 2 ++ targets/F.inc | 2 ++ targets/G.inc | 2 ++ targets/H.inc | 2 ++ targets/I.inc | 2 ++ targets/J.inc | 2 ++ targets/K.inc | 2 ++ targets/L.inc | 2 ++ targets/M.inc | 2 ++ targets/N.inc | 2 ++ targets/O.inc | 2 ++ targets/P.inc | 2 ++ targets/Q.inc | 2 ++ targets/R.inc | 2 ++ targets/S.inc | 2 ++ targets/T.inc | 2 ++ targets/U.inc | 2 ++ targets/V.inc | 2 ++ targets/W.inc | 2 ++ targets/Z.inc | 2 ++ 25 files changed, 53 insertions(+) diff --git a/Bluejay.asm b/Bluejay.asm index 4b148f4..5d59638 100644 --- a/Bluejay.asm +++ b/Bluejay.asm @@ -3512,6 +3512,11 @@ pgm_start: mov P1, #P1_INIT mov P1SKIP, #P1_SKIP mov P2MDOUT, #P2_PUSHPULL +IF MCU_48MHZ == 1 + ; Not available on BB1 + mov P2MDIN, #P2_DIGITAL + mov P2SKIP, #P2_SKIP +ENDIF Initialize_Xbar ; Initialize the XBAR and related functionality call switch_power_off ; Switch power off again, after initializing ports diff --git a/targets/A.inc b/targets/A.inc index 0017b4d..44018a9 100644 --- a/targets/A.inc +++ b/targets/A.inc @@ -128,7 +128,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/B.inc b/targets/B.inc index 8a41594..fa2b460 100644 --- a/targets/B.inc +++ b/targets/B.inc @@ -131,7 +131,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/C.inc b/targets/C.inc index 9b02b91..812f1b2 100644 --- a/targets/C.inc +++ b/targets/C.inc @@ -161,7 +161,9 @@ ENDM ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/D.inc b/targets/D.inc index 2ac3d79..cd389ba 100644 --- a/targets/D.inc +++ b/targets/D.inc @@ -126,7 +126,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/E.inc b/targets/E.inc index 0d4023c..0bee447 100644 --- a/targets/E.inc +++ b/targets/E.inc @@ -126,7 +126,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/F.inc b/targets/F.inc index 9b7beb8..5dd2236 100644 --- a/targets/F.inc +++ b/targets/F.inc @@ -126,7 +126,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/G.inc b/targets/G.inc index f02384a..e47c4c4 100644 --- a/targets/G.inc +++ b/targets/G.inc @@ -126,7 +126,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/H.inc b/targets/H.inc index 2d90764..5ae6a56 100644 --- a/targets/H.inc +++ b/targets/H.inc @@ -131,7 +131,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/I.inc b/targets/I.inc index 618b843..ee67c3f 100644 --- a/targets/I.inc +++ b/targets/I.inc @@ -123,7 +123,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/J.inc b/targets/J.inc index 0a8c854..1dd9446 100644 --- a/targets/J.inc +++ b/targets/J.inc @@ -121,7 +121,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/K.inc b/targets/K.inc index 544e578..ca64436 100644 --- a/targets/K.inc +++ b/targets/K.inc @@ -126,7 +126,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/L.inc b/targets/L.inc index bdae5a6..a943494 100644 --- a/targets/L.inc +++ b/targets/L.inc @@ -121,7 +121,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/M.inc b/targets/M.inc index 9c99033..2ab7d62 100644 --- a/targets/M.inc +++ b/targets/M.inc @@ -128,7 +128,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/N.inc b/targets/N.inc index e193e20..4873702 100644 --- a/targets/N.inc +++ b/targets/N.inc @@ -131,7 +131,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/O.inc b/targets/O.inc index 03f672c..18d4696 100644 --- a/targets/O.inc +++ b/targets/O.inc @@ -124,7 +124,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/P.inc b/targets/P.inc index 5406a70..1a9b589 100644 --- a/targets/P.inc +++ b/targets/P.inc @@ -128,7 +128,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/Q.inc b/targets/Q.inc index 5c772db..ce34806 100644 --- a/targets/Q.inc +++ b/targets/Q.inc @@ -160,7 +160,9 @@ ENDM ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/R.inc b/targets/R.inc index cc99bbd..a9bc9ea 100644 --- a/targets/R.inc +++ b/targets/R.inc @@ -125,7 +125,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/S.inc b/targets/S.inc index 27fd2cc..b1d07c7 100644 --- a/targets/S.inc +++ b/targets/S.inc @@ -129,7 +129,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/T.inc b/targets/T.inc index a73186e..14f5e76 100644 --- a/targets/T.inc +++ b/targets/T.inc @@ -131,7 +131,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/U.inc b/targets/U.inc index f057f7d..7c4717f 100644 --- a/targets/U.inc +++ b/targets/U.inc @@ -128,7 +128,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/V.inc b/targets/V.inc index bedb0f4..fd505d7 100644 --- a/targets/V.inc +++ b/targets/V.inc @@ -165,7 +165,9 @@ ENDM ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/W.inc b/targets/W.inc index e738f98..813d2fd 100644 --- a/targets/W.inc +++ b/targets/W.inc @@ -192,7 +192,9 @@ ENDM ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;********************** diff --git a/targets/Z.inc b/targets/Z.inc index b28f4de..ad81ee0 100644 --- a/targets/Z.inc +++ b/targets/Z.inc @@ -130,7 +130,9 @@ P1_SKIP EQU 0FFh ;********************* DebugPin EQU 0 ;o +P2_DIGITAL EQU (1 SHL DebugPin) P2_PUSHPULL EQU (1 SHL DebugPin) +P2_SKIP EQU 0FFh ;**********************