Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9176d156 authored by Okash Khawaja's avatar Okash Khawaja Committed by Greg Kroah-Hartman
Browse files

staging: speakup: spk_serial_out and spk_wait_for_xmitr to take synth arg 



These two functions are always called from a context where spk_synth instance
is available. They also use the spk_synth instance but instead of taking it
as an argument, they rely on a global spk_synth instance inside synth.c which
points to the same synth as the one being passed in as argument.

Signed-off-by: default avatarOkash Khawaja <okash.khawaja@gmail.com>
Reviewed-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 940f6dae

drivers/staging/speakup/serialio.c

+7 −7
Original line number Diff line number Diff line
@@ -143,14 +143,14 @@ void spk_stop_serial_interrupt(void) 
	free_irq(serstate->irq, (void *)synth_readbuf_handler);

}



int spk_wait_for_xmitr(void)

int spk_wait_for_xmitr(struct spk_synth *in_synth)

{

	int tmout = SPK_XMITR_TIMEOUT;



	if ((synth->alive) && (timeouts >= NUM_DISABLE_TIMEOUTS)) {

	if ((in_synth->alive) && (timeouts >= NUM_DISABLE_TIMEOUTS)) {

		pr_warn("%s: too many timeouts, deactivating speakup\n",

			synth->long_name);

		synth->alive = 0;

			in_synth->long_name);

		in_synth->alive = 0;

		/* 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
@@ -161,7 +161,7 @@ int spk_wait_for_xmitr(void) 
	}

	while (spk_serial_tx_busy()) {

		if (--tmout == 0) {

			pr_warn("%s: timed out (tx busy)\n", synth->long_name);

			pr_warn("%s: timed out (tx busy)\n", in_synth->long_name);

			timeouts++;

			return 0;

		}
@@ -206,9 +206,9 @@ unsigned char spk_serial_in_nowait(void) 
}

EXPORT_SYMBOL_GPL(spk_serial_in_nowait);



int spk_serial_out(const char ch)

int spk_serial_out(struct spk_synth *in_synth, const char ch)

{

	if (synth->alive && spk_wait_for_xmitr()) {

	if (in_synth->alive && spk_wait_for_xmitr(in_synth)) {

		outb_p(ch, speakup_info.port_tts);

		return 1;

	}

drivers/staging/speakup/speakup_apollo.c

+3 −3
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static void do_catch_up(struct spk_synth *synth) 
		set_current_state(TASK_INTERRUPTIBLE);

		full_time_val = full_time->u.n.value;

		spin_unlock_irqrestore(&speakup_info.spinlock, flags);

		if (!spk_serial_out(ch)) {

		if (!spk_serial_out(synth, ch)) {

			outb(UART_MCR_DTR, speakup_info.port_tts + UART_MCR);

			outb(UART_MCR_DTR | UART_MCR_RTS,

					speakup_info.port_tts + UART_MCR);
@@ -182,7 +182,7 @@ static void do_catch_up(struct spk_synth *synth) 
			full_time_val = full_time->u.n.value;

			delay_time_val = delay_time->u.n.value;

			spin_unlock_irqrestore(&speakup_info.spinlock, flags);

			if (spk_serial_out(synth->procspeech))

			if (spk_serial_out(synth, synth->procspeech))

				schedule_timeout(msecs_to_jiffies

						 (delay_time_val));

			else
@@ -195,7 +195,7 @@ static void do_catch_up(struct spk_synth *synth) 
		synth_buffer_getc();

		spin_unlock_irqrestore(&speakup_info.spinlock, flags);

	}

	spk_serial_out(PROCSPEECH);

	spk_serial_out(synth, PROCSPEECH);

}



module_param_named(ser, synth_apollo.ser, int, 0444);

drivers/staging/speakup/speakup_audptr.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static void synth_flush(struct spk_synth *synth) 
		udelay(1);

	}

	outb(SYNTH_CLEAR, speakup_info.port_tts);

	spk_serial_out(PROCSPEECH);

	spk_serial_out(synth, PROCSPEECH);

}



static void synth_version(struct spk_synth *synth)

drivers/staging/speakup/speakup_decext.c

+4 −4
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static void do_catch_up(struct spk_synth *synth) 
		spin_unlock_irqrestore(&speakup_info.spinlock, flags);

		if (ch == '\n')

			ch = 0x0D;

		if (synth_full() || !spk_serial_out(ch)) {

		if (synth_full() || !spk_serial_out(synth, ch)) {

			schedule_timeout(msecs_to_jiffies(delay_time_val));

			continue;

		}
@@ -200,10 +200,10 @@ static void do_catch_up(struct spk_synth *synth) 
			in_escape = 0;

		else if (ch <= SPACE) {

			if (!in_escape && strchr(",.!?;:", last))

				spk_serial_out(PROCSPEECH);

				spk_serial_out(synth, PROCSPEECH);

			if (time_after_eq(jiffies, jiff_max)) {

				if (!in_escape)

					spk_serial_out(PROCSPEECH);

					spk_serial_out(synth, PROCSPEECH);

				spin_lock_irqsave(&speakup_info.spinlock,

							flags);

				jiffy_delta_val = jiffy_delta->u.n.value;
@@ -218,7 +218,7 @@ static void do_catch_up(struct spk_synth *synth) 
		last = ch;

	}

	if (!in_escape)

		spk_serial_out(PROCSPEECH);

		spk_serial_out(synth, PROCSPEECH);

}



static void synth_flush(struct spk_synth *synth)

drivers/staging/speakup/speakup_dectlk.c

+6 −6
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static void do_catch_up(struct spk_synth *synth) 
		spin_unlock_irqrestore(&speakup_info.spinlock, flags);

		if (ch == '\n')

			ch = 0x0D;

		if (synth_full_val || !spk_serial_out(ch)) {

		if (synth_full_val || !spk_serial_out(synth, ch)) {

			schedule_timeout(msecs_to_jiffies(delay_time_val));

			continue;

		}
@@ -265,10 +265,10 @@ static void do_catch_up(struct spk_synth *synth) 
			in_escape = 0;

		else if (ch <= SPACE) {

			if (!in_escape && strchr(",.!?;:", last))

				spk_serial_out(PROCSPEECH);

				spk_serial_out(synth, PROCSPEECH);

			if (time_after_eq(jiffies, jiff_max)) {

				if (!in_escape)

					spk_serial_out(PROCSPEECH);

					spk_serial_out(synth, PROCSPEECH);

				spin_lock_irqsave(&speakup_info.spinlock,

						flags);

				jiffy_delta_val = jiffy_delta->u.n.value;
@@ -283,17 +283,17 @@ static void do_catch_up(struct spk_synth *synth) 
		last = ch;

	}

	if (!in_escape)

		spk_serial_out(PROCSPEECH);

		spk_serial_out(synth, PROCSPEECH);

}



static void synth_flush(struct spk_synth *synth)

{

	if (in_escape)

		/* if in command output ']' so we don't get an error */

		spk_serial_out(']');

		spk_serial_out(synth, ']');

	in_escape = 0;

	is_flushing = 1;

	spk_serial_out(SYNTH_CLEAR);

	spk_serial_out(synth, SYNTH_CLEAR);

}



module_param_named(ser, synth_dectlk.ser, int, 0444);