[nuttx] 01/02: syslog: Remove syslog_force and related stuff

[ac...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit e62c915972bf0b4e0163a6a6c42f264646615d5d
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Jun 21 08:08:08 2023 +0800

    syslog: Remove syslog_force and related stuff
    
    syslog_force is used to force the syslog output to the
    console in interrupt context, but we can use syslog_write
    to do the same(and more) thing.
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 drivers/syslog/Make.defs      |  2 +-
 drivers/syslog/syslog_force.c | 83 -------------------------------------------
 include/nuttx/syslog/syslog.h | 19 ----------
 3 files changed, 1 insertion(+), 103 deletions(-)

diff --git a/drivers/syslog/Make.defs b/drivers/syslog/Make.defs
index 44406eea4f..607f1c373e 100644
--- a/drivers/syslog/Make.defs
+++ b/drivers/syslog/Make.defs
@@ -22,7 +22,7 @@
 # Include SYSLOG Infrastructure
 
 CSRCS += vsyslog.c syslog_channel.c syslog_putc.c
-CSRCS += syslog_write.c syslog_force.c syslog_flush.c
+CSRCS += syslog_write.c syslog_flush.c
 
 ifeq ($(CONFIG_SYSLOG_INTBUFFER),y)
   CSRCS += syslog_intbuffer.c
diff --git a/drivers/syslog/syslog_force.c b/drivers/syslog/syslog_force.c
deleted file mode 100644
index e254a5585a..0000000000
--- a/drivers/syslog/syslog_force.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
- * drivers/syslog/syslog_force.c
- *
- * 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 <nuttx/config.h>
-
-#include <sys/types.h>
-#include <stdbool.h>
-#include <assert.h>
-
-#include <nuttx/syslog/syslog.h>
-
-#include "syslog.h"
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: syslog_force
- *
- * Description:
- *   This is the low-level system logging interface.  This version forces
- *   the output and is only used in emergency situations (e.g., in assertion
- *   handling).
- *
- * Input Parameters:
- *   ch - The character to add to the SYSLOG (must be positive).
- *
- * Returned Value:
- *   On success, the character is echoed back to the caller. A negated errno
- *   value is returned on any failure.
- *
- ****************************************************************************/
-
-int syslog_force(int ch)
-{
-  int i;
-
-#ifdef CONFIG_SYSLOG_INTBUFFER
-  /* Flush any characters that may have been added to the interrupt
-   * buffer through the emergency channel
-   */
-
-  syslog_flush_intbuffer(true);
-#endif
-
-  for (i = 0; i < CONFIG_SYSLOG_MAX_CHANNELS; i++)
-    {
-      if (g_syslog_channel[i] == NULL)
-        {
-          break;
-        }
-
-      DEBUGASSERT(g_syslog_channel[i]->sc_ops->sc_force != NULL);
-
-      /* Then send the character to the emergency channel */
-
-      g_syslog_channel[i]->sc_ops->sc_force(g_syslog_channel[i], ch);
-    }
-
-  return ch;
-}
diff --git a/include/nuttx/syslog/syslog.h b/include/nuttx/syslog/syslog.h
index b0b480e3a4..eebd617da6 100644
--- a/include/nuttx/syslog/syslog.h
+++ b/include/nuttx/syslog/syslog.h
@@ -333,25 +333,6 @@ ssize_t syslog_write(FAR const char *buffer, size_t buflen);
 
 int syslog_flush(void);
 
-/****************************************************************************
- * Name: syslog_force
- *
- * Description:
- *   This is the low-level system logging interface.  This version forces
- *   the output and is only used in emergency situations (e.g., in assertion
- *   handling).
- *
- * Input Parameters:
- *   ch - The character to add to the SYSLOG (must be positive).
- *
- * Returned Value:
- *   On success, the character is echoed back to the caller. A negated errno
- *   value is returned on any failure.
- *
- ****************************************************************************/
-
-int syslog_force(int ch);
-
 /****************************************************************************
  * Name: nx_vsyslog
  *