* [patch 0/3] speakup: simplify relation between line disc and synth
@ 2020-12-09 20:58 samuel.thibault
2020-12-09 20:58 ` [patch 1/3] speakup: Add synth parameter to io functions samuel.thibault
` (2 more replies)
0 siblings, 3 replies; 13+ messages in thread
From: samuel.thibault @ 2020-12-09 20:58 UTC (permalink / raw)
To: gregkh; +Cc: linux-kernel, speakup
This series reworks the relation between the speakup line discipline and the
speakup synthesizers. This is probably fixing a few minor issues, but since it
is invasive it'll better wait for 5.11.
^ permalink raw reply [flat|nested] 13+ messages in thread* [patch 1/3] speakup: Add synth parameter to io functions 2020-12-09 20:58 [patch 0/3] speakup: simplify relation between line disc and synth samuel.thibault @ 2020-12-09 20:58 ` samuel.thibault 2020-12-10 15:23 ` Greg KH 2020-12-09 20:58 ` [patch 2/3] speakup: Reference synth from tty and tty from synth samuel.thibault 2020-12-09 20:58 ` [patch 3/3] speakup: Simplify spk_ttyio_out error handling samuel.thibault 2 siblings, 1 reply; 13+ messages in thread From: samuel.thibault @ 2020-12-09 20:58 UTC (permalink / raw) To: gregkh; +Cc: linux-kernel, speakup, Samuel Thibault [-- Attachment #1: io_synth --] [-- Type: text/plain, Size: 16706 bytes --] This merely adds the missing synth parameter to all io functions. Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Index: linux-5.10/drivers/accessibility/speakup/spk_ttyio.c =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/spk_ttyio.c +++ linux-5.10/drivers/accessibility/speakup/spk_ttyio.c @@ -114,11 +114,11 @@ static struct tty_ldisc_ops spk_ttyio_ld static int spk_ttyio_out(struct spk_synth *in_synth, const char ch); static int spk_ttyio_out_unicode(struct spk_synth *in_synth, u16 ch); -static void spk_ttyio_send_xchar(char ch); -static void spk_ttyio_tiocmset(unsigned int set, unsigned int clear); -static unsigned char spk_ttyio_in(void); -static unsigned char spk_ttyio_in_nowait(void); -static void spk_ttyio_flush_buffer(void); +static void spk_ttyio_send_xchar(struct spk_synth *in_synth, char ch); +static void spk_ttyio_tiocmset(struct spk_synth *in_synth, unsigned int set, unsigned int clear); +static unsigned char spk_ttyio_in(struct spk_synth *in_synth); +static unsigned char spk_ttyio_in_nowait(struct spk_synth *in_synth); +static void spk_ttyio_flush_buffer(struct spk_synth *in_synth); static int spk_ttyio_wait_for_xmitr(struct spk_synth *in_synth); struct spk_io_ops spk_ttyio_ops = { @@ -281,7 +281,7 @@ static int check_tty(struct tty_struct * return 0; } -static void spk_ttyio_send_xchar(char ch) +static void spk_ttyio_send_xchar(struct spk_synth *in_synth, char ch) { mutex_lock(&speakup_tty_mutex); if (check_tty(speakup_tty)) { @@ -294,7 +294,7 @@ static void spk_ttyio_send_xchar(char ch mutex_unlock(&speakup_tty_mutex); } -static void spk_ttyio_tiocmset(unsigned int set, unsigned int clear) +static void spk_ttyio_tiocmset(struct spk_synth *in_synth, unsigned int set, unsigned int clear) { mutex_lock(&speakup_tty_mutex); if (check_tty(speakup_tty)) { @@ -312,7 +312,7 @@ static int spk_ttyio_wait_for_xmitr(stru return 1; } -static unsigned char ttyio_in(int timeout) +static unsigned char ttyio_in(struct spk_synth *in_synth, int timeout) { struct spk_ldisc_data *ldisc_data = speakup_tty->disc_data; char rv; @@ -339,19 +339,19 @@ static unsigned char ttyio_in(int timeou return rv; } -static unsigned char spk_ttyio_in(void) +static unsigned char spk_ttyio_in(struct spk_synth *in_synth) { return ttyio_in(SPK_SYNTH_TIMEOUT); } -static unsigned char spk_ttyio_in_nowait(void) +static unsigned char spk_ttyio_in_nowait(struct spk_synth *in_synth) { u8 rv = ttyio_in(0); return (rv == 0xff) ? 0 : rv; } -static void spk_ttyio_flush_buffer(void) +static void spk_ttyio_flush_buffer(struct spk_synth *in_synth) { mutex_lock(&speakup_tty_mutex); if (check_tty(speakup_tty)) { @@ -379,7 +379,7 @@ int spk_ttyio_synth_probe(struct spk_syn } EXPORT_SYMBOL_GPL(spk_ttyio_synth_probe); -void spk_ttyio_release(void) +void spk_ttyio_release(struct spk_synth *in_synth) { if (!speakup_tty) return; @@ -395,15 +395,15 @@ void spk_ttyio_release(void) } EXPORT_SYMBOL_GPL(spk_ttyio_release); -const char *spk_ttyio_synth_immediate(struct spk_synth *synth, const char *buff) +const char *spk_ttyio_synth_immediate(struct spk_synth *in_synth, const char *buff) { u_char ch; while ((ch = *buff)) { if (ch == '\n') - ch = synth->procspeech; + ch = in_synth->procspeech; if (tty_write_room(speakup_tty) < 1 || - !synth->io_ops->synth_out(synth, ch)) + !in_synth->io_ops->synth_out(in_synth, ch)) return buff; buff++; } Index: linux-5.10/drivers/accessibility/speakup/serialio.c =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/serialio.c +++ linux-5.10/drivers/accessibility/speakup/serialio.c @@ -27,11 +27,11 @@ static const struct old_serial_port *ser static int timeouts; static int spk_serial_out(struct spk_synth *in_synth, const char ch); -static void spk_serial_send_xchar(char ch); -static void spk_serial_tiocmset(unsigned int set, unsigned int clear); -static unsigned char spk_serial_in(void); -static unsigned char spk_serial_in_nowait(void); -static void spk_serial_flush_buffer(void); +static void spk_serial_send_xchar(struct spk_synth *in_synth, char ch); +static void spk_serial_tiocmset(struct spk_synth *in_synth, unsigned int set, unsigned int clear); +static unsigned char spk_serial_in(struct spk_synth *in_synth); +static unsigned char spk_serial_in_nowait(struct spk_synth *in_synth); +static void spk_serial_flush_buffer(struct spk_synth *in_synth); static int spk_serial_wait_for_xmitr(struct spk_synth *in_synth); struct spk_io_ops spk_serial_io_ops = { @@ -150,7 +150,7 @@ static void start_serial_interrupt(int i outb(1, speakup_info.port_tts + UART_FCR); /* Turn FIFO On */ } -static void spk_serial_send_xchar(char ch) +static void spk_serial_send_xchar(struct spk_synth *synth, char ch) { int timeout = SPK_XMITR_TIMEOUT; @@ -162,7 +162,7 @@ static void spk_serial_send_xchar(char c outb(ch, speakup_info.port_tts); } -static void spk_serial_tiocmset(unsigned int set, unsigned int clear) +static void spk_serial_tiocmset(struct spk_synth *in_synth, unsigned int set, unsigned int clear) { int old = inb(speakup_info.port_tts + UART_MCR); @@ -275,7 +275,7 @@ static unsigned char spk_serial_in_nowai return inb_p(speakup_info.port_tts + UART_RX); } -static void spk_serial_flush_buffer(void) +static void spk_serial_flush_buffer(struct spk_synth *in_synth) { /* TODO: flush the UART 16550 buffer */ } Index: linux-5.10/drivers/accessibility/speakup/speakup_apollo.c =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/speakup_apollo.c +++ linux-5.10/drivers/accessibility/speakup/speakup_apollo.c @@ -163,8 +163,8 @@ static void do_catch_up(struct spk_synth full_time_val = full_time->u.n.value; spin_unlock_irqrestore(&speakup_info.spinlock, flags); if (!synth->io_ops->synth_out(synth, ch)) { - synth->io_ops->tiocmset(0, UART_MCR_RTS); - synth->io_ops->tiocmset(UART_MCR_RTS, 0); + synth->io_ops->tiocmset(synth, 0, UART_MCR_RTS); + synth->io_ops->tiocmset(synth, UART_MCR_RTS, 0); schedule_timeout(msecs_to_jiffies(full_time_val)); continue; } Index: linux-5.10/drivers/accessibility/speakup/speakup_audptr.c =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/speakup_audptr.c +++ linux-5.10/drivers/accessibility/speakup/speakup_audptr.c @@ -119,8 +119,8 @@ static struct spk_synth synth_audptr = { static void synth_flush(struct spk_synth *synth) { - synth->io_ops->flush_buffer(); - synth->io_ops->send_xchar(SYNTH_CLEAR); + synth->io_ops->flush_buffer(synth); + synth->io_ops->send_xchar(synth, SYNTH_CLEAR); synth->io_ops->synth_out(synth, PROCSPEECH); } @@ -130,11 +130,11 @@ static void synth_version(struct spk_syn char synth_id[40] = ""; synth->synth_immediate(synth, "\x05[Q]"); - synth_id[test] = synth->io_ops->synth_in(); + synth_id[test] = synth->io_ops->synth_in(synth); if (synth_id[test] == 'A') { do { /* read version string from synth */ - synth_id[++test] = synth->io_ops->synth_in(); + synth_id[++test] = synth->io_ops->synth_in(synth); } while (synth_id[test] != '\n' && test < 32); synth_id[++test] = 0x00; } Index: linux-5.10/drivers/accessibility/speakup/speakup_spkout.c =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/speakup_spkout.c +++ linux-5.10/drivers/accessibility/speakup/speakup_spkout.c @@ -117,8 +117,8 @@ static struct spk_synth synth_spkout = { static void synth_flush(struct spk_synth *synth) { - synth->io_ops->flush_buffer(); - synth->io_ops->send_xchar(SYNTH_CLEAR); + synth->io_ops->flush_buffer(synth); + synth->io_ops->send_xchar(synth, SYNTH_CLEAR); } module_param_named(ser, synth_spkout.ser, int, 0444); Index: linux-5.10/drivers/accessibility/speakup/spk_types.h =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/spk_types.h +++ linux-5.10/drivers/accessibility/speakup/spk_types.h @@ -157,11 +157,11 @@ struct spk_synth; struct spk_io_ops { int (*synth_out)(struct spk_synth *synth, const char ch); int (*synth_out_unicode)(struct spk_synth *synth, u16 ch); - void (*send_xchar)(char ch); - void (*tiocmset)(unsigned int set, unsigned int clear); - unsigned char (*synth_in)(void); - unsigned char (*synth_in_nowait)(void); - void (*flush_buffer)(void); + void (*send_xchar)(struct spk_synth *synth, char ch); + void (*tiocmset)(struct spk_synth *synth, unsigned int set, unsigned int clear); + unsigned char (*synth_in)(struct spk_synth *synth); + unsigned char (*synth_in_nowait)(struct spk_synth *synth); + void (*flush_buffer)(struct spk_synth *synth); int (*wait_for_xmitr)(struct spk_synth *synth); }; @@ -188,7 +188,7 @@ struct spk_synth { int *default_vol; struct spk_io_ops *io_ops; int (*probe)(struct spk_synth *synth); - void (*release)(void); + void (*release)(struct spk_synth *synth); const char *(*synth_immediate)(struct spk_synth *synth, const char *buff); void (*catch_up)(struct spk_synth *synth); Index: linux-5.10/drivers/accessibility/speakup/speakup_decext.c =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/speakup_decext.c +++ linux-5.10/drivers/accessibility/speakup/speakup_decext.c @@ -218,7 +218,7 @@ static void do_catch_up(struct spk_synth static void synth_flush(struct spk_synth *synth) { in_escape = 0; - synth->io_ops->flush_buffer(); + synth->io_ops->flush_buffer(synth); synth->synth_immediate(synth, "\033P;10z\033\\"); } Index: linux-5.10/drivers/accessibility/speakup/speakup_dectlk.c =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/speakup_dectlk.c +++ linux-5.10/drivers/accessibility/speakup/speakup_dectlk.c @@ -289,7 +289,7 @@ static void synth_flush(struct spk_synth synth->io_ops->synth_out(synth, ']'); in_escape = 0; is_flushing = 1; - synth->io_ops->flush_buffer(); + synth->io_ops->flush_buffer(synth); synth->io_ops->synth_out(synth, SYNTH_CLEAR); } Index: linux-5.10/drivers/accessibility/speakup/speakup_dtlk.c =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/speakup_dtlk.c +++ linux-5.10/drivers/accessibility/speakup/speakup_dtlk.c @@ -24,7 +24,7 @@ #define PROCSPEECH 0x00 static int synth_probe(struct spk_synth *synth); -static void dtlk_release(void); +static void dtlk_release(struct spk_synth *synth); static const char *synth_immediate(struct spk_synth *synth, const char *buf); static void do_catch_up(struct spk_synth *synth); static void synth_flush(struct spk_synth *synth); @@ -365,7 +365,7 @@ static int synth_probe(struct spk_synth return 0; } -static void dtlk_release(void) +static void dtlk_release(struct spk_synth *synth) { spk_stop_serial_interrupt(); if (speakup_info.port_tts) Index: linux-5.10/drivers/accessibility/speakup/speakup_ltlk.c =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/speakup_ltlk.c +++ linux-5.10/drivers/accessibility/speakup/speakup_ltlk.c @@ -132,7 +132,7 @@ static void synth_interrogate(struct spk synth->synth_immediate(synth, "\x18\x01?"); for (i = 0; i < 50; i++) { - buf[i] = synth->io_ops->synth_in(); + buf[i] = synth->io_ops->synth_in(synth); if (i > 2 && buf[i] == 0x7f) break; } Index: linux-5.10/drivers/accessibility/speakup/synth.c =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/synth.c +++ linux-5.10/drivers/accessibility/speakup/synth.c @@ -137,14 +137,14 @@ EXPORT_SYMBOL_GPL(spk_do_catch_up_unicod void spk_synth_flush(struct spk_synth *synth) { - synth->io_ops->flush_buffer(); + synth->io_ops->flush_buffer(synth); synth->io_ops->synth_out(synth, synth->clear); } EXPORT_SYMBOL_GPL(spk_synth_flush); unsigned char spk_synth_get_index(struct spk_synth *synth) { - return synth->io_ops->synth_in_nowait(); + return synth->io_ops->synth_in_nowait(synth); } EXPORT_SYMBOL_GPL(spk_synth_get_index); @@ -440,7 +440,7 @@ void synth_release(void) sysfs_remove_group(speakup_kobj, &synth->attributes); for (var = synth->vars; var->var_id != MAXVARS; var++) speakup_unregister_var(var->var_id); - synth->release(); + synth->release(synth); synth = NULL; } Index: linux-5.10/drivers/accessibility/speakup/speakup_acntpc.c =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/speakup_acntpc.c +++ linux-5.10/drivers/accessibility/speakup/speakup_acntpc.c @@ -25,7 +25,7 @@ #define PROCSPEECH '\r' static int synth_probe(struct spk_synth *synth); -static void accent_release(void); +static void accent_release(struct spk_synth *synth); static const char *synth_immediate(struct spk_synth *synth, const char *buf); static void do_catch_up(struct spk_synth *synth); static void synth_flush(struct spk_synth *synth); @@ -294,7 +294,7 @@ static int synth_probe(struct spk_synth return 0; } -static void accent_release(void) +static void accent_release(struct spk_synth *synth) { spk_stop_serial_interrupt(); if (speakup_info.port_tts) Index: linux-5.10/drivers/accessibility/speakup/speakup_decpc.c =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/speakup_decpc.c +++ linux-5.10/drivers/accessibility/speakup/speakup_decpc.c @@ -125,7 +125,7 @@ enum { PRIMARY_DIC = 0, USER_DIC, COMMAN #define SYNTH_IO_EXTENT 8 static int synth_probe(struct spk_synth *synth); -static void dtpc_release(void); +static void dtpc_release(struct spk_synth *synth); static const char *synth_immediate(struct spk_synth *synth, const char *buf); static void do_catch_up(struct spk_synth *synth); static void synth_flush(struct spk_synth *synth); @@ -474,7 +474,7 @@ static int synth_probe(struct spk_synth return 0; } -static void dtpc_release(void) +static void dtpc_release(struct spk_synth *synth) { spk_stop_serial_interrupt(); if (speakup_info.port_tts) Index: linux-5.10/drivers/accessibility/speakup/speakup_keypc.c =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/speakup_keypc.c +++ linux-5.10/drivers/accessibility/speakup/speakup_keypc.c @@ -24,7 +24,7 @@ #define SYNTH_CLEAR 0x03 static int synth_probe(struct spk_synth *synth); -static void keynote_release(void); +static void keynote_release(struct spk_synth *synth); static const char *synth_immediate(struct spk_synth *synth, const char *buf); static void do_catch_up(struct spk_synth *synth); static void synth_flush(struct spk_synth *synth); @@ -295,7 +295,7 @@ static int synth_probe(struct spk_synth return 0; } -static void keynote_release(void) +static void keynote_release(struct spk_synth *synth) { spk_stop_serial_interrupt(); if (synth_port) Index: linux-5.10/drivers/accessibility/speakup/speakup_soft.c =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/speakup_soft.c +++ linux-5.10/drivers/accessibility/speakup/speakup_soft.c @@ -24,7 +24,7 @@ #define CLEAR_SYNTH 0x18 static int softsynth_probe(struct spk_synth *synth); -static void softsynth_release(void); +static void softsynth_release(struct spk_synth *synth); static int softsynth_is_alive(struct spk_synth *synth); static unsigned char get_index(struct spk_synth *synth); @@ -402,7 +402,7 @@ static int softsynth_probe(struct spk_sy return 0; } -static void softsynth_release(void) +static void softsynth_release(struct spk_synth *synth) { misc_deregister(&synth_device); misc_deregister(&synthu_device); Index: linux-5.10/drivers/accessibility/speakup/spk_priv.h =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/spk_priv.h +++ linux-5.10/drivers/accessibility/speakup/spk_priv.h @@ -34,8 +34,8 @@ const struct old_serial_port *spk_serial_init(int index); void spk_stop_serial_interrupt(void); -void spk_serial_release(void); -void spk_ttyio_release(void); +void spk_serial_release(struct spk_synth *synth); +void spk_ttyio_release(struct spk_synth *synth); void spk_ttyio_register_ldisc(void); void spk_ttyio_unregister_ldisc(void); ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [patch 1/3] speakup: Add synth parameter to io functions 2020-12-09 20:58 ` [patch 1/3] speakup: Add synth parameter to io functions samuel.thibault @ 2020-12-10 15:23 ` Greg KH 2020-12-10 15:24 ` Samuel Thibault 2020-12-10 20:03 ` Samuel Thibault 0 siblings, 2 replies; 13+ messages in thread From: Greg KH @ 2020-12-10 15:23 UTC (permalink / raw) To: samuel.thibault; +Cc: linux-kernel, speakup On Wed, Dec 09, 2020 at 09:58:30PM +0100, samuel.thibault@ens-lyon.org wrote: > This merely adds the missing synth parameter to all io functions. > > Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> > The build still breaks when this patch is applied: CC [M] drivers/accessibility/speakup/spk_ttyio.o In file included from drivers/accessibility/speakup/spk_ttyio.c:9: drivers/accessibility/speakup/spk_ttyio.c: In function ‘spk_ttyio_in’: drivers/accessibility/speakup/spk_priv.h:31:27: warning: passing argument 1 of ‘ttyio_in’ makes pointer from integer without a cast [-Wint-conversion] 31 | #define SPK_SYNTH_TIMEOUT 100000 /* in micro-seconds */ | ^~~~~~ | | | int drivers/accessibility/speakup/spk_ttyio.c:344:18: note: in expansion of macro ‘SPK_SYNTH_TIMEOUT’ 344 | return ttyio_in(SPK_SYNTH_TIMEOUT); | ^~~~~~~~~~~~~~~~~ drivers/accessibility/speakup/spk_ttyio.c:315:49: note: expected ‘struct spk_synth *’ but argument is of type ‘int’ 315 | static unsigned char ttyio_in(struct spk_synth *in_synth, int timeout) | ~~~~~~~~~~~~~~~~~~^~~~~~~~ drivers/accessibility/speakup/spk_ttyio.c:344:9: error: too few arguments to function ‘ttyio_in’ 344 | return ttyio_in(SPK_SYNTH_TIMEOUT); | ^~~~~~~~ drivers/accessibility/speakup/spk_ttyio.c:315:22: note: declared here 315 | static unsigned char ttyio_in(struct spk_synth *in_synth, int timeout) | ^~~~~~~~ drivers/accessibility/speakup/spk_ttyio.c: In function ‘spk_ttyio_in_nowait’: drivers/accessibility/speakup/spk_ttyio.c:349:10: error: too few arguments to function ‘ttyio_in’ 349 | u8 rv = ttyio_in(0); | ^~~~~~~~ drivers/accessibility/speakup/spk_ttyio.c:315:22: note: declared here 315 | static unsigned char ttyio_in(struct spk_synth *in_synth, int timeout) | ^~~~~~~~ drivers/accessibility/speakup/spk_ttyio.c: In function ‘spk_ttyio_in’: drivers/accessibility/speakup/spk_ttyio.c:345:1: error: control reaches end of non-void function [-Werror=return-type] 345 | } | ^ cc1: some warnings being treated as errors make[3]: *** [scripts/Makefile.build:279: drivers/accessibility/speakup/spk_ttyio.o] Error 1 make[2]: *** [scripts/Makefile.build:496: drivers/accessibility/speakup] Error 2 make[1]: *** [scripts/Makefile.build:496: drivers/accessibility] Error 2 make: *** [Makefile:1805: drivers] Error 2 You can't break the build on any patches in a series :( thanks, greg k-h ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [patch 1/3] speakup: Add synth parameter to io functions 2020-12-10 15:23 ` Greg KH @ 2020-12-10 15:24 ` Samuel Thibault 2020-12-10 20:03 ` Samuel Thibault 1 sibling, 0 replies; 13+ messages in thread From: Samuel Thibault @ 2020-12-10 15:24 UTC (permalink / raw) To: Greg KH; +Cc: linux-kernel, speakup Greg KH, le jeu. 10 déc. 2020 16:23:11 +0100, a ecrit: > On Wed, Dec 09, 2020 at 09:58:30PM +0100, samuel.thibault@ens-lyon.org wrote: > > This merely adds the missing synth parameter to all io functions. > > > > Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> > > > > The build still breaks when this patch is applied: ?? I'll have to check > You can't break the build on any patches in a series :( Sure ! In my tests the build passes fine without any warning at each patch... Samuel ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [patch 1/3] speakup: Add synth parameter to io functions 2020-12-10 15:23 ` Greg KH 2020-12-10 15:24 ` Samuel Thibault @ 2020-12-10 20:03 ` Samuel Thibault 2021-01-05 13:39 ` Greg KH 1 sibling, 1 reply; 13+ messages in thread From: Samuel Thibault @ 2020-12-10 20:03 UTC (permalink / raw) To: Greg KH; +Cc: linux-kernel, speakup Greg KH, le jeu. 10 déc. 2020 16:23:11 +0100, a ecrit: > The build still breaks when this patch is applied: > drivers/accessibility/speakup/spk_ttyio.c:344:18: note: in expansion of macro ‘SPK_SYNTH_TIMEOUT’ > 344 | return ttyio_in(SPK_SYNTH_TIMEOUT); Sorry, I had a refresh missing. I don't contribute often enough to Linux any more, my quilt-fu is lacking :) I'll resend the series. Samuel ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [patch 1/3] speakup: Add synth parameter to io functions 2020-12-10 20:03 ` Samuel Thibault @ 2021-01-05 13:39 ` Greg KH 2021-01-05 13:39 ` Samuel Thibault 0 siblings, 1 reply; 13+ messages in thread From: Greg KH @ 2021-01-05 13:39 UTC (permalink / raw) To: Samuel Thibault, linux-kernel, speakup On Thu, Dec 10, 2020 at 09:03:00PM +0100, Samuel Thibault wrote: > Greg KH, le jeu. 10 déc. 2020 16:23:11 +0100, a ecrit: > > The build still breaks when this patch is applied: > > > drivers/accessibility/speakup/spk_ttyio.c:344:18: note: in expansion of macro ‘SPK_SYNTH_TIMEOUT’ > > 344 | return ttyio_in(SPK_SYNTH_TIMEOUT); > > Sorry, I had a refresh missing. I don't contribute often enough to Linux > any more, my quilt-fu is lacking :) > > I'll resend the series. Did you resend this? I can't find it... thanks, greg k-h ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [patch 1/3] speakup: Add synth parameter to io functions 2021-01-05 13:39 ` Greg KH @ 2021-01-05 13:39 ` Samuel Thibault 0 siblings, 0 replies; 13+ messages in thread From: Samuel Thibault @ 2021-01-05 13:39 UTC (permalink / raw) To: Greg KH; +Cc: linux-kernel, speakup Greg KH, le mar. 05 janv. 2021 14:39:47 +0100, a ecrit: > On Thu, Dec 10, 2020 at 09:03:00PM +0100, Samuel Thibault wrote: > > Greg KH, le jeu. 10 déc. 2020 16:23:11 +0100, a ecrit: > > > The build still breaks when this patch is applied: > > > > > drivers/accessibility/speakup/spk_ttyio.c:344:18: note: in expansion of macro ‘SPK_SYNTH_TIMEOUT’ > > > 344 | return ttyio_in(SPK_SYNTH_TIMEOUT); > > > > Sorry, I had a refresh missing. I don't contribute often enough to Linux > > any more, my quilt-fu is lacking :) > > > > I'll resend the series. > > Did you resend this? I can't find it... I believe so, but I'll resend again anyway (with some more changes iirc) Samuel ^ permalink raw reply [flat|nested] 13+ messages in thread
* [patch 2/3] speakup: Reference synth from tty and tty from synth 2020-12-09 20:58 [patch 0/3] speakup: simplify relation between line disc and synth samuel.thibault 2020-12-09 20:58 ` [patch 1/3] speakup: Add synth parameter to io functions samuel.thibault @ 2020-12-09 20:58 ` samuel.thibault 2020-12-09 20:58 ` [patch 3/3] speakup: Simplify spk_ttyio_out error handling samuel.thibault 2 siblings, 0 replies; 13+ messages in thread From: samuel.thibault @ 2020-12-09 20:58 UTC (permalink / raw) To: gregkh; +Cc: linux-kernel, speakup, Samuel Thibault [-- Attachment #1: spk_ttyio_synth --] [-- Type: text/plain, Size: 7490 bytes --] We do not actually need speakup_tty and spk_ttyio_synth global variables, the synth can store the pointer to the tty, and the tty ldisc_data can store the pointer to the synth. Along the way, we can clench the initialization of the synth and the creation of the tty, so that tty is never NULL. Even if the device disappears (e.g. USB unplug), the tty structure will still be there, and we automatically stop speakup in the spk_ttyio_out error handler but keep tty until the user cleans things up. As a result, this simplifies locking a lot. Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Index: linux-5.10/drivers/accessibility/speakup/spk_ttyio.c =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/spk_ttyio.c +++ linux-5.10/drivers/accessibility/speakup/spk_ttyio.c @@ -12,14 +12,15 @@ struct spk_ldisc_data { char buf; struct completion completion; bool buf_free; + struct spk_synth *synth; }; -static struct spk_synth *spk_ttyio_synth; -static struct tty_struct *speakup_tty; -/* mutex to protect against speakup_tty disappearing from underneath us while - * we are using it. this can happen when the device physically unplugged, - * while in use. it also serialises access to speakup_tty. +/* + * This allows to catch within spk_ttyio_ldisc_open whether it is getting set + * on for a speakup-driven device. */ +static struct tty_struct *speakup_tty; +/* This mutex serializes the use of such global speakup_tty variable */ static DEFINE_MUTEX(speakup_tty_mutex); static int ser_to_dev(int ser, dev_t *dev_no) @@ -67,22 +68,20 @@ static int spk_ttyio_ldisc_open(struct t static void spk_ttyio_ldisc_close(struct tty_struct *tty) { - mutex_lock(&speakup_tty_mutex); - kfree(speakup_tty->disc_data); - speakup_tty = NULL; - mutex_unlock(&speakup_tty_mutex); + kfree(tty->disc_data); } static int spk_ttyio_receive_buf2(struct tty_struct *tty, const unsigned char *cp, char *fp, int count) { struct spk_ldisc_data *ldisc_data = tty->disc_data; + struct spk_synth *synth = ldisc_data->synth; - if (spk_ttyio_synth->read_buff_add) { + if (synth->read_buff_add) { int i; for (i = 0; i < count; i++) - spk_ttyio_synth->read_buff_add(cp[i]); + synth->read_buff_add(cp[i]); return count; } @@ -187,13 +186,17 @@ static int spk_ttyio_initialise_ldisc(st mutex_lock(&speakup_tty_mutex); speakup_tty = tty; ret = tty_set_ldisc(tty, N_SPEAKUP); - if (ret) - speakup_tty = NULL; + speakup_tty = NULL; mutex_unlock(&speakup_tty_mutex); - if (!ret) + if (!ret) { /* Success */ + struct spk_ldisc_data *ldisc_data = tty->disc_data; + + ldisc_data->synth = synth; + synth->dev = tty; return 0; + } pr_err("speakup: Failed to set N_SPEAKUP on tty\n"); @@ -221,11 +224,11 @@ void spk_ttyio_unregister_ldisc(void) static int spk_ttyio_out(struct spk_synth *in_synth, const char ch) { - mutex_lock(&speakup_tty_mutex); - if (in_synth->alive && speakup_tty && speakup_tty->ops->write) { - int ret = speakup_tty->ops->write(speakup_tty, &ch, 1); + struct tty_struct *tty = in_synth->dev; + + if (in_synth->alive && tty->ops->write) { + int ret = tty->ops->write(tty, &ch, 1); - mutex_unlock(&speakup_tty_mutex); if (ret == 0) /* No room */ return 0; @@ -243,7 +246,6 @@ static int spk_ttyio_out(struct spk_synt return 1; } - mutex_unlock(&speakup_tty_mutex); return 0; } @@ -264,47 +266,20 @@ static int spk_ttyio_out_unicode(struct return ret; } -static int check_tty(struct tty_struct *tty) -{ - if (!tty) { - pr_warn("%s: I/O error, deactivating speakup\n", - spk_ttyio_synth->long_name); - /* No synth any more, so nobody will restart TTYs, and we thus - * need to do it ourselves. Now that there is no synth we can - * let application flood anyway - */ - spk_ttyio_synth->alive = 0; - speakup_start_ttys(); - return 1; - } - - return 0; -} - static void spk_ttyio_send_xchar(struct spk_synth *in_synth, char ch) { - mutex_lock(&speakup_tty_mutex); - if (check_tty(speakup_tty)) { - mutex_unlock(&speakup_tty_mutex); - return; - } + struct tty_struct *tty = in_synth->dev; - if (speakup_tty->ops->send_xchar) - speakup_tty->ops->send_xchar(speakup_tty, ch); - mutex_unlock(&speakup_tty_mutex); + if (tty->ops->send_xchar) + tty->ops->send_xchar(tty, ch); } static void spk_ttyio_tiocmset(struct spk_synth *in_synth, unsigned int set, unsigned int clear) { - mutex_lock(&speakup_tty_mutex); - if (check_tty(speakup_tty)) { - mutex_unlock(&speakup_tty_mutex); - return; - } + struct tty_struct *tty = in_synth->dev; - if (speakup_tty->ops->tiocmset) - speakup_tty->ops->tiocmset(speakup_tty, set, clear); - mutex_unlock(&speakup_tty_mutex); + if (tty->ops->tiocmset) + tty->ops->tiocmset(tty, set, clear); } static int spk_ttyio_wait_for_xmitr(struct spk_synth *in_synth) @@ -314,7 +289,8 @@ static int spk_ttyio_wait_for_xmitr(stru static unsigned char ttyio_in(struct spk_synth *in_synth, int timeout) { - struct spk_ldisc_data *ldisc_data = speakup_tty->disc_data; + struct tty_struct *tty = in_synth->dev; + struct spk_ldisc_data *ldisc_data = tty->disc_data; char rv; if (!timeout) { @@ -334,7 +310,7 @@ static unsigned char ttyio_in(struct spk mb(); ldisc_data->buf_free = true; /* Let TTY push more characters */ - tty_schedule_flip(speakup_tty->port); + tty_schedule_flip(tty->port); return rv; } @@ -353,16 +329,10 @@ static unsigned char spk_ttyio_in_nowait static void spk_ttyio_flush_buffer(struct spk_synth *in_synth) { - mutex_lock(&speakup_tty_mutex); - if (check_tty(speakup_tty)) { - mutex_unlock(&speakup_tty_mutex); - return; - } - - if (speakup_tty->ops->flush_buffer) - speakup_tty->ops->flush_buffer(speakup_tty); + struct tty_struct *tty = in_synth->dev; - mutex_unlock(&speakup_tty_mutex); + if (tty->ops->flush_buffer) + tty->ops->flush_buffer(tty); } int spk_ttyio_synth_probe(struct spk_synth *synth) @@ -373,7 +343,6 @@ int spk_ttyio_synth_probe(struct spk_syn return rv; synth->alive = 1; - spk_ttyio_synth = synth; return 0; } @@ -381,28 +350,30 @@ EXPORT_SYMBOL_GPL(spk_ttyio_synth_probe) void spk_ttyio_release(struct spk_synth *in_synth) { - if (!speakup_tty) - return; + struct tty_struct *tty = in_synth->dev; - tty_lock(speakup_tty); + tty_lock(tty); - if (speakup_tty->ops->close) - speakup_tty->ops->close(speakup_tty, NULL); + if (tty->ops->close) + tty->ops->close(tty, NULL); + + tty_ldisc_flush(tty); + tty_unlock(tty); + tty_kclose(tty); - tty_ldisc_flush(speakup_tty); - tty_unlock(speakup_tty); - tty_kclose(speakup_tty); + in_synth->dev = NULL; } EXPORT_SYMBOL_GPL(spk_ttyio_release); const char *spk_ttyio_synth_immediate(struct spk_synth *in_synth, const char *buff) { + struct tty_struct *tty = in_synth->dev; u_char ch; while ((ch = *buff)) { if (ch == '\n') ch = in_synth->procspeech; - if (tty_write_room(speakup_tty) < 1 || + if (tty_write_room(tty) < 1 || !in_synth->io_ops->synth_out(in_synth, ch)) return buff; buff++; Index: linux-5.10/drivers/accessibility/speakup/spk_types.h =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/spk_types.h +++ linux-5.10/drivers/accessibility/speakup/spk_types.h @@ -200,6 +200,8 @@ struct spk_synth { struct synth_indexing indexing; int alive; struct attribute_group attributes; + + void *dev; }; /* ^ permalink raw reply [flat|nested] 13+ messages in thread
* [patch 3/3] speakup: Simplify spk_ttyio_out error handling. 2020-12-09 20:58 [patch 0/3] speakup: simplify relation between line disc and synth samuel.thibault 2020-12-09 20:58 ` [patch 1/3] speakup: Add synth parameter to io functions samuel.thibault 2020-12-09 20:58 ` [patch 2/3] speakup: Reference synth from tty and tty from synth samuel.thibault @ 2020-12-09 20:58 ` samuel.thibault 2 siblings, 0 replies; 13+ messages in thread From: samuel.thibault @ 2020-12-09 20:58 UTC (permalink / raw) To: gregkh; +Cc: linux-kernel, speakup, Samuel Thibault [-- Attachment #1: spk_ttyio_clean --] [-- Type: text/plain, Size: 1524 bytes --] This avoids most code indentation Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Index: linux-5.10/drivers/accessibility/speakup/spk_ttyio.c =================================================================== --- linux-5.10.orig/drivers/accessibility/speakup/spk_ttyio.c +++ linux-5.10/drivers/accessibility/speakup/spk_ttyio.c @@ -225,27 +225,29 @@ void spk_ttyio_unregister_ldisc(void) static int spk_ttyio_out(struct spk_synth *in_synth, const char ch) { struct tty_struct *tty = in_synth->dev; + int ret; - if (in_synth->alive && tty->ops->write) { - int ret = tty->ops->write(tty, &ch, 1); + if (!in_synth->alive || !tty->ops->write) + return 0; - if (ret == 0) - /* No room */ - return 0; - if (ret < 0) { - pr_warn("%s: I/O error, deactivating speakup\n", - in_synth->long_name); - /* No synth any more, so nobody will restart TTYs, - * and we thus need to do it ourselves. Now that there - * is no synth we can let application flood anyway - */ - in_synth->alive = 0; - speakup_start_ttys(); - return 0; - } + ret = tty->ops->write(tty, &ch, 1); + + if (ret == 0) + /* No room */ + return 0; + + if (ret > 0) + /* Success */ return 1; - } + pr_warn("%s: I/O error, deactivating speakup\n", + in_synth->long_name); + /* No synth any more, so nobody will restart TTYs, + * and we thus need to do it ourselves. Now that there + * is no synth we can let application flood anyway + */ + in_synth->alive = 0; + speakup_start_ttys(); return 0; } ^ permalink raw reply [flat|nested] 13+ messages in thread
* [patch 0/3] speakup: simplify relation between line disc and synth @ 2020-12-10 20:01 samuel.thibault 2020-12-10 20:01 ` [patch 1/3] speakup: Add synth parameter to io functions samuel.thibault 0 siblings, 1 reply; 13+ messages in thread From: samuel.thibault @ 2020-12-10 20:01 UTC (permalink / raw) To: Greg KH; +Cc: linux-kernel, speakup This series reworks the relation between the speakup line discipline and the speakup synthesizers. This is probably fixing a few minor issues, but since it is invasive it'll better wait for 5.11. ^ permalink raw reply [flat|nested] 13+ messages in thread
* [patch 1/3] speakup: Add synth parameter to io functions 2020-12-10 20:01 [patch 0/3] speakup: simplify relation between line disc and synth samuel.thibault @ 2020-12-10 20:01 ` samuel.thibault 0 siblings, 0 replies; 13+ messages in thread From: samuel.thibault @ 2020-12-10 20:01 UTC (permalink / raw) To: Greg KH; +Cc: linux-kernel, speakup, Samuel Thibault [-- Attachment #1: io_synth --] [-- Type: text/plain, Size: 16739 bytes --] This merely adds the missing synth parameter to all io functions. Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Index: linux-5.9/drivers/accessibility/speakup/spk_ttyio.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/spk_ttyio.c +++ linux-5.9/drivers/accessibility/speakup/spk_ttyio.c @@ -114,11 +114,11 @@ static struct tty_ldisc_ops spk_ttyio_ld static int spk_ttyio_out(struct spk_synth *in_synth, const char ch); static int spk_ttyio_out_unicode(struct spk_synth *in_synth, u16 ch); -static void spk_ttyio_send_xchar(char ch); -static void spk_ttyio_tiocmset(unsigned int set, unsigned int clear); -static unsigned char spk_ttyio_in(void); -static unsigned char spk_ttyio_in_nowait(void); -static void spk_ttyio_flush_buffer(void); +static void spk_ttyio_send_xchar(struct spk_synth *in_synth, char ch); +static void spk_ttyio_tiocmset(struct spk_synth *in_synth, unsigned int set, unsigned int clear); +static unsigned char spk_ttyio_in(struct spk_synth *in_synth); +static unsigned char spk_ttyio_in_nowait(struct spk_synth *in_synth); +static void spk_ttyio_flush_buffer(struct spk_synth *in_synth); static int spk_ttyio_wait_for_xmitr(struct spk_synth *in_synth); struct spk_io_ops spk_ttyio_ops = { @@ -281,7 +281,7 @@ static int check_tty(struct tty_struct * return 0; } -static void spk_ttyio_send_xchar(char ch) +static void spk_ttyio_send_xchar(struct spk_synth *in_synth, char ch) { mutex_lock(&speakup_tty_mutex); if (check_tty(speakup_tty)) { @@ -294,7 +294,7 @@ static void spk_ttyio_send_xchar(char ch mutex_unlock(&speakup_tty_mutex); } -static void spk_ttyio_tiocmset(unsigned int set, unsigned int clear) +static void spk_ttyio_tiocmset(struct spk_synth *in_synth, unsigned int set, unsigned int clear) { mutex_lock(&speakup_tty_mutex); if (check_tty(speakup_tty)) { @@ -312,7 +312,7 @@ static int spk_ttyio_wait_for_xmitr(stru return 1; } -static unsigned char ttyio_in(int timeout) +static unsigned char ttyio_in(struct spk_synth *in_synth, int timeout) { struct spk_ldisc_data *ldisc_data = speakup_tty->disc_data; char rv; @@ -339,19 +339,19 @@ static unsigned char ttyio_in(int timeou return rv; } -static unsigned char spk_ttyio_in(void) +static unsigned char spk_ttyio_in(struct spk_synth *in_synth) { - return ttyio_in(SPK_SYNTH_TIMEOUT); + return ttyio_in(in_synth, SPK_SYNTH_TIMEOUT); } -static unsigned char spk_ttyio_in_nowait(void) +static unsigned char spk_ttyio_in_nowait(struct spk_synth *in_synth) { - u8 rv = ttyio_in(0); + u8 rv = ttyio_in(in_synth, 0); return (rv == 0xff) ? 0 : rv; } -static void spk_ttyio_flush_buffer(void) +static void spk_ttyio_flush_buffer(struct spk_synth *in_synth) { mutex_lock(&speakup_tty_mutex); if (check_tty(speakup_tty)) { @@ -379,7 +379,7 @@ int spk_ttyio_synth_probe(struct spk_syn } EXPORT_SYMBOL_GPL(spk_ttyio_synth_probe); -void spk_ttyio_release(void) +void spk_ttyio_release(struct spk_synth *in_synth) { if (!speakup_tty) return; @@ -395,15 +395,15 @@ void spk_ttyio_release(void) } EXPORT_SYMBOL_GPL(spk_ttyio_release); -const char *spk_ttyio_synth_immediate(struct spk_synth *synth, const char *buff) +const char *spk_ttyio_synth_immediate(struct spk_synth *in_synth, const char *buff) { u_char ch; while ((ch = *buff)) { if (ch == '\n') - ch = synth->procspeech; + ch = in_synth->procspeech; if (tty_write_room(speakup_tty) < 1 || - !synth->io_ops->synth_out(synth, ch)) + !in_synth->io_ops->synth_out(in_synth, ch)) return buff; buff++; } Index: linux-5.9/drivers/accessibility/speakup/serialio.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/serialio.c +++ linux-5.9/drivers/accessibility/speakup/serialio.c @@ -27,11 +27,11 @@ static const struct old_serial_port *ser static int timeouts; static int spk_serial_out(struct spk_synth *in_synth, const char ch); -static void spk_serial_send_xchar(char ch); -static void spk_serial_tiocmset(unsigned int set, unsigned int clear); -static unsigned char spk_serial_in(void); -static unsigned char spk_serial_in_nowait(void); -static void spk_serial_flush_buffer(void); +static void spk_serial_send_xchar(struct spk_synth *in_synth, char ch); +static void spk_serial_tiocmset(struct spk_synth *in_synth, unsigned int set, unsigned int clear); +static unsigned char spk_serial_in(struct spk_synth *in_synth); +static unsigned char spk_serial_in_nowait(struct spk_synth *in_synth); +static void spk_serial_flush_buffer(struct spk_synth *in_synth); static int spk_serial_wait_for_xmitr(struct spk_synth *in_synth); struct spk_io_ops spk_serial_io_ops = { @@ -150,7 +150,7 @@ static void start_serial_interrupt(int i outb(1, speakup_info.port_tts + UART_FCR); /* Turn FIFO On */ } -static void spk_serial_send_xchar(char ch) +static void spk_serial_send_xchar(struct spk_synth *synth, char ch) { int timeout = SPK_XMITR_TIMEOUT; @@ -162,7 +162,7 @@ static void spk_serial_send_xchar(char c outb(ch, speakup_info.port_tts); } -static void spk_serial_tiocmset(unsigned int set, unsigned int clear) +static void spk_serial_tiocmset(struct spk_synth *in_synth, unsigned int set, unsigned int clear) { int old = inb(speakup_info.port_tts + UART_MCR); @@ -275,7 +275,7 @@ static unsigned char spk_serial_in_nowai return inb_p(speakup_info.port_tts + UART_RX); } -static void spk_serial_flush_buffer(void) +static void spk_serial_flush_buffer(struct spk_synth *in_synth) { /* TODO: flush the UART 16550 buffer */ } Index: linux-5.9/drivers/accessibility/speakup/speakup_apollo.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/speakup_apollo.c +++ linux-5.9/drivers/accessibility/speakup/speakup_apollo.c @@ -163,8 +163,8 @@ static void do_catch_up(struct spk_synth full_time_val = full_time->u.n.value; spin_unlock_irqrestore(&speakup_info.spinlock, flags); if (!synth->io_ops->synth_out(synth, ch)) { - synth->io_ops->tiocmset(0, UART_MCR_RTS); - synth->io_ops->tiocmset(UART_MCR_RTS, 0); + synth->io_ops->tiocmset(synth, 0, UART_MCR_RTS); + synth->io_ops->tiocmset(synth, UART_MCR_RTS, 0); schedule_timeout(msecs_to_jiffies(full_time_val)); continue; } Index: linux-5.9/drivers/accessibility/speakup/speakup_audptr.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/speakup_audptr.c +++ linux-5.9/drivers/accessibility/speakup/speakup_audptr.c @@ -119,8 +119,8 @@ static struct spk_synth synth_audptr = { static void synth_flush(struct spk_synth *synth) { - synth->io_ops->flush_buffer(); - synth->io_ops->send_xchar(SYNTH_CLEAR); + synth->io_ops->flush_buffer(synth); + synth->io_ops->send_xchar(synth, SYNTH_CLEAR); synth->io_ops->synth_out(synth, PROCSPEECH); } @@ -130,11 +130,11 @@ static void synth_version(struct spk_syn char synth_id[40] = ""; synth->synth_immediate(synth, "\x05[Q]"); - synth_id[test] = synth->io_ops->synth_in(); + synth_id[test] = synth->io_ops->synth_in(synth); if (synth_id[test] == 'A') { do { /* read version string from synth */ - synth_id[++test] = synth->io_ops->synth_in(); + synth_id[++test] = synth->io_ops->synth_in(synth); } while (synth_id[test] != '\n' && test < 32); synth_id[++test] = 0x00; } Index: linux-5.9/drivers/accessibility/speakup/speakup_spkout.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/speakup_spkout.c +++ linux-5.9/drivers/accessibility/speakup/speakup_spkout.c @@ -117,8 +117,8 @@ static struct spk_synth synth_spkout = { static void synth_flush(struct spk_synth *synth) { - synth->io_ops->flush_buffer(); - synth->io_ops->send_xchar(SYNTH_CLEAR); + synth->io_ops->flush_buffer(synth); + synth->io_ops->send_xchar(synth, SYNTH_CLEAR); } module_param_named(ser, synth_spkout.ser, int, 0444); Index: linux-5.9/drivers/accessibility/speakup/spk_types.h =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/spk_types.h +++ linux-5.9/drivers/accessibility/speakup/spk_types.h @@ -157,11 +157,11 @@ struct spk_synth; struct spk_io_ops { int (*synth_out)(struct spk_synth *synth, const char ch); int (*synth_out_unicode)(struct spk_synth *synth, u16 ch); - void (*send_xchar)(char ch); - void (*tiocmset)(unsigned int set, unsigned int clear); - unsigned char (*synth_in)(void); - unsigned char (*synth_in_nowait)(void); - void (*flush_buffer)(void); + void (*send_xchar)(struct spk_synth *synth, char ch); + void (*tiocmset)(struct spk_synth *synth, unsigned int set, unsigned int clear); + unsigned char (*synth_in)(struct spk_synth *synth); + unsigned char (*synth_in_nowait)(struct spk_synth *synth); + void (*flush_buffer)(struct spk_synth *synth); int (*wait_for_xmitr)(struct spk_synth *synth); }; @@ -188,7 +188,7 @@ struct spk_synth { int *default_vol; struct spk_io_ops *io_ops; int (*probe)(struct spk_synth *synth); - void (*release)(void); + void (*release)(struct spk_synth *synth); const char *(*synth_immediate)(struct spk_synth *synth, const char *buff); void (*catch_up)(struct spk_synth *synth); Index: linux-5.9/drivers/accessibility/speakup/speakup_decext.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/speakup_decext.c +++ linux-5.9/drivers/accessibility/speakup/speakup_decext.c @@ -218,7 +218,7 @@ static void do_catch_up(struct spk_synth static void synth_flush(struct spk_synth *synth) { in_escape = 0; - synth->io_ops->flush_buffer(); + synth->io_ops->flush_buffer(synth); synth->synth_immediate(synth, "\033P;10z\033\\"); } Index: linux-5.9/drivers/accessibility/speakup/speakup_dectlk.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/speakup_dectlk.c +++ linux-5.9/drivers/accessibility/speakup/speakup_dectlk.c @@ -289,7 +289,7 @@ static void synth_flush(struct spk_synth synth->io_ops->synth_out(synth, ']'); in_escape = 0; is_flushing = 1; - synth->io_ops->flush_buffer(); + synth->io_ops->flush_buffer(synth); synth->io_ops->synth_out(synth, SYNTH_CLEAR); } Index: linux-5.9/drivers/accessibility/speakup/speakup_dtlk.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/speakup_dtlk.c +++ linux-5.9/drivers/accessibility/speakup/speakup_dtlk.c @@ -24,7 +24,7 @@ #define PROCSPEECH 0x00 static int synth_probe(struct spk_synth *synth); -static void dtlk_release(void); +static void dtlk_release(struct spk_synth *synth); static const char *synth_immediate(struct spk_synth *synth, const char *buf); static void do_catch_up(struct spk_synth *synth); static void synth_flush(struct spk_synth *synth); @@ -365,7 +365,7 @@ static int synth_probe(struct spk_synth return 0; } -static void dtlk_release(void) +static void dtlk_release(struct spk_synth *synth) { spk_stop_serial_interrupt(); if (speakup_info.port_tts) Index: linux-5.9/drivers/accessibility/speakup/speakup_ltlk.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/speakup_ltlk.c +++ linux-5.9/drivers/accessibility/speakup/speakup_ltlk.c @@ -132,7 +132,7 @@ static void synth_interrogate(struct spk synth->synth_immediate(synth, "\x18\x01?"); for (i = 0; i < 50; i++) { - buf[i] = synth->io_ops->synth_in(); + buf[i] = synth->io_ops->synth_in(synth); if (i > 2 && buf[i] == 0x7f) break; } Index: linux-5.9/drivers/accessibility/speakup/synth.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/synth.c +++ linux-5.9/drivers/accessibility/speakup/synth.c @@ -137,14 +137,14 @@ EXPORT_SYMBOL_GPL(spk_do_catch_up_unicod void spk_synth_flush(struct spk_synth *synth) { - synth->io_ops->flush_buffer(); + synth->io_ops->flush_buffer(synth); synth->io_ops->synth_out(synth, synth->clear); } EXPORT_SYMBOL_GPL(spk_synth_flush); unsigned char spk_synth_get_index(struct spk_synth *synth) { - return synth->io_ops->synth_in_nowait(); + return synth->io_ops->synth_in_nowait(synth); } EXPORT_SYMBOL_GPL(spk_synth_get_index); @@ -440,7 +440,7 @@ void synth_release(void) sysfs_remove_group(speakup_kobj, &synth->attributes); for (var = synth->vars; var->var_id != MAXVARS; var++) speakup_unregister_var(var->var_id); - synth->release(); + synth->release(synth); synth = NULL; } Index: linux-5.9/drivers/accessibility/speakup/speakup_acntpc.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/speakup_acntpc.c +++ linux-5.9/drivers/accessibility/speakup/speakup_acntpc.c @@ -25,7 +25,7 @@ #define PROCSPEECH '\r' static int synth_probe(struct spk_synth *synth); -static void accent_release(void); +static void accent_release(struct spk_synth *synth); static const char *synth_immediate(struct spk_synth *synth, const char *buf); static void do_catch_up(struct spk_synth *synth); static void synth_flush(struct spk_synth *synth); @@ -294,7 +294,7 @@ static int synth_probe(struct spk_synth return 0; } -static void accent_release(void) +static void accent_release(struct spk_synth *synth) { spk_stop_serial_interrupt(); if (speakup_info.port_tts) Index: linux-5.9/drivers/accessibility/speakup/speakup_decpc.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/speakup_decpc.c +++ linux-5.9/drivers/accessibility/speakup/speakup_decpc.c @@ -125,7 +125,7 @@ enum { PRIMARY_DIC = 0, USER_DIC, COMMAN #define SYNTH_IO_EXTENT 8 static int synth_probe(struct spk_synth *synth); -static void dtpc_release(void); +static void dtpc_release(struct spk_synth *synth); static const char *synth_immediate(struct spk_synth *synth, const char *buf); static void do_catch_up(struct spk_synth *synth); static void synth_flush(struct spk_synth *synth); @@ -474,7 +474,7 @@ static int synth_probe(struct spk_synth return 0; } -static void dtpc_release(void) +static void dtpc_release(struct spk_synth *synth) { spk_stop_serial_interrupt(); if (speakup_info.port_tts) Index: linux-5.9/drivers/accessibility/speakup/speakup_keypc.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/speakup_keypc.c +++ linux-5.9/drivers/accessibility/speakup/speakup_keypc.c @@ -24,7 +24,7 @@ #define SYNTH_CLEAR 0x03 static int synth_probe(struct spk_synth *synth); -static void keynote_release(void); +static void keynote_release(struct spk_synth *synth); static const char *synth_immediate(struct spk_synth *synth, const char *buf); static void do_catch_up(struct spk_synth *synth); static void synth_flush(struct spk_synth *synth); @@ -295,7 +295,7 @@ static int synth_probe(struct spk_synth return 0; } -static void keynote_release(void) +static void keynote_release(struct spk_synth *synth) { spk_stop_serial_interrupt(); if (synth_port) Index: linux-5.9/drivers/accessibility/speakup/speakup_soft.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/speakup_soft.c +++ linux-5.9/drivers/accessibility/speakup/speakup_soft.c @@ -24,7 +24,7 @@ #define CLEAR_SYNTH 0x18 static int softsynth_probe(struct spk_synth *synth); -static void softsynth_release(void); +static void softsynth_release(struct spk_synth *synth); static int softsynth_is_alive(struct spk_synth *synth); static unsigned char get_index(struct spk_synth *synth); @@ -402,7 +402,7 @@ static int softsynth_probe(struct spk_sy return 0; } -static void softsynth_release(void) +static void softsynth_release(struct spk_synth *synth) { misc_deregister(&synth_device); misc_deregister(&synthu_device); Index: linux-5.9/drivers/accessibility/speakup/spk_priv.h =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/spk_priv.h +++ linux-5.9/drivers/accessibility/speakup/spk_priv.h @@ -34,8 +34,8 @@ const struct old_serial_port *spk_serial_init(int index); void spk_stop_serial_interrupt(void); -void spk_serial_release(void); -void spk_ttyio_release(void); +void spk_serial_release(struct spk_synth *synth); +void spk_ttyio_release(struct spk_synth *synth); void spk_ttyio_register_ldisc(void); void spk_ttyio_unregister_ldisc(void); ^ permalink raw reply [flat|nested] 13+ messages in thread
* [patch 0/3] speakup: simplify relation between line disc and synth @ 2020-11-30 22:25 Samuel Thibault 2020-11-30 22:26 ` [patch 1/3] speakup: Add synth parameter to io functions Samuel Thibault 0 siblings, 1 reply; 13+ messages in thread From: Samuel Thibault @ 2020-11-30 22:25 UTC (permalink / raw) To: gregkh; +Cc: linux-kernel, speakup This series reworks the relation between the speakup line discipline and the speakup synthesizers. This is probably fixing a few minor issues, but since it is invasive it'll better wait for 5.11. ^ permalink raw reply [flat|nested] 13+ messages in thread
* [patch 1/3] speakup: Add synth parameter to io functions 2020-11-30 22:25 [patch 0/3] speakup: simplify relation between line disc and synth Samuel Thibault @ 2020-11-30 22:26 ` Samuel Thibault 2020-12-09 14:40 ` Greg KH 0 siblings, 1 reply; 13+ messages in thread From: Samuel Thibault @ 2020-11-30 22:26 UTC (permalink / raw) To: gregkh; +Cc: linux-kernel, speakup, Samuel Thibault [-- Attachment #1: io_synth --] [-- Type: text/plain, Size: 12669 bytes --] This merely adds the missing synth parameter to all io functions. Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Index: linux-5.9/drivers/accessibility/speakup/spk_ttyio.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/spk_ttyio.c +++ linux-5.9/drivers/accessibility/speakup/spk_ttyio.c @@ -114,11 +114,11 @@ static struct tty_ldisc_ops spk_ttyio_ld static int spk_ttyio_out(struct spk_synth *in_synth, const char ch); static int spk_ttyio_out_unicode(struct spk_synth *in_synth, u16 ch); -static void spk_ttyio_send_xchar(char ch); -static void spk_ttyio_tiocmset(unsigned int set, unsigned int clear); -static unsigned char spk_ttyio_in(void); -static unsigned char spk_ttyio_in_nowait(void); -static void spk_ttyio_flush_buffer(void); +static void spk_ttyio_send_xchar(struct spk_synth *in_synth, char ch); +static void spk_ttyio_tiocmset(struct spk_synth *in_synth, unsigned int set, unsigned int clear); +static unsigned char spk_ttyio_in(struct spk_synth *in_synth); +static unsigned char spk_ttyio_in_nowait(struct spk_synth *in_synth); +static void spk_ttyio_flush_buffer(struct spk_synth *in_synth); static int spk_ttyio_wait_for_xmitr(struct spk_synth *in_synth); struct spk_io_ops spk_ttyio_ops = { @@ -281,7 +281,7 @@ static int check_tty(struct tty_struct * return 0; } -static void spk_ttyio_send_xchar(char ch) +static void spk_ttyio_send_xchar(struct spk_synth *in_synth, char ch) { mutex_lock(&speakup_tty_mutex); if (check_tty(speakup_tty)) { @@ -294,7 +294,7 @@ static void spk_ttyio_send_xchar(char ch mutex_unlock(&speakup_tty_mutex); } -static void spk_ttyio_tiocmset(unsigned int set, unsigned int clear) +static void spk_ttyio_tiocmset(struct spk_synth *in_synth, unsigned int set, unsigned int clear) { mutex_lock(&speakup_tty_mutex); if (check_tty(speakup_tty)) { @@ -312,7 +312,7 @@ static int spk_ttyio_wait_for_xmitr(stru return 1; } -static unsigned char ttyio_in(int timeout) +static unsigned char ttyio_in(struct spk_synth *in_synth, int timeout) { struct spk_ldisc_data *ldisc_data = speakup_tty->disc_data; char rv; @@ -337,19 +337,19 @@ static unsigned char ttyio_in(int timeou return rv; } -static unsigned char spk_ttyio_in(void) +static unsigned char spk_ttyio_in(struct spk_synth *in_synth) { return ttyio_in(SPK_SYNTH_TIMEOUT); } -static unsigned char spk_ttyio_in_nowait(void) +static unsigned char spk_ttyio_in_nowait(struct spk_synth *in_synth) { u8 rv = ttyio_in(0); return (rv == 0xff) ? 0 : rv; } -static void spk_ttyio_flush_buffer(void) +static void spk_ttyio_flush_buffer(struct spk_synth *in_synth) { mutex_lock(&speakup_tty_mutex); if (check_tty(speakup_tty)) { @@ -377,7 +377,7 @@ int spk_ttyio_synth_probe(struct spk_syn } EXPORT_SYMBOL_GPL(spk_ttyio_synth_probe); -void spk_ttyio_release(void) +void spk_ttyio_release(struct spk_synth *in_synth) { if (!speakup_tty) return; @@ -393,15 +393,15 @@ void spk_ttyio_release(void) } EXPORT_SYMBOL_GPL(spk_ttyio_release); -const char *spk_ttyio_synth_immediate(struct spk_synth *synth, const char *buff) +const char *spk_ttyio_synth_immediate(struct spk_synth *in_synth, const char *buff) { u_char ch; while ((ch = *buff)) { if (ch == '\n') - ch = synth->procspeech; + ch = in_synth->procspeech; if (tty_write_room(speakup_tty) < 1 || - !synth->io_ops->synth_out(synth, ch)) + !in_synth->io_ops->synth_out(in_synth, ch)) return buff; buff++; } Index: linux-5.9/drivers/accessibility/speakup/serialio.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/serialio.c +++ linux-5.9/drivers/accessibility/speakup/serialio.c @@ -27,11 +27,11 @@ static const struct old_serial_port *ser static int timeouts; static int spk_serial_out(struct spk_synth *in_synth, const char ch); -static void spk_serial_send_xchar(char ch); -static void spk_serial_tiocmset(unsigned int set, unsigned int clear); -static unsigned char spk_serial_in(void); -static unsigned char spk_serial_in_nowait(void); -static void spk_serial_flush_buffer(void); +static void spk_serial_send_xchar(struct spk_synth *in_synth, char ch); +static void spk_serial_tiocmset(struct spk_synth *in_synth, unsigned int set, unsigned int clear); +static unsigned char spk_serial_in(struct spk_synth *in_synth); +static unsigned char spk_serial_in_nowait(struct spk_synth *in_synth); +static void spk_serial_flush_buffer(struct spk_synth *in_synth); static int spk_serial_wait_for_xmitr(struct spk_synth *in_synth); struct spk_io_ops spk_serial_io_ops = { @@ -150,7 +150,7 @@ static void start_serial_interrupt(int i outb(1, speakup_info.port_tts + UART_FCR); /* Turn FIFO On */ } -static void spk_serial_send_xchar(char ch) +static void spk_serial_send_xchar(struct spk_synth *synth, char ch) { int timeout = SPK_XMITR_TIMEOUT; @@ -162,7 +162,7 @@ static void spk_serial_send_xchar(char c outb(ch, speakup_info.port_tts); } -static void spk_serial_tiocmset(unsigned int set, unsigned int clear) +static void spk_serial_tiocmset(struct spk_synth *in_synth, unsigned int set, unsigned int clear) { int old = inb(speakup_info.port_tts + UART_MCR); @@ -275,7 +275,7 @@ static unsigned char spk_serial_in_nowai return inb_p(speakup_info.port_tts + UART_RX); } -static void spk_serial_flush_buffer(void) +static void spk_serial_flush_buffer(struct spk_synth *in_synth) { /* TODO: flush the UART 16550 buffer */ } Index: linux-5.9/drivers/accessibility/speakup/speakup_apollo.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/speakup_apollo.c +++ linux-5.9/drivers/accessibility/speakup/speakup_apollo.c @@ -163,8 +163,8 @@ static void do_catch_up(struct spk_synth full_time_val = full_time->u.n.value; spin_unlock_irqrestore(&speakup_info.spinlock, flags); if (!synth->io_ops->synth_out(synth, ch)) { - synth->io_ops->tiocmset(0, UART_MCR_RTS); - synth->io_ops->tiocmset(UART_MCR_RTS, 0); + synth->io_ops->tiocmset(synth, 0, UART_MCR_RTS); + synth->io_ops->tiocmset(synth, UART_MCR_RTS, 0); schedule_timeout(msecs_to_jiffies(full_time_val)); continue; } Index: linux-5.9/drivers/accessibility/speakup/speakup_audptr.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/speakup_audptr.c +++ linux-5.9/drivers/accessibility/speakup/speakup_audptr.c @@ -119,8 +119,8 @@ static struct spk_synth synth_audptr = { static void synth_flush(struct spk_synth *synth) { - synth->io_ops->flush_buffer(); - synth->io_ops->send_xchar(SYNTH_CLEAR); + synth->io_ops->flush_buffer(synth); + synth->io_ops->send_xchar(synth, SYNTH_CLEAR); synth->io_ops->synth_out(synth, PROCSPEECH); } @@ -130,11 +130,11 @@ static void synth_version(struct spk_syn char synth_id[40] = ""; synth->synth_immediate(synth, "\x05[Q]"); - synth_id[test] = synth->io_ops->synth_in(); + synth_id[test] = synth->io_ops->synth_in(synth); if (synth_id[test] == 'A') { do { /* read version string from synth */ - synth_id[++test] = synth->io_ops->synth_in(); + synth_id[++test] = synth->io_ops->synth_in(synth); } while (synth_id[test] != '\n' && test < 32); synth_id[++test] = 0x00; } Index: linux-5.9/drivers/accessibility/speakup/speakup_spkout.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/speakup_spkout.c +++ linux-5.9/drivers/accessibility/speakup/speakup_spkout.c @@ -117,8 +117,8 @@ static struct spk_synth synth_spkout = { static void synth_flush(struct spk_synth *synth) { - synth->io_ops->flush_buffer(); - synth->io_ops->send_xchar(SYNTH_CLEAR); + synth->io_ops->flush_buffer(synth); + synth->io_ops->send_xchar(synth, SYNTH_CLEAR); } module_param_named(ser, synth_spkout.ser, int, 0444); Index: linux-5.9/drivers/accessibility/speakup/spk_types.h =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/spk_types.h +++ linux-5.9/drivers/accessibility/speakup/spk_types.h @@ -155,11 +155,11 @@ struct spk_synth; struct spk_io_ops { int (*synth_out)(struct spk_synth *synth, const char ch); int (*synth_out_unicode)(struct spk_synth *synth, u16 ch); - void (*send_xchar)(char ch); - void (*tiocmset)(unsigned int set, unsigned int clear); - unsigned char (*synth_in)(void); - unsigned char (*synth_in_nowait)(void); - void (*flush_buffer)(void); + void (*send_xchar)(struct spk_synth *synth, char ch); + void (*tiocmset)(struct spk_synth *synth, unsigned int set, unsigned int clear); + unsigned char (*synth_in)(struct spk_synth *synth); + unsigned char (*synth_in_nowait)(struct spk_synth *synth); + void (*flush_buffer)(struct spk_synth *synth); int (*wait_for_xmitr)(struct spk_synth *synth); }; @@ -186,7 +186,7 @@ struct spk_synth { int *default_vol; struct spk_io_ops *io_ops; int (*probe)(struct spk_synth *synth); - void (*release)(void); + void (*release)(struct spk_synth *synth); const char *(*synth_immediate)(struct spk_synth *synth, const char *buff); void (*catch_up)(struct spk_synth *synth); Index: linux-5.9/drivers/accessibility/speakup/speakup_decext.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/speakup_decext.c +++ linux-5.9/drivers/accessibility/speakup/speakup_decext.c @@ -218,7 +218,7 @@ static void do_catch_up(struct spk_synth static void synth_flush(struct spk_synth *synth) { in_escape = 0; - synth->io_ops->flush_buffer(); + synth->io_ops->flush_buffer(synth); synth->synth_immediate(synth, "\033P;10z\033\\"); } Index: linux-5.9/drivers/accessibility/speakup/speakup_dectlk.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/speakup_dectlk.c +++ linux-5.9/drivers/accessibility/speakup/speakup_dectlk.c @@ -289,7 +289,7 @@ static void synth_flush(struct spk_synth synth->io_ops->synth_out(synth, ']'); in_escape = 0; is_flushing = 1; - synth->io_ops->flush_buffer(); + synth->io_ops->flush_buffer(synth); synth->io_ops->synth_out(synth, SYNTH_CLEAR); } Index: linux-5.9/drivers/accessibility/speakup/speakup_dtlk.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/speakup_dtlk.c +++ linux-5.9/drivers/accessibility/speakup/speakup_dtlk.c @@ -24,7 +24,7 @@ #define PROCSPEECH 0x00 static int synth_probe(struct spk_synth *synth); -static void dtlk_release(void); +static void dtlk_release(struct spk_synth *synth); static const char *synth_immediate(struct spk_synth *synth, const char *buf); static void do_catch_up(struct spk_synth *synth); static void synth_flush(struct spk_synth *synth); @@ -365,7 +365,7 @@ static int synth_probe(struct spk_synth return 0; } -static void dtlk_release(void) +static void dtlk_release(struct spk_synth *synth) { spk_stop_serial_interrupt(); if (speakup_info.port_tts) Index: linux-5.9/drivers/accessibility/speakup/speakup_ltlk.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/speakup_ltlk.c +++ linux-5.9/drivers/accessibility/speakup/speakup_ltlk.c @@ -132,7 +132,7 @@ static void synth_interrogate(struct spk synth->synth_immediate(synth, "\x18\x01?"); for (i = 0; i < 50; i++) { - buf[i] = synth->io_ops->synth_in(); + buf[i] = synth->io_ops->synth_in(synth); if (i > 2 && buf[i] == 0x7f) break; } Index: linux-5.9/drivers/accessibility/speakup/synth.c =================================================================== --- linux-5.9.orig/drivers/accessibility/speakup/synth.c +++ linux-5.9/drivers/accessibility/speakup/synth.c @@ -137,14 +137,14 @@ EXPORT_SYMBOL_GPL(spk_do_catch_up_unicod void spk_synth_flush(struct spk_synth *synth) { - synth->io_ops->flush_buffer(); + synth->io_ops->flush_buffer(synth); synth->io_ops->synth_out(synth, synth->clear); } EXPORT_SYMBOL_GPL(spk_synth_flush); unsigned char spk_synth_get_index(struct spk_synth *synth) { - return synth->io_ops->synth_in_nowait(); + return synth->io_ops->synth_in_nowait(synth); } EXPORT_SYMBOL_GPL(spk_synth_get_index); @@ -440,7 +440,7 @@ void synth_release(void) sysfs_remove_group(speakup_kobj, &synth->attributes); for (var = synth->vars; var->var_id != MAXVARS; var++) speakup_unregister_var(var->var_id); - synth->release(); + synth->release(synth); synth = NULL; } ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [patch 1/3] speakup: Add synth parameter to io functions 2020-11-30 22:26 ` [patch 1/3] speakup: Add synth parameter to io functions Samuel Thibault @ 2020-12-09 14:40 ` Greg KH 2020-12-09 21:14 ` Samuel Thibault 0 siblings, 1 reply; 13+ messages in thread From: Greg KH @ 2020-12-09 14:40 UTC (permalink / raw) To: Samuel Thibault, linux-kernel, speakup On Mon, Nov 30, 2020 at 11:26:41PM +0100, Samuel Thibault wrote: > This merely adds the missing synth parameter to all io functions. > > Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> This patch breaks the build :( Can you rebase and resend this whole series, as the other patches do not apply anymore due to the recent fixes in the speakup code. thanks, greg k-h ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [patch 1/3] speakup: Add synth parameter to io functions 2020-12-09 14:40 ` Greg KH @ 2020-12-09 21:14 ` Samuel Thibault 0 siblings, 0 replies; 13+ messages in thread From: Samuel Thibault @ 2020-12-09 21:14 UTC (permalink / raw) To: Greg KH; +Cc: linux-kernel, speakup Greg KH, le mer. 09 déc. 2020 15:40:29 +0100, a ecrit: > On Mon, Nov 30, 2020 at 11:26:41PM +0100, Samuel Thibault wrote: > > This merely adds the missing synth parameter to all io functions. > > > > Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> > > This patch breaks the build :( > > Can you rebase and resend this whole series, as the other patches do not > apply anymore due to the recent fixes in the speakup code. Ok, I rebased and resent. Samuel ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2021-01-05 13:40 UTC | newest] Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-12-09 20:58 [patch 0/3] speakup: simplify relation between line disc and synth samuel.thibault 2020-12-09 20:58 ` [patch 1/3] speakup: Add synth parameter to io functions samuel.thibault 2020-12-10 15:23 ` Greg KH 2020-12-10 15:24 ` Samuel Thibault 2020-12-10 20:03 ` Samuel Thibault 2021-01-05 13:39 ` Greg KH 2021-01-05 13:39 ` Samuel Thibault 2020-12-09 20:58 ` [patch 2/3] speakup: Reference synth from tty and tty from synth samuel.thibault 2020-12-09 20:58 ` [patch 3/3] speakup: Simplify spk_ttyio_out error handling samuel.thibault -- strict thread matches above, loose matches on Subject: below -- 2020-12-10 20:01 [patch 0/3] speakup: simplify relation between line disc and synth samuel.thibault 2020-12-10 20:01 ` [patch 1/3] speakup: Add synth parameter to io functions samuel.thibault 2020-11-30 22:25 [patch 0/3] speakup: simplify relation between line disc and synth Samuel Thibault 2020-11-30 22:26 ` [patch 1/3] speakup: Add synth parameter to io functions Samuel Thibault 2020-12-09 14:40 ` Greg KH 2020-12-09 21:14 ` Samuel Thibault
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).