Simplify the license rows, standardize header macro name

8 files changed, 47 insertions, 158 deletions

diff --git a/common/usb_dc.h b/common/usb_dc.h
index 4caf8705..b11f8a68 100644
--- a/common/usb_dc.h
+++ b/common/usb_dc.h
@@ -1,27 +1,10 @@
-/**
- * @file usb_dc.h
- * @brief
- *
- * Copyright (c) 2022 sakumisu
- *
- * 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.
+/*
+ * Copyright (c) 2022, sakumisu
  *
+ * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _USB_DC_H
-#define _USB_DC_H
+#ifndef USB_DC_H
+#define USB_DC_H
 
 #include <stdint.h>
 
@@ -182,4 +165,4 @@ void usbd_event_ep_out_complete_handler(uint8_t ep, uint32_t nbytes);
 }
 #endif
 
-#endif
+#endif /* USB_DC_H */
diff --git a/common/usb_def.h b/common/usb_def.h
index c4042733..9e3fc41a 100644
--- a/common/usb_def.h
+++ b/common/usb_def.h
@@ -1,24 +1,7 @@
-/**
- * @file usb_def.h
- * @brief
- *
- * Copyright (c) 2022 sakumisu
- *
- * 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.
+/*
+ * Copyright (c) 2022, sakumisu
  *
+ * SPDX-License-Identifier: Apache-2.0
  */
 #ifndef USB_DEF_H
 #define USB_DEF_H
@@ -702,4 +685,4 @@ struct usb_desc_header {
     WBVAL(id)                   /* wLangID0 */
 // clang-format on
 
-#endif
+#endif /* USB_DEF_H */
diff --git a/common/usb_errno.h b/common/usb_errno.h
index 7ccadb6c..aef08e51 100644
--- a/common/usb_errno.h
+++ b/common/usb_errno.h
@@ -1,23 +1,9 @@
-/****************************************************************************
- * include/errno.h
- *
- * 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.
+/*
+ * Apache NuttX
+ * Copyright 2020 The Apache Software Foundation
  *
- ****************************************************************************/
-
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #ifndef __INCLUDE_ERRNO_H
 #define __INCLUDE_ERRNO_H
 
diff --git a/common/usb_hc.h b/common/usb_hc.h
index 5896387d..7d464eca 100644
--- a/common/usb_hc.h
+++ b/common/usb_hc.h
@@ -1,27 +1,10 @@
-/**
- * @file usb_hc.h
- * @brief
- *
- * Copyright (c) 2022 sakumisu
- *
- * 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.
+/*
+ * Copyright (c) 2022, sakumisu
  *
+ * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _USB_HC_H
-#define _USB_HC_H
+#ifndef USB_HC_H
+#define USB_HC_H
 
 #include <stdint.h>
 
@@ -220,4 +203,4 @@ void usbh_event_notify_handler(uint8_t event, uint8_t rhport);
 }
 #endif
 
-#endif
+#endif /* USB_HC_H */
diff --git a/common/usb_list.h b/common/usb_list.h
index 55111fda..228dc6f3 100644
--- a/common/usb_list.h
+++ b/common/usb_list.h
@@ -1,27 +1,10 @@
-/**
- * @file usb_list.h
- * @brief
- *
- * Copyright (c) 2022 sakumisu
- *
- * 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.
+/*
+ * Copyright (c) 2022, sakumisu
  *
+ * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef __USB_LIST_H__
-#define __USB_LIST_H__
+#ifndef USB_LIST_H
+#define USB_LIST_H
 
 #include <string.h>
 #include <stdint.h>
@@ -470,4 +453,4 @@ static inline unsigned int usb_dlist_len(const usb_dlist_t *l)
 }
 #endif
 
-#endif
+#endif /* USB_LIST_H */
diff --git a/common/usb_log.h b/common/usb_log.h
index 1471caae..45ad9e17 100644
--- a/common/usb_log.h
+++ b/common/usb_log.h
@@ -1,5 +1,10 @@
-#ifndef _USB_LOG_H
-#define _USB_LOG_H
+/*
+ * Copyright (c) 2022, sakumisu
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef USB_LOG_H
+#define USB_LOG_H
 
 #include <stdio.h>
 
@@ -84,4 +89,4 @@ void usb_assert(const char *filename, int linenum);
             usb_assert(__FILE__, __LINE__); \
     } while (0)
 
-#endif
+#endif /* USB_LOG_H */
diff --git a/common/usb_mem.h b/common/usb_mem.h
index 928690cc..5a39e5dd 100644
--- a/common/usb_mem.h
+++ b/common/usb_mem.h
@@ -1,27 +1,10 @@
-/**
- * @file usb_mem.h
- * @brief
- *
- * Copyright (c) 2022 sakumisu
- *
- * 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.
+/*
+ * Copyright (c) 2022, sakumisu
  *
+ * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _USB_MEM_H
-#define _USB_MEM_H
+#ifndef USB_MEM_H
+#define USB_MEM_H
 
 #define usb_malloc(size) malloc(size)
 #define usb_free(ptr)    free(ptr)
@@ -94,4 +77,4 @@ void usb_dcache_clean_invalidate(uintptr_t addr, uint32_t len);
 #define usb_dcache_clean_invalidate(addr, len)
 #endif
 
-#endif
+#endif /* USB_MEM_H */
diff --git a/common/usb_util.h b/common/usb_util.h
index cef8915a..790dfe54 100644
--- a/common/usb_util.h
+++ b/common/usb_util.h
@@ -1,27 +1,10 @@
-/**
- * @file usb_util.h
- * @brief
- *
- * Copyright (c) 2022 sakumisu
- *
- * 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.
+/*
+ * Copyright (c) 2022, sakumisu
  *
+ * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _USB_UTIL_H
-#define _USB_UTIL_H
+#ifndef USB_UTIL_H
+#define USB_UTIL_H
 
 #if defined(__CC_ARM)
 #ifndef __USED
@@ -220,4 +203,4 @@
         19, 18, 17, 16, 15, 14, 13, 12, 11, 10, \
         9, 8, 7, 6, 5, 4, 3, 2, 1, 0
 
-#endif
+#endif /* USB_UTIL_H */