You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/03/22 13:24:26 UTC
[incubator-nuttx] 10/12: syscall/: Remove support for
CONFIG_FS_READABLE
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit d22b22a23f43a7c8c890c3e53b5a80fbc26b0167
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Sat Mar 21 11:02:42 2020 -0600
syscall/: Remove support for CONFIG_FS_READABLE
---
include/sys/syscall.h | 62 ++++++++++++++++--------------------------------
syscall/syscall.csv | 2 +-
syscall/syscall_lookup.h | 41 ++++++++++----------------------
3 files changed, 34 insertions(+), 71 deletions(-)
diff --git a/include/sys/syscall.h b/include/sys/syscall.h
index 8f643cf..14c2309 100644
--- a/include/sys/syscall.h
+++ b/include/sys/syscall.h
@@ -2,35 +2,20 @@
* include/sys/syscall.h
* This file contains the system call numbers.
*
- * Copyright (C) 2011-2019, 2020 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
+ * 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
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * 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.
*
****************************************************************************/
@@ -414,20 +399,15 @@
#endif
#if !defined(CONFIG_DISABLE_MOUNTPOINT)
-#if defined(CONFIG_FS_READABLE)
-# define SYS_mount (__SYS_mountpoint + 0)
-# define __SYS_fs (__SYS_mountpoint + 1)
-#else
-# define __SYS_fs (__SYS_mountpoint + 0)
-#endif
-# define SYS_fsync (__SYS_fs + 0)
-# define SYS_ftruncate (__SYS_fs + 1)
-# define SYS_mkdir (__SYS_fs + 2)
-# define SYS_rename (__SYS_fs + 3)
-# define SYS_rmdir (__SYS_fs + 4)
-# define SYS_umount2 (__SYS_fs + 5)
-# define SYS_unlink (__SYS_fs + 6)
-# define __SYS_shm (__SYS_fs + 7)
+# define SYS_mount (__SYS_mountpoint + 0)
+# define SYS_fsync (__SYS_mountpoint + 1)
+# define SYS_ftruncate (__SYS_mountpoint + 2)
+# define SYS_mkdir (__SYS_mountpoint + 3)
+# define SYS_rename (__SYS_mountpoint + 4)
+# define SYS_rmdir (__SYS_mountpoint + 5)
+# define SYS_umount2 (__SYS_mountpoint + 6)
+# define SYS_unlink (__SYS_mountpoint + 7)
+# define __SYS_shm (__SYS_mountpoint + 8)
#else
# define __SYS_shm __SYS_mountpoint
#endif
diff --git a/syscall/syscall.csv b/syscall/syscall.csv
index 85ec82e..ab24d4e 100644
--- a/syscall/syscall.csv
+++ b/syscall/syscall.csv
@@ -53,7 +53,7 @@
"mmap","sys/mman.h","","FAR void*","FAR void*","size_t","int","int","int","off_t"
"munmap","sys/mman.h","defined(CONFIG_FS_RAMMAP)","int","FAR void *","size_t"
"modhandle","nuttx/module.h","defined(CONFIG_MODULE)","FAR void *","FAR const char *"
-"mount","sys/mount.h","!defined(CONFIG_DISABLE_MOUNTPOINT) && defined(CONFIG_FS_READABLE)","int","const char*","const char*","const char*","unsigned long","const void*"
+"mount","sys/mount.h","!defined(CONFIG_DISABLE_MOUNTPOINT)","int","const char*","const char*","const char*","unsigned long","const void*"
"mq_close","mqueue.h","!defined(CONFIG_DISABLE_MQUEUE)","int","mqd_t"
"mq_getattr","mqueue.h","!defined(CONFIG_DISABLE_MQUEUE)","int","mqd_t","struct mq_attr *"
"mq_notify","mqueue.h","!defined(CONFIG_DISABLE_MQUEUE)","int","mqd_t","const struct sigevent*"
diff --git a/syscall/syscall_lookup.h b/syscall/syscall_lookup.h
index b42f465..0e85d59 100644
--- a/syscall/syscall_lookup.h
+++ b/syscall/syscall_lookup.h
@@ -1,35 +1,20 @@
/****************************************************************************
* syscall/syscall_lookup.h
*
- * Copyright (C) 2011, 2013-2019, 2020 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
+ * 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
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * 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.
*
****************************************************************************/
@@ -290,9 +275,7 @@ SYSCALL_LOOKUP(up_assert, 2, STUB_up_assert)
#endif
#if !defined(CONFIG_DISABLE_MOUNTPOINT)
-# if defined(CONFIG_FS_READABLE)
SYSCALL_LOOKUP(mount, 5, STUB_mount)
-# endif
SYSCALL_LOOKUP(fsync, 1, STUB_fsync)
SYSCALL_LOOKUP(ftruncate, 2, STUB_ftruncate)
SYSCALL_LOOKUP(mkdir, 2, STUB_mkdir)