[PATCH] score: Unify <rtems/score/cpuatomic.h>

Chris Johns chrisj at rtems.org
Thu May 25 06:07:34 UTC 2023


On 25/5/2023 3:51 pm, Sebastian Huber wrote:
> 
> 
> On 25.05.23 02:11, Chris Johns wrote:
>> On 24/5/2023 11:00 pm, Sebastian Huber wrote:
>>> All CPU ports use the same file.
>>> ---
>>>   .../aarch64/include/rtems/score/cpuatomic.h   |  8 ++---
>>>   .../cpu/arm/include/rtems/score/cpuatomic.h   | 11 +++++-
>>>   .../cpu/bfin/include/rtems/score/cpuatomic.h  | 36 ++++++++++++++++---
>>>   .../cpu/i386/include/rtems/score/cpuatomic.h  | 11 +++++-
>>>   .../cpu/lm32/include/rtems/score/cpuatomic.h  | 36 ++++++++++++++++---
>>>   .../cpu/m68k/include/rtems/score/cpuatomic.h  | 11 +++++-
>>>   .../include/rtems/score/cpuatomic.h           |  7 ++--
>>>   .../cpu/mips/include/rtems/score/cpuatomic.h  | 11 +++++-
>>>   .../cpu/moxie/include/rtems/score/cpuatomic.h | 11 +++++-
>>>   .../cpu/nios2/include/rtems/score/cpuatomic.h | 11 +++++-
>>>   .../cpu/or1k/include/rtems/score/cpuatomic.h  | 11 +++++-
>>>   .../powerpc/include/rtems/score/cpuatomic.h   | 11 +++++-
>>>   .../cpu/riscv/include/rtems/score/cpuatomic.h | 33 +++++++++++------
>>>   .../cpu/sh/include/rtems/score/cpuatomic.h    | 36 ++++++++++++++++---
>>>   .../cpu/sparc/include/rtems/score/cpuatomic.h |  7 ++--
>>>   .../sparc64/include/rtems/score/cpuatomic.h   | 11 +++++-
>>>   .../cpu/v850/include/rtems/score/cpuatomic.h  | 11 +++++-
>>>   .../x86_64/include/rtems/score/cpuatomic.h    | 36 ++++++++++++++++---
>>>   18 files changed, 261 insertions(+), 48 deletions(-)
>>>
>>> diff --git a/cpukit/score/cpu/aarch64/include/rtems/score/cpuatomic.h
>>> b/cpukit/score/cpu/aarch64/include/rtems/score/cpuatomic.h
>>> index ed8091d73c..772d496741 100644
>>> --- a/cpukit/score/cpu/aarch64/include/rtems/score/cpuatomic.h
>>> +++ b/cpukit/score/cpu/aarch64/include/rtems/score/cpuatomic.h
>>> @@ -3,14 +3,14 @@
>>>   /**
>>>    * @file
>>>    *
>>> - * @ingroup RTEMSScoreCPU
>>> + * @ingroup RTEMSScoreAtomicCPU
>>>    *
>>> - * @brief AArch64 Atomics support
>>> + * @brief This header file provides interfaces of the atomic operations
>>> + *   implementation using functions provided by the C11/C++11.
>>>    */
>>>     /*
>>> - * Copyright (C) 2020 On-Line Applications Research Corporation (OAR)
>>> - * Written by Kinsey Moore<kinsey.moore at oarcorp.com>
>>> + * Copyright (C) 2012, 2013 Deng Hengyi
>> Is this change correct?
> 
> Yes, the file contains no copyrightable content from OAR. It hardly contains any
> copyrightable content at all.

Thanks

>>>    *
>>>    * Redistribution and use in source and binary forms, with or without
>>>    * modification, are permitted provided that the following conditions
>>> diff --git a/cpukit/score/cpu/arm/include/rtems/score/cpuatomic.h
>>> b/cpukit/score/cpu/arm/include/rtems/score/cpuatomic.h
>>> index 01bb99cda3..772d496741 100644
>>> --- a/cpukit/score/cpu/arm/include/rtems/score/cpuatomic.h
>>> +++ b/cpukit/score/cpu/arm/include/rtems/score/cpuatomic.h
>>> @@ -1,7 +1,16 @@
>>>   /* SPDX-License-Identifier: BSD-2-Clause */
>>>   +/**
>>> + * @file
>>> + *
>>> + * @ingroup RTEMSScoreAtomicCPU
>>> + *
>>> + * @brief This header file provides interfaces of the atomic operations
>>> + *   implementation using functions provided by the C11/C++11.
>>> + */
>>> +
>>>   /*
>>> - * COPYRIGHT (c) 2012-2013 Deng Hengyi.
>>> + * Copyright (C) 2012, 2013 Deng Hengyi
>> Why are these lines changing? Can we edit this as the license clearly states it
>> must be retained as is?
> 
> We have a copyright line template:
> 
> https://docs.rtems.org/branches/master/eng/coding-file-hdr.html#copyright-and-license-block
> 
> Independent of this, it seems we didn't have a permission from Deng Hengyi to
> switch to BSD-2-Clause license:
> 
> https://devel.rtems.org/ticket/3053
> 

Ah OK. I was not wanting to open any rabbit holes. I was just wanting to have
something listed.

Chris


More information about the devel mailing list