On Thu, Sep 29, 2022 at 12:31:45PM +0300, Ilpo Järvinen wrote:
> diff --git a/Documentation/driver-api/serial/serial-rs485.rst b/Documentation/driver-api/serial/serial-rs485.rst
> index 6ebad75c74ed..264e4b753713 100644
> --- a/Documentation/driver-api/serial/serial-rs485.rst
> +++ b/Documentation/driver-api/serial/serial-rs485.rst
> @@ -29,11 +29,11 @@ RS485 Serial Communications
> 3. Data Structures Already Available in the Kernel
> ==================================================
>
> - The Linux kernel provides the serial_rs485 structure (see [1]) to handle
> - RS485 communications. This data structure is used to set and configure RS485
> + The Linux kernel provides the serial_rs485 structure to handle RS485
> + communications. This data structure is used to set and configure RS485
> parameters in the platform data and in ioctls.
>
> - The device tree can also provide RS485 boot time parameters (see [2]
> + The device tree can also provide RS485 boot time parameters (see [1]
> for bindings). The driver is in charge of filling this data structure from
> the values given by the device tree.
>
> @@ -47,6 +47,9 @@ RS485 Serial Communications
> for the uart_port. TIOCGRS485 ioctl can be used to read back the
> serial_rs485 structure matching to the current configuration.
>
> +.. kernel-doc:: include/uapi/linux/serial.h
> + :identifiers: serial_rs485
> +
> 4. Usage from user-level
> ========================
>
> @@ -126,6 +129,4 @@ RS485 Serial Communications
> 6. References
> =============
>
> - [1] include/uapi/linux/serial.h
> -
> - [2] Documentation/devicetree/bindings/serial/rs485.txt
> + [1] Documentation/devicetree/bindings/serial/rs485.txt
For formatting consistency with kernel-doc comment of the struct below,
the code keywords should be in inline code samples:
---- >8 ----
diff --git a/Documentation/driver-api/serial/serial-rs485.rst b/Documentation/driver-api/serial/serial-rs485.rst
index e53aa291bcd7df..3d48c8b5a3e6f8 100644
--- a/Documentation/driver-api/serial/serial-rs485.rst
+++ b/Documentation/driver-api/serial/serial-rs485.rst
@@ -39,15 +39,15 @@ RS485 Serial Communications
uart_get_rs485_mode().
Any driver for devices capable of working both as RS232 and RS485 should
- implement the rs485_config callback and provide rs485_supported in the
- struct uart_port. The serial core calls rs485_config to do the device
- specific part in response to TIOCSRS485 ioctl (see below). The
- rs485_config callback receives a pointer to a sanitizated struct
+ implement the ``rs485_config`` callback and provide ``rs485_supported`` in
+ the ``struct uart_port``. The serial core calls ``rs485_config`` to do the
+ device specific part in response to TIOCSRS485 ioctl (see below). The
+ ``rs485_config`` callback receives a pointer to a sanitizated struct
serial_rs485. The struct serial_rs485 userspace provides is sanitized
- before calling rs485_config using rs485_supported that indicates what
- RS485 features the driver supports for the struct uart_port. TIOCGRS485
- ioctl can be used to read back the struct serial_rs485 matching to the
- current configuration.
+ before calling ``rs485_config`` using ``rs485_supported`` that indicates
+ what RS485 features the driver supports for the struct uart_port.
+ TIOCGRS485 ioctl can be used to read back the struct serial_rs485 matching
+ to the current configuration.
.. kernel-doc:: include/uapi/linux/serial.h
:identifiers: serial_rs485 uart_get_rs485_mode
@@ -108,23 +108,26 @@ RS485 Serial Communications
========================
The Linux kernel provides addressing mode for multipoint RS-485 serial
- communications line. The addressing mode is enabled with SER_RS485_ADDRB
+ communications line. The addressing mode is enabled with ``SER_RS485_ADDRB``
flag in struct serial_rs485. The struct serial_rs485 has two additional
flags and fields for enabling receive and destination addresses.
Address mode flags:
- - SER_RS485_ADDRB: Enabled addressing mode (sets also ADDRB in termios).
- - SER_RS485_ADDR_RECV: Receive (filter) address enabled.
- - SER_RS485_ADDR_DEST: Set destination address.
- Address fields (enabled with corresponding SER_RS485_ADDR_* flag):
- - addr_recv: Receive address.
- - addr_dest: Destination address.
+ - ``SER_RS485_ADDRB``: Enabled addressing mode (sets also ADDRB in
+ termios).
+ - ``SER_RS485_ADDR_RECV``: Receive (filter) address enabled.
+ - ``SER_RS485_ADDR_DEST``: Set destination address.
+
+ Address fields (enabled with corresponding ``SER_RS485_ADDR_*`` flag):
+
+ - ``addr_recv``: Receive address.
+ - ``addr_dest``: Destination address.
Once a receive address is set, the communication can occur only with the
particular device and other peers are filtered out. It is left up to the
receiver side to enforce the filtering. Receive address will be cleared
- if SER_RS485_ADDR_RECV is not set.
+ if ``SER_RS485_ADDR_RECV`` is not set.
Note: not all devices supporting RS485 support multipoint addressing.
> diff --git a/include/uapi/linux/serial.h b/include/uapi/linux/serial.h
> index cea06924b295..4634c913f16a 100644
> --- a/include/uapi/linux/serial.h
> +++ b/include/uapi/linux/serial.h
> @@ -107,33 +107,50 @@ struct serial_icounter_struct {
> int reserved[9];
> };
>
> -/*
> +/**
> + * struct serial_rs485 - serial interface for controlling RS485 settings.
> + * @flags: RS485 feature flags.
> + * @delay_rts_before_send: Delay before send (milliseconds).
> + * @delay_rts_after_send: Delay after send (milliseconds).
> + * @addr_recv: Receive filter for RS485 addressing mode
> + * (used only when %SER_RS485_ADDR_RECV is set).
> + * @addr_dest: Destination address for RS485 addressing mode
> + * (used only when %SER_RS485_ADDR_DEST is set).
> + * @padding0: Padding (set to zero).
> + * @padding1: Padding (set to zero).
> + * @padding: Deprecated, use @padding0 and @padding1 instead.
> + * Do not use with @addr_recv and @addr_dest (due to
> + * overlap).
> + *
> * Serial interface for controlling RS485 settings on chips with suitable
> * support. Set with TIOCSRS485 and get with TIOCGRS485 if supported by your
> * platform. The set function returns the new state, with any unsupported bits
> * reverted appropriately.
> + *
> + * serial_rs485::flags bits are:
> + *
Maybe better say "The flag bits are:"?
> + * * %SER_RS485_ENABLED - RS485 enabled.
> + * * %SER_RS485_RTS_ON_SEND - Logical level for RTS pin when sending.
> + * * %SER_RS485_RTS_AFTER_SEND - Logical level for RTS pin after sent.
> + * * %SER_RS485_RX_DURING_TX - Full-duplex RS485 line.
> + * * %SER_RS485_TERMINATE_BUS - Enable bus termination (if supported).
> + * * %SER_RS485_ADDRB - Enable RS485 addressing mode.
> + * * %SER_RS485_ADDR_RECV - Receive address filter (enables @addr_recv). Requires %SER_RS485_ADDRB.
> + * * %SER_RS485_ADDR_DEST - Destination address (enables @addr_dest). Requires %SER_RS485_ADDRB.
> */
> -
> struct serial_rs485 {
> - __u32 flags; /* RS485 feature flags */
> -#define SER_RS485_ENABLED (1 << 0) /* If enabled */
> -#define SER_RS485_RTS_ON_SEND (1 << 1) /* Logical level for
> - RTS pin when
> - sending */
> -#define SER_RS485_RTS_AFTER_SEND (1 << 2) /* Logical level for
> - RTS pin after sent*/
> + __u32 flags;
> +#define SER_RS485_ENABLED (1 << 0)
> +#define SER_RS485_RTS_ON_SEND (1 << 1)
> +#define SER_RS485_RTS_AFTER_SEND (1 << 2)
> #define SER_RS485_RX_DURING_TX (1 << 4)
> -#define SER_RS485_TERMINATE_BUS (1 << 5) /* Enable bus
> - termination
> - (if supported) */
> -
> -/* RS-485 addressing mode */
> -#define SER_RS485_ADDRB (1 << 6) /* Enable addressing mode */
> -#define SER_RS485_ADDR_RECV (1 << 7) /* Receive address filter */
> -#define SER_RS485_ADDR_DEST (1 << 8) /* Destination address */
> +#define SER_RS485_TERMINATE_BUS (1 << 5)
> +#define SER_RS485_ADDRB (1 << 6)
> +#define SER_RS485_ADDR_RECV (1 << 7)
> +#define SER_RS485_ADDR_DEST (1 << 8)
>
> - __u32 delay_rts_before_send; /* Delay before send (milliseconds) */
> - __u32 delay_rts_after_send; /* Delay after send (milliseconds) */
> + __u32 delay_rts_before_send;
> + __u32 delay_rts_after_send;
>
> /* The fields below are defined by flags */
> union {
All struct members are described in htmldocs output, thanks.
--
An old man doll... just what I always wanted! - Clara
Attachment:
signature.asc
Description: PGP signature
