Change in ...osmo-ccid-firmware[master]: ASF: update E54 SERCOM library
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/14392 )
Change subject: ASF: update E54 SERCOM library
..
ASF: update E54 SERCOM library
E54 ASFv4 change from backend 1.5.122
update local files to stay in sync
Change-Id: Iabeb2b94d51743a0347ea81fef8fa6236d8b12c0
---
M sysmoOCTSIM/hri/hri_sercom_e54.h
1 file changed, 19 insertions(+), 19 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/sysmoOCTSIM/hri/hri_sercom_e54.h b/sysmoOCTSIM/hri/hri_sercom_e54.h
index f5a52b0..fed00ff 100644
--- a/sysmoOCTSIM/hri/hri_sercom_e54.h
+++ b/sysmoOCTSIM/hri/hri_sercom_e54.h
@@ -3,7 +3,7 @@
*
* \brief SAM SERCOM
*
- * Copyright (c) 2016-2018 Microchip Technology Inc. and its subsidiaries.
+ * Copyright (c) 2016-2019 Microchip Technology Inc. and its subsidiaries.
*
* \asf_license_start
*
@@ -3682,7 +3682,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg |= SERCOM_I2CM_CTRLB_SMEN;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3702,7 +3702,7 @@
tmp &= ~SERCOM_I2CM_CTRLB_SMEN;
tmp |= value << SERCOM_I2CM_CTRLB_SMEN_Pos;
((Sercom *)hw)->I2CM.CTRLB.reg = tmp;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3710,7 +3710,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg &= ~SERCOM_I2CM_CTRLB_SMEN;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3718,7 +3718,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg ^= SERCOM_I2CM_CTRLB_SMEN;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3726,7 +3726,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg |= SERCOM_I2CM_CTRLB_QCEN;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3746,7 +3746,7 @@
tmp &= ~SERCOM_I2CM_CTRLB_QCEN;
tmp |= value << SERCOM_I2CM_CTRLB_QCEN_Pos;
((Sercom *)hw)->I2CM.CTRLB.reg = tmp;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3754,7 +3754,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg &= ~SERCOM_I2CM_CTRLB_QCEN;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3762,7 +3762,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg ^= SERCOM_I2CM_CTRLB_QCEN;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3770,7 +3770,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg |= SERCOM_I2CM_CTRLB_ACKACT;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3790,7 +3790,7 @@
tmp &= ~SERCOM_I2CM_CTRLB_ACKACT;
tmp |= value << SERCOM_I2CM_CTRLB_ACKACT_Pos;
((Sercom *)hw)->I2CM.CTRLB.reg = tmp;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3798,7 +3798,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg &= ~SERCOM_I2CM_CTRLB_ACKACT;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3806,7 +3806,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg ^= SERCOM_I2CM_CTRLB_ACKACT;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3867,7 +3867,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg |= mask;
-
Change in ...osmo-ccid-firmware[master]: ASF: update E54 SERCOM library
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/14392 ) Change subject: ASF: update E54 SERCOM library .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/14392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Iabeb2b94d51743a0347ea81fef8fa6236d8b12c0 Gerrit-Change-Number: 14392 Gerrit-PatchSet: 1 Gerrit-Owner: Kévin Redon Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 13 Jun 2019 09:42:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: ASF: update E54 SERCOM library
Kévin Redon has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/14392
Change subject: ASF: update E54 SERCOM library
..
ASF: update E54 SERCOM library
E54 ASFv4 change from backend 1.5.122
update local files to stay in sync
Change-Id: Iabeb2b94d51743a0347ea81fef8fa6236d8b12c0
---
M sysmoOCTSIM/hri/hri_sercom_e54.h
1 file changed, 19 insertions(+), 19 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware
refs/changes/92/14392/1
diff --git a/sysmoOCTSIM/hri/hri_sercom_e54.h b/sysmoOCTSIM/hri/hri_sercom_e54.h
index f5a52b0..fed00ff 100644
--- a/sysmoOCTSIM/hri/hri_sercom_e54.h
+++ b/sysmoOCTSIM/hri/hri_sercom_e54.h
@@ -3,7 +3,7 @@
*
* \brief SAM SERCOM
*
- * Copyright (c) 2016-2018 Microchip Technology Inc. and its subsidiaries.
+ * Copyright (c) 2016-2019 Microchip Technology Inc. and its subsidiaries.
*
* \asf_license_start
*
@@ -3682,7 +3682,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg |= SERCOM_I2CM_CTRLB_SMEN;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3702,7 +3702,7 @@
tmp &= ~SERCOM_I2CM_CTRLB_SMEN;
tmp |= value << SERCOM_I2CM_CTRLB_SMEN_Pos;
((Sercom *)hw)->I2CM.CTRLB.reg = tmp;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3710,7 +3710,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg &= ~SERCOM_I2CM_CTRLB_SMEN;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3718,7 +3718,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg ^= SERCOM_I2CM_CTRLB_SMEN;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3726,7 +3726,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg |= SERCOM_I2CM_CTRLB_QCEN;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3746,7 +3746,7 @@
tmp &= ~SERCOM_I2CM_CTRLB_QCEN;
tmp |= value << SERCOM_I2CM_CTRLB_QCEN_Pos;
((Sercom *)hw)->I2CM.CTRLB.reg = tmp;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3754,7 +3754,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg &= ~SERCOM_I2CM_CTRLB_QCEN;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3762,7 +3762,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg ^= SERCOM_I2CM_CTRLB_QCEN;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3770,7 +3770,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg |= SERCOM_I2CM_CTRLB_ACKACT;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3790,7 +3790,7 @@
tmp &= ~SERCOM_I2CM_CTRLB_ACKACT;
tmp |= value << SERCOM_I2CM_CTRLB_ACKACT_Pos;
((Sercom *)hw)->I2CM.CTRLB.reg = tmp;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3798,7 +3798,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg &= ~SERCOM_I2CM_CTRLB_ACKACT;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3806,7 +3806,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg ^= SERCOM_I2CM_CTRLB_ACKACT;
- hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_MASK);
+ hri_sercomi2cm_wait_for_sync(hw, SERCOM_I2CM_SYNCBUSY_SYSOP);
SERCOM_CRITICAL_SECTION_LEAVE();
}
@@ -3867,7 +3867,7 @@
{
SERCOM_CRITICAL_SECTION_ENTER();
((Sercom *)hw)->I2CM.CTRLB.reg |= mask;
-
