bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tty-module-fixes' into 'stable-1.6' 

Fix build issues with tty/module.c

See merge request etherlab.org/ethercat!150
This commit is contained in:
Florian Pose 2025-02-06 08:25:41 +00:00
parent fa7c40b63e 2824232792
commit dab517b9ca
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tty/module.c
View File

@ -64,9 +64,9 @@ ec_tty_t *ttys[EC_TTY_MAX_DEVICES];
struct semaphore tty_sem; struct semaphore tty_sem;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
void ec_tty_wakeup(struct timer_list *); static void ec_tty_wakeup(struct timer_list *);
#else #else
void ec_tty_wakeup(unsigned long); static void ec_tty_wakeup(unsigned long);
#endif #endif
/****************************************************************************/ /****************************************************************************/
@ -125,7 +125,7 @@ static const struct tty_operations ec_tty_ops; // see below
* *
* \return 0 on success, else < 0 * \return 0 on success, else < 0
*/ */
int __init ec_tty_init_module(void) static int __init ec_tty_init_module(void)
{ {
int i, ret = 0; int i, ret = 0;
unsigned flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; unsigned flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
@ -186,7 +186,7 @@ out_return:
* *
* Clears all master instances. * Clears all master instances.
*/ */
void __exit ec_tty_cleanup_module(void) static void __exit ec_tty_cleanup_module(void)
{ {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)
int i; int i;
@ -213,7 +213,7 @@ void __exit ec_tty_cleanup_module(void)
* ec_tty_t methods. * ec_tty_t methods.
****************************************************************************/ ****************************************************************************/
int ec_tty_init(ec_tty_t *t, int minor, static int ec_tty_init(ec_tty_t *t, int minor,
const ec_tty_operations_t *ops, void *cb_data) const ec_tty_operations_t *ops, void *cb_data)
{ {
int ret; int ret;
@ -290,7 +290,7 @@ int ec_tty_init(ec_tty_t *t, int minor,
/****************************************************************************/ /****************************************************************************/
void ec_tty_clear(ec_tty_t *tty) static void ec_tty_clear(ec_tty_t *tty)
{ {
del_timer_sync(&tty->timer); del_timer_sync(&tty->timer);
tty_unregister_device(tty_driver, tty->minor); tty_unregister_device(tty_driver, tty->minor);
@ -298,7 +298,7 @@ void ec_tty_clear(ec_tty_t *tty)
/****************************************************************************/ /****************************************************************************/
unsigned int ec_tty_tx_size(ec_tty_t *tty) static unsigned int ec_tty_tx_size(ec_tty_t *tty)
{ {
unsigned int ret; unsigned int ret;
@ -313,14 +313,14 @@ unsigned int ec_tty_tx_size(ec_tty_t *tty)
/****************************************************************************/ /****************************************************************************/
unsigned int ec_tty_tx_space(ec_tty_t *tty) static unsigned int ec_tty_tx_space(ec_tty_t *tty)
{ {
return EC_TTY_TX_BUFFER_SIZE - 1 - ec_tty_tx_size(tty); return EC_TTY_TX_BUFFER_SIZE - 1 - ec_tty_tx_size(tty);
} }
/****************************************************************************/ /****************************************************************************/
unsigned int ec_tty_rx_size(ec_tty_t *tty) static unsigned int ec_tty_rx_size(ec_tty_t *tty)
{ {
unsigned int ret; unsigned int ret;
@ -335,14 +335,14 @@ unsigned int ec_tty_rx_size(ec_tty_t *tty)
/****************************************************************************/ /****************************************************************************/
unsigned int ec_tty_rx_space(ec_tty_t *tty) static unsigned int ec_tty_rx_space(ec_tty_t *tty)
{ {
return EC_TTY_RX_BUFFER_SIZE - 1 - ec_tty_rx_size(tty); return EC_TTY_RX_BUFFER_SIZE - 1 - ec_tty_rx_size(tty);
} }
/****************************************************************************/ /****************************************************************************/
int ec_tty_get_serial_info(ec_tty_t *tty, struct serial_struct *data) static int ec_tty_get_serial_info(ec_tty_t *tty, struct serial_struct *data)
{ {
struct serial_struct tmp; struct serial_struct tmp;
@ -362,9 +362,9 @@ int ec_tty_get_serial_info(ec_tty_t *tty, struct serial_struct *data)
/** Timer function. /** Timer function.
*/ */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
void ec_tty_wakeup(struct timer_list *t) static void ec_tty_wakeup(struct timer_list *t)
#else #else
void ec_tty_wakeup(unsigned long data) static void ec_tty_wakeup(unsigned long data)
#endif #endif
{ {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
@ -488,11 +488,19 @@ static void ec_tty_close(struct tty_struct *tty, struct file *file)
/****************************************************************************/ /****************************************************************************/
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 0)
static ssize_t ec_tty_write(
struct tty_struct *tty,
const u8 *buffer,
size_t count
)
#else
static int ec_tty_write( static int ec_tty_write(
struct tty_struct *tty, struct tty_struct *tty,
const unsigned char *buffer, const unsigned char *buffer,
int count int count
) )
#endif
{ {
ec_tty_t *t = (ec_tty_t *) tty->driver_data; ec_tty_t *t = (ec_tty_t *) tty->driver_data;
unsigned int data_size, i; unsigned int data_size, i;
@ -716,7 +724,11 @@ static int ec_tty_break(struct tty_struct *tty, int break_state)
/****************************************************************************/ /****************************************************************************/
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 8, 0)
static void ec_tty_send_xchar(struct tty_struct *tty, u8 ch)
#else
static void ec_tty_send_xchar(struct tty_struct *tty, char ch) static void ec_tty_send_xchar(struct tty_struct *tty, char ch)
#endif
{ {
#if EC_TTY_DEBUG >= 2 #if EC_TTY_DEBUG >= 2
printk(KERN_INFO PFX "%s(ch=%02x).\n", __func__, (unsigned int) ch); printk(KERN_INFO PFX "%s(ch=%02x).\n", __func__, (unsigned int) ch);