RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

score: Move formatted I/O functions

Browse Source 
These functions do not belong to an super core service.
This commit is contained in:
Sebastian Huber
2023-07-25 13:34:52 +02:00
parent 4516a5b797
commit 527af2b7f2
17 changed files with 136 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cpukit/score/src/iobase64.c → cpukit/dev/iobase64.c
View File

@@ -3,7 +3,7 @@
/**
* @file
*
* @ingroup RTEMSScoreIO
* @ingroup RTEMSDeviceIO
*
* @brief This source file contains the implementation of
* _IO_Base64() and _IO_Base64url().
@@ -27,7 +27,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
#include <rtems/score/io.h>
#include <rtems/dev/io.h>
static void
_IO_Put(int c, void *arg, IO_Put_char put_char)

4
cpukit/score/src/ioprintf.c → cpukit/dev/ioprintf.c
View File

@@ -3,7 +3,7 @@
/**
* @file
*
* @ingroup RTEMSScoreIO
* @ingroup RTEMSDeviceIO
*
* @brief This source file contains the implementation of
* _IO_Printf().
@@ -38,7 +38,7 @@
#include "config.h"
#endif
#include <rtems/score/io.h>
#include <rtems/dev/io.h>
int _IO_Printf( IO_Put_char put_char, void *arg, char const *fmt, ... )
{

4
cpukit/score/src/iovprintf.c → cpukit/dev/iovprintf.c
View File

@@ -1,7 +1,7 @@
/**
* @file
*
* @ingroup RTEMSScoreIO
* @ingroup RTEMSDeviceIO
*
* @brief This source file contains the implementation of
* _IO_Vprintf().
@@ -45,7 +45,7 @@
* @(#)subr_prf.c 8.3 (Berkeley) 1/21/94
*/
#include <rtems/score/io.h>
#include <rtems/dev/io.h>
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: head/sys/kern/subr_prf.c 336417 2018-07-17 14:56:54Z markj $");

119
cpukit/include/rtems/dev/io.h
View File

@@ -10,7 +10,7 @@
*/
/*
* Copyright (C) 2021 embedded brains GmbH & Co. KG
* Copyright (C) 2017, 2023 embedded brains GmbH & Co. KG
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -37,6 +37,10 @@
#ifndef _RTEMS_DEV_IO_H
#define _RTEMS_DEV_IO_H
#include <rtems/score/basedefs.h>
#include <stdarg.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
@@ -51,6 +55,119 @@ extern "C" {
* @{
*/
/**
* @brief This type defines the put character handler.
*
* @param c is the character to put.
*
* @param arg is the user-provided argument.
*/
typedef void ( *IO_Put_char )( int c, void *arg );
/**
* @brief Prints characters using the put character handler according to the
* format string.
*
* @param put_char is the put character handler.
*
* @param arg is the user-provided argument for the put character handler.
*
* @param fmt is the printf()-style format string.
*
* @param ... is the list of parameters required by the format string.
*
* @return Returns the count of put characters.
*/
int _IO_Printf(
IO_Put_char put_char,
void *arg,
char const *fmt,
...
) RTEMS_PRINTFLIKE( 3, 4 );
/**
* @brief Prints characters using the put character handler according to the
* format string.
*
* @param put_char is the put character handler.
*
* @param arg is the user-provided argument for the put character handler.
*
* @param fmt is the printf()-style format string.
*
* @param ap is the argument list required by the format string.
*
* @return Returns the count of put characters.
*/
int _IO_Vprintf(
IO_Put_char put_char,
void *arg,
char const *fmt,
va_list ap
);
/**
* @brief Outputs the source buffer in base64 encoding.
*
* After word length of output characters produced by the encoding a word break
* is produced.
*
* @param put_char is the put character function used to output the encoded
* source buffer.
*
* @param arg is the argument passed to the put character function.
*
* @param src is the pointer to the source buffer begin.
*
* @param srclen is the length of the source buffer in bytes.
*
* @param wordbreak is the word break string.
*
* @param wordlen is the word length in bytes. If the word length is less than
* four, then a word length of four will be used.
*
* @return Returns the count of output characters.
*/
int _IO_Base64(
IO_Put_char put_char,
void *arg,
const void *src,
size_t len,
const char *wordbreak,
int wordlen
);
/**
* @brief Outputs the source buffer in base64url encoding.
*
* After word length of output characters produced by the encoding a word break
* is produced.
*
* @param put_char is the put character function used to output the encoded
* source buffer.
*
* @param arg is the argument passed to the put character function.
*
* @param src is the pointer to the source buffer begin.
*
* @param srclen is the length of the source buffer in bytes.
*
* @param wordbreak is the word break string.
*
* @param wordlen is the word length in bytes. If the word length is less than
* four, then a word length of four will be used.
*
* @return Returns the count of output characters.
*/
int _IO_Base64url(
IO_Put_char put_char,
void *arg,
const void *src,
size_t len,
const char *wordbreak,
int wordlen
);
/**
* @brief Issues a couple of no-operation instructions.
*

2
cpukit/include/rtems/score/gcov.h
View File

@@ -40,7 +40,7 @@
#include <gcov.h>
#include <rtems/linkersets.h>
#include <rtems/score/io.h>
#include <rtems/dev/io.h>
#ifdef __cplusplus
extern "C" {

142
cpukit/include/rtems/score/io.h
View File

@@ -1,142 +0,0 @@
/* SPDX-License-Identifier: BSD-2-Clause */
/**
* @file
*
* @ingroup RTEMSScoreIO
*
* @brief This header file provides the interfaces of the
* @ref RTEMSScoreIO.
*/
/*
* Copyright (c) 2017 embedded brains GmbH & Co. KG
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 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.
*
* 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.
*/
#ifndef _RTEMS_SCORE_IO_H
#define _RTEMS_SCORE_IO_H
#include <rtems/score/basedefs.h>
#include <stdarg.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/**
* @defgroup RTEMSScoreIO IO Handler
*
* @ingroup RTEMSScore
*
* @brief This group contains the IO Handler implementation.
*
* @{
*/
typedef void ( *IO_Put_char )( int c, void *arg );
int _IO_Printf(
IO_Put_char put_char,
void *arg,
char const *fmt,
...
) RTEMS_PRINTFLIKE( 3, 4 );
int _IO_Vprintf(
IO_Put_char put_char,
void *arg,
char const *fmt,
va_list ap
);
/**
* @brief Outputs the source buffer in base64 encoding.
*
* After word length of output characters produced by the encoding a word break
* is produced.
*
* @param put_char is the put character function used to output the encoded
* source buffer.
*
* @param arg is the argument passed to the put character function.
*
* @param src is the pointer to the source buffer begin.
*
* @param srclen is the length of the source buffer in bytes.
*
* @param wordbreak is the word break string.
*
* @param wordlen is the word length in bytes. If the word length is less than
* four, then a word length of four will be used.
*
* @return Returns the count of output characters.
*/
int _IO_Base64(
IO_Put_char put_char,
void *arg,
const void *src,
size_t len,
const char *wordbreak,
int wordlen
);
/**
* @brief Outputs the source buffer in base64url encoding.
*
* After word length of output characters produced by the encoding a word break
* is produced.
*
* @param put_char is the put character function used to output the encoded
* source buffer.
*
* @param arg is the argument passed to the put character function.
*
* @param src is the pointer to the source buffer begin.
*
* @param srclen is the length of the source buffer in bytes.
*
* @param wordbreak is the word break string.
*
* @param wordlen is the word length in bytes. If the word length is less than
* four, then a word length of four will be used.
*
* @return Returns the count of output characters.
*/
int _IO_Base64url(
IO_Put_char put_char,
void *arg,
const void *src,
size_t len,
const char *wordbreak,
int wordlen
);
/** @} */
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* _RTEMS_SCORE_IO_H */

2
cpukit/libcsupport/src/vprintk.c
View File

@@ -38,7 +38,7 @@
#endif
#include <rtems/bspIo.h>
#include <rtems/score/io.h>
#include <rtems/dev/io.h>
int vprintk( const char *fmt, va_list ap )
{

2
cpukit/libtest/t-test-hash-sha256.c
View File

@@ -35,7 +35,7 @@
*/
#include <rtems/test.h>
#include <rtems/score/io.h>
#include <rtems/dev/io.h>
#include <limits.h>

2
cpukit/libtest/t-test.c
View File

@@ -46,7 +46,7 @@
#include <stdatomic.h>
#ifdef __rtems__
#include <rtems/score/io.h>
#include <rtems/dev/io.h>
#include <rtems/score/percpu.h>
#include <rtems/score/smp.h>
#include <rtems/score/threadimpl.h>

2
cpukit/libtrace/record/record-dump-base64.c
View File

@@ -30,7 +30,7 @@
#endif
#include <rtems/recorddump.h>
#include <rtems/score/io.h>
#include <rtems/dev/io.h>
#include <limits.h>
#include <string.h>

2
cpukit/libtrace/record/record-dump-zbase64.c
View File

@@ -30,7 +30,7 @@
#endif
#include <rtems/recorddump.h>
#include <rtems/score/io.h>
#include <rtems/dev/io.h>
#include <limits.h>
#include <string.h>

2
cpukit/score/cpu/aarch64/aarch64-exception-frame-print.c
View File

@@ -45,7 +45,7 @@
#include <inttypes.h>
#include <rtems/score/cpu.h>
#include <rtems/score/io.h>
#include <rtems/dev/io.h>
#include <rtems/bspIo.h>
typedef struct {

2
cpukit/score/src/hash.c
View File

@@ -39,7 +39,7 @@
#include <rtems/score/hash.h>
#include <rtems/score/assert.h>
#include <rtems/score/io.h>
#include <rtems/dev/io.h>
#include <limits.h>

7
spec/build/cpukit/librtemscpu.yml
View File

@@ -351,7 +351,6 @@ install:
- cpukit/include/rtems/score/heapimpl.h
- cpukit/include/rtems/score/heapinfo.h
- cpukit/include/rtems/score/interr.h
- cpukit/include/rtems/score/io.h
- cpukit/include/rtems/score/isr.h
- cpukit/include/rtems/score/isrlevel.h
- cpukit/include/rtems/score/isrlock.h
@@ -535,7 +534,10 @@ source:
- cpukit/dev/i2c/ti-lm25066a.c
- cpukit/dev/i2c/ti-tmp112.c
- cpukit/dev/i2c/xilinx-axi-i2c.c
- cpukit/dev/iobase64.c
- cpukit/dev/ioprintf.c
- cpukit/dev/iorelax.c
- cpukit/dev/iovprintf.c
- cpukit/dev/serial/sc16is752-spi.c
- cpukit/dev/serial/sc16is752.c
- cpukit/dev/spi/spi-bus.c
@@ -1427,9 +1429,6 @@ source:
- cpukit/score/src/heapsizeofuserarea.c
- cpukit/score/src/heapwalk.c
- cpukit/score/src/interr.c
- cpukit/score/src/iobase64.c
- cpukit/score/src/ioprintf.c
- cpukit/score/src/iovprintf.c
- cpukit/score/src/isr.c
- cpukit/score/src/isrisinprogress.c
- cpukit/score/src/isrvectortable.c

2
testsuites/sptests/spprintk/init.c
View File

@@ -32,7 +32,7 @@
#include "config.h"
#endif
#include <rtems/score/io.h>
#include <rtems/dev/io.h>
/*
* Undefined the RTEMS_PRINTFLIKE and make it nothing. The test code

1
testsuites/validation/tc-task-delete.c
View File

@@ -57,7 +57,6 @@
#include <setjmp.h>
#include <rtems/bspIo.h>
#include <rtems/test-scheduler.h>
#include <rtems/score/io.h>
#include <rtems/score/statesimpl.h>
#include <rtems/score/threaddispatch.h>
#include <rtems/score/threadimpl.h>

1
testsuites/validation/tc-terminate.c
View File

@@ -58,7 +58,6 @@
#include <rtems/bspIo.h>
#include <rtems/test-info.h>
#include <rtems/score/atomic.h>
#include <rtems/score/io.h>
#include <rtems/score/percpu.h>
#include <rtems/score/sysstate.h>