lkml.org 
[lkml]   [2021]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v9 25/33] counter: Move counter enums to uapi header
    Date
    This is in preparation for a subsequent patch implementing a character
    device interface for the Counter subsystem.

    Reviewed-by: David Lechner <david@lechnology.com>
    Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
    ---
    MAINTAINERS | 1 +
    include/linux/counter.h | 42 +--------------------------
    include/uapi/linux/counter.h | 56 ++++++++++++++++++++++++++++++++++++
    3 files changed, 58 insertions(+), 41 deletions(-)
    create mode 100644 include/uapi/linux/counter.h

    diff --git a/MAINTAINERS b/MAINTAINERS
    index 1508db256784..93233a07f5aa 100644
    --- a/MAINTAINERS
    +++ b/MAINTAINERS
    @@ -4581,6 +4581,7 @@ F: Documentation/ABI/testing/sysfs-bus-counter
    F: Documentation/driver-api/generic-counter.rst
    F: drivers/counter/
    F: include/linux/counter.h
    +F: include/uapi/linux/counter.h

    CPMAC ETHERNET DRIVER
    M: Florian Fainelli <f.fainelli@gmail.com>
    diff --git a/include/linux/counter.h b/include/linux/counter.h
    index e7fd6d81a929..eee85db8e332 100644
    --- a/include/linux/counter.h
    +++ b/include/linux/counter.h
    @@ -9,6 +9,7 @@
    #include <linux/device.h>
    #include <linux/kernel.h>
    #include <linux/types.h>
    +#include <uapi/linux/counter.h>

    struct counter_device;
    struct counter_count;
    @@ -27,47 +28,6 @@ enum counter_comp_type {
    COUNTER_COMP_COUNT_MODE,
    };

    -enum counter_scope {
    - COUNTER_SCOPE_DEVICE,
    - COUNTER_SCOPE_SIGNAL,
    - COUNTER_SCOPE_COUNT,
    -};
    -
    -enum counter_count_direction {
    - COUNTER_COUNT_DIRECTION_FORWARD,
    - COUNTER_COUNT_DIRECTION_BACKWARD,
    -};
    -
    -enum counter_count_mode {
    - COUNTER_COUNT_MODE_NORMAL,
    - COUNTER_COUNT_MODE_RANGE_LIMIT,
    - COUNTER_COUNT_MODE_NON_RECYCLE,
    - COUNTER_COUNT_MODE_MODULO_N,
    -};
    -
    -enum counter_function {
    - COUNTER_FUNCTION_INCREASE,
    - COUNTER_FUNCTION_DECREASE,
    - COUNTER_FUNCTION_PULSE_DIRECTION,
    - COUNTER_FUNCTION_QUADRATURE_X1_A,
    - COUNTER_FUNCTION_QUADRATURE_X1_B,
    - COUNTER_FUNCTION_QUADRATURE_X2_A,
    - COUNTER_FUNCTION_QUADRATURE_X2_B,
    - COUNTER_FUNCTION_QUADRATURE_X4,
    -};
    -
    -enum counter_signal_level {
    - COUNTER_SIGNAL_LEVEL_LOW,
    - COUNTER_SIGNAL_LEVEL_HIGH,
    -};
    -
    -enum counter_synapse_action {
    - COUNTER_SYNAPSE_ACTION_NONE,
    - COUNTER_SYNAPSE_ACTION_RISING_EDGE,
    - COUNTER_SYNAPSE_ACTION_FALLING_EDGE,
    - COUNTER_SYNAPSE_ACTION_BOTH_EDGES,
    -};
    -
    /**
    * struct counter_comp - Counter component node
    * @type: Counter component data type
    diff --git a/include/uapi/linux/counter.h b/include/uapi/linux/counter.h
    new file mode 100644
    index 000000000000..6113938a6044
    --- /dev/null
    +++ b/include/uapi/linux/counter.h
    @@ -0,0 +1,56 @@
    +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
    +/*
    + * Userspace ABI for Counter character devices
    + * Copyright (C) 2020 William Breathitt Gray
    + */
    +#ifndef _UAPI_COUNTER_H_
    +#define _UAPI_COUNTER_H_
    +
    +/* Component scope definitions */
    +enum counter_scope {
    + COUNTER_SCOPE_DEVICE,
    + COUNTER_SCOPE_SIGNAL,
    + COUNTER_SCOPE_COUNT,
    +};
    +
    +/* Count direction values */
    +enum counter_count_direction {
    + COUNTER_COUNT_DIRECTION_FORWARD,
    + COUNTER_COUNT_DIRECTION_BACKWARD,
    +};
    +
    +/* Count mode values */
    +enum counter_count_mode {
    + COUNTER_COUNT_MODE_NORMAL,
    + COUNTER_COUNT_MODE_RANGE_LIMIT,
    + COUNTER_COUNT_MODE_NON_RECYCLE,
    + COUNTER_COUNT_MODE_MODULO_N,
    +};
    +
    +/* Count function values */
    +enum counter_function {
    + COUNTER_FUNCTION_INCREASE,
    + COUNTER_FUNCTION_DECREASE,
    + COUNTER_FUNCTION_PULSE_DIRECTION,
    + COUNTER_FUNCTION_QUADRATURE_X1_A,
    + COUNTER_FUNCTION_QUADRATURE_X1_B,
    + COUNTER_FUNCTION_QUADRATURE_X2_A,
    + COUNTER_FUNCTION_QUADRATURE_X2_B,
    + COUNTER_FUNCTION_QUADRATURE_X4,
    +};
    +
    +/* Signal values */
    +enum counter_signal_level {
    + COUNTER_SIGNAL_LEVEL_LOW,
    + COUNTER_SIGNAL_LEVEL_HIGH,
    +};
    +
    +/* Action mode values */
    +enum counter_synapse_action {
    + COUNTER_SYNAPSE_ACTION_NONE,
    + COUNTER_SYNAPSE_ACTION_RISING_EDGE,
    + COUNTER_SYNAPSE_ACTION_FALLING_EDGE,
    + COUNTER_SYNAPSE_ACTION_BOTH_EDGES,
    +};
    +
    +#endif /* _UAPI_COUNTER_H_ */
    --
    2.30.1
    \
     
     \ /
      Last update: 2021-03-09 14:24    [W:2.451 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site