ppisa commented on code in PR #17208:
URL: https://github.com/apache/nuttx/pull/17208#discussion_r2462874750
##########
arch/arm/src/samv7/sam_mcan.c:
##########
@@ -4380,14 +4381,10 @@ struct can_dev_s *sam_mcan_initialize(int port)
/* Get the revision of the chip (A or B) */
-#ifdef CONFIG_ARCH_CHIP_PIC32CZCA70
- /* PIC32CZ CA70 series always have revision B MCAN */
-
- priv->rev = 1;
-#else
- regval = getreg32(SAM_CHIPID_CIDR);
- priv->rev = regval & CHIPID_CIDR_VERSION_MASK;
-#endif
+ if (sam_has_revb_periphs())
+ {
+ priv->rev = 1;
Review Comment:
the function` sam_has_revb_periphs` returns true when
`CONFIG_ARCH_CHIP_PIC32CZCA70` is chosen. When not checks if it is PIC32CZCA70
or rev B of SAMv7 and return true for them and the false is returned only for
remaining SAMv7 rev A.
So it is correct and as the `priv` points into global variable it should not
be a problem. But to be explicit, change to
```
priv->rev = sam_has_revb_periphs();
```
is probably better and simpler choice.
##########
arch/arm/src/samv7/sam_chipid.h:
##########
@@ -0,0 +1,65 @@
+/****************************************************************************
+ * arch/arm/src/samv7/sam_chipid.h
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_SAMV7_SAM_CHIPINFO_H
Review Comment:
I agree, the macro should match filename there. But it is corrected in
follow-up commit. These two commits should be squashed into one.
##########
arch/arm/src/samv7/sam_chipid.c:
##########
@@ -0,0 +1,58 @@
+/****************************************************************************
+ * arch/arm/src/samv7/sam_chipid.c
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include "sam_chipid.h"
+#include "hardware/sam_chipid.h"
+#include "arm_internal.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+bool sam_has_revb_periphs(void)
+{
+#ifdef CONFIG_ARCH_CHIP_PIC32CZCA70
+ return true;
+#else
+ uint32_t regval;
+ uint32_t id_arch;
+ uint32_t id_version;
+
+ regval = getreg32(SAM_CHIPID_CIDR);
+ id_arch = (regval & CHIPID_CIDR_ARCH_MASK) >> CHIPID_CIDR_ARCH_SHIFT;
+ id_version = (regval & CHIPID_CIDR_VERSION_MASK)
+ >> CHIPID_CIDR_VERSION_SHIFT;
+
+ /* SAMV7s are identified by 0x10-0x13, thus anything else is PIC32CZ */
+
+ if ((id_arch & 0xfc) != 0x10)
Review Comment:
The `id_arch` is already masked by `CHIPID_CIDR_ARCH_MASK` so I would not
add there numerical mask which has to respect the 8-bit size of the arch field.
I would mask away only ignored bits
```
if ((id_arch & ~3) != 0x10)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
